diff --git a/Swift/VInput Keyboard/InputMode.swift b/Swift/VInput Keyboard/InputMode.swift
index c65029b..9be59f5 100644
--- a/Swift/VInput Keyboard/InputMode.swift	
+++ b/Swift/VInput Keyboard/InputMode.swift	
@@ -17,6 +17,7 @@ class InputMode : Mode {
     var keyboardController: KeyboardViewController!
     let MODE_NAME = "InputMode"
     var currentWord: String = ""
+    var capsOn: Bool = false
     
     init(values: Values, keyboardController: KeyboardViewController) {
         self.values = values
@@ -44,21 +45,32 @@ class InputMode : Mode {
     func onSwipeLeft() {
         values.shiftLeft()
         VisualUtil.updateViewAndAnnounce(letter: values.getCurrentValue())
+        capsOn = false
     }
     
     func onSwipeRight() {
         values.shiftRight()
         VisualUtil.updateViewAndAnnounce(letter: values.getCurrentValue())
+        capsOn = false
     }
     
     func onSwipeUp() {
         // TO DO
-        let text = "Inserting " + values.getCurrentValue()
+        var text = "Inserting " + values.getCurrentValue()
+        //SpeechUtil.speak(textToSpeak: text)
+        if capsOn {
+            currentWord.append(values.getCurrentValue().uppercased())
+            keyboardController.textDocumentProxy.insertText(values.getCurrentValue().uppercased())
+            text = "Inserting upper case " + values.getCurrentValue()
+        }
+        else{
+            currentWord.append(values.getCurrentValue())
+            keyboardController.textDocumentProxy.insertText(values.getCurrentValue())
+        }
         SpeechUtil.speak(textToSpeak: text)
-        currentWord.append(values.getCurrentValue())
-        keyboardController.textDocumentProxy.insertText(values.getCurrentValue())
         values.isSearchingThenReset()
         VisualUtil.updateViewAndAnnounce(letter: values.getCurrentValue())
+        capsOn = false
         
         
         // search for results
@@ -109,12 +121,22 @@ class InputMode : Mode {
         VisualUtil.updateViewAndAnnounce(letter: values.getCurrentValue())
     }
     
-    func doubleTap() {
-        let text = "Left or right of " + values.getCurrentValue()
-        SpeechUtil.speak(textToSpeak: currentWord)
+    func onHold() {
+//        let text = "Left or right of " + values.getCurrentValue()
+//        SpeechUtil.speak(textToSpeak: currentWord)
+        if capsOn {
+            capsOn = false
+            VisualUtil.updateView(letter: values.getCurrentValue())
+            SpeechUtil.speak(textToSpeak: "Current letter lower cased")
+        }
+        else {
+            capsOn = true
+            VisualUtil.updateView(letter: values.getCurrentValue().uppercased())
+            SpeechUtil.speak(textToSpeak: "Current letter upper cased")
+        }
     }
     
-    func onHold() {
+    func doubleTap() {
         SpeechUtil.speak(textToSpeak: "Inserting space")
         keyboardController.textDocumentProxy.insertText(" ")
         currentWord = ""
diff --git a/Swift/VInput Keyboard/KeyboardViewController.swift b/Swift/VInput Keyboard/KeyboardViewController.swift
index 2ae80fc..5f11d24 100644
--- a/Swift/VInput Keyboard/KeyboardViewController.swift	
+++ b/Swift/VInput Keyboard/KeyboardViewController.swift	
@@ -247,8 +247,10 @@ class KeyboardViewController: UIInputViewController {
     }
     
     //To-do: Migrate over -> Mike
-    func onHold() {
-        currentMode.onHold()
+    func onHold(gestureRecognizer: UIGestureRecognizer) {
+        if gestureRecognizer.state == UIGestureRecognizerState.began{
+            currentMode.onHold()
+        }
 //        if shortHoldRecognizer.state == UIGestureRecognizerState.began {
 //            self.textDocumentProxy.insertText(" ")
 //            newWord = true
diff --git a/Swift/VInput Keyboard/VisualUtil.swift b/Swift/VInput Keyboard/VisualUtil.swift
index d5ea3b9..11c519c 100644
--- a/Swift/VInput Keyboard/VisualUtil.swift	
+++ b/Swift/VInput Keyboard/VisualUtil.swift	
@@ -16,5 +16,7 @@ class VisualUtil {
         let text = "Left or right of " + letter
         SpeechUtil.speak(textToSpeak: text)
     }
-    
+    static func updateView(letter: String) {
+        KeyboardViewController.letterLabel.text = letter
+    }
 }