diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard
index 98c04e9..dfc9eb0 100644
--- a/A2Mac/Base.lproj/Main.storyboard
+++ b/A2Mac/Base.lproj/Main.storyboard
@@ -1275,7 +1275,7 @@
                                         </buttonCell>
                                     </button>
                                     <connections>
-                                        <action selector="Copy:" target="B8D-0N-5wS" id="Zqh-qn-MZ3"/>
+                                        <action selector="SelectAll:" target="B8D-0N-5wS" id="OYm-4E-uTr"/>
                                     </connections>
                                 </toolbarItem>
                                 <toolbarItem implicitItemIdentifier="D00D9DE2-E274-4915-87A5-C94FEDDB6C22" label="Copy" paletteLabel="Copy" image="Copy" id="fQR-kz-ht6">
diff --git a/A2Mac/ToolBarController.swift b/A2Mac/ToolBarController.swift
index 27fab64..874d660 100644
--- a/A2Mac/ToolBarController.swift
+++ b/A2Mac/ToolBarController.swift
@@ -30,19 +30,26 @@ class ToolBarController: NSWindowController {
         ViewController.current?.Reset(sender)
     }
     
+    @IBAction func SelectAll(_ sender: Any) {
+//        ViewController.current?.displayField.currentEditor()?.selectAll(nil)
+        ViewController.current?.displayField.selectText(nil)
+    }
+    
     @IBAction func Copy(_ sender: Any) {
+        ViewController.current?.Copy()
     }
     
     @IBAction func Paste(_ sender: Any) {
+        ViewController.current?.Paste()
     }
     
     @IBAction func Green(_ sender: Any) {
-        //        print("NSToolbarItem:", sender.tag)
+//        print("NSToolbarItem:", sender.tag)
         ViewController.current?.MonoMonitorChange(color: "Green")
     }
     
     @IBAction func Amber(_ sender: Any) {
-        //        print("NSToolbarItem:", sender.tag)
+//        print("NSToolbarItem:", sender.tag)
         ViewController.current?.MonoMonitorChange(color: "Amber")
     }
     
diff --git a/A2Mac/ViewController.swift b/A2Mac/ViewController.swift
index b1e6a52..37e19de 100644
--- a/A2Mac/ViewController.swift
+++ b/A2Mac/ViewController.swift
@@ -336,6 +336,42 @@ class ViewController: NSViewController  {
             return true
         }
     }
+
+    
+    func SelectAll() {
+//        displayField.currentEditor()?.selectAll(nil)
+        displayField.selectText(nil)
+    }
+    
+    func Copy() {
+        let pasteBoard = NSPasteboard.general
+        pasteBoard.clearContents()
+        // TODO: Find a better way to avoid index out of range error when the entire text area is selected
+        let string = display.stringValue + " "
+        if let selectedRange = displayField.currentEditor()?.selectedRange {
+            let startIndex = string.index(string.startIndex, offsetBy: selectedRange.lowerBound)
+            let endIndex = string.index(string.startIndex, offsetBy: selectedRange.upperBound)
+            let selectedString = string[startIndex..<endIndex]
+            pasteBoard.setString(String(selectedString), forType: .string)
+        }
+    }
+    
+    func Paste() {
+        let pasteBoard = NSPasteboard.general
+        if let str = pasteBoard.string( forType: .string ) {
+            print("PASTED:", str)
+
+            DispatchQueue.global(qos: .background).async {
+                for char in str.uppercased() {
+                    if let ascii = char.asciiValue {
+                        // TODO: Write separate Paste Accelerator
+                        disk_accelerator_speedup()
+                        kbdInput(ascii)
+                    }
+                }
+            }
+        }
+    }
     
     override func keyDown(with event: NSEvent) {
         
@@ -366,21 +402,18 @@ class ViewController: NSViewController  {
         if event.modifierFlags.contains(.command) { // .shift, .option, .control ...
             if let chars = event.charactersIgnoringModifiers {
                 switch chars {
-                case "v":
-                    print("CMD + V")
+                case "a":
+//                    print("CMD + A")
+                    SelectAll()
+                    return // to avoid deselect text
                     
-                    let pasteBoard = NSPasteboard.general
-                    if let str = pasteBoard.string( forType: .string ) {
-                        print("PASTED:", str)
-                        
-                        DispatchQueue.global(qos: .background).async {
-                            for char in str.uppercased() {
-                                if let ascii = char.asciiValue {
-                                    kbdInput(ascii)
-                                }
-                            }
-                        }
-                    }
+                case "c":
+//                    print("CMD + C")
+                    Copy()
+                    
+                case "v":
+//                    print("CMD + V")
+                    Paste()
 
                 default:
                     super.keyDown(with: event)