diff --git a/A2Mac.xcodeproj/project.pbxproj b/A2Mac.xcodeproj/project.pbxproj
index d5758e9..2b8f24a 100644
--- a/A2Mac.xcodeproj/project.pbxproj
+++ b/A2Mac.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		32089E4924556DBD0036E667 /* PRNumber3.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 32089E4724556DBD0036E667 /* PRNumber3.ttf */; };
 		320B3FC424AD88B0005EA133 /* power.png in Resources */ = {isa = PBXBuildFile; fileRef = 320B3FC324AD88B0005EA133 /* power.png */; };
+		320B4FC124B182DE00070038 /* Apple Disk II.png in Resources */ = {isa = PBXBuildFile; fileRef = 320B4FC024B182DD00070038 /* Apple Disk II.png */; };
 		3213936624079C30007F5C4A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB6022EACC660003B53F /* Main.storyboard */; };
 		323D042E248980600086A901 /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 323D042D248980600086A901 /* Preferences.storyboard */; };
 		323D043024898AB70086A901 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 323D042F24898AB70086A901 /* PreferencesViewController.swift */; };
@@ -97,6 +98,8 @@
 		32E3126A24A98B9300E61891 /* dsk2woz.c in Sources */ = {isa = PBXBuildFile; fileRef = 32E3126824A98B9300E61891 /* dsk2woz.c */; };
 		32E3126D24AC033A00E61891 /* ToolBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32E3126C24AC033A00E61891 /* ToolBarController.swift */; };
 		32E3127424AC0B2E00E61891 /* doc.on.clipboard.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 32E3127224AC0AC400E61891 /* doc.on.clipboard.png */; };
+		32F04B0E24B189D4006B5ECB /* Apple Disk II D1 Open.png in Resources */ = {isa = PBXBuildFile; fileRef = 32F04B0C24B189D3006B5ECB /* Apple Disk II D1 Open.png */; };
+		32F04B0F24B189D4006B5ECB /* Apple Disk II D2 Open.png in Resources */ = {isa = PBXBuildFile; fileRef = 32F04B0D24B189D4006B5ECB /* Apple Disk II D2 Open.png */; };
 		32F8A87C24A3A84300EE6735 /* PrintChar21.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 325EB67B23FBD43800C6B4A4 /* PrintChar21.ttf */; };
 		32F8A87D24A3A84700EE6735 /* PRNumber3.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 32089E4724556DBD0036E667 /* PRNumber3.ttf */; };
 		32F8A87F24A3A8A000EE6735 /* apple.rom in Copy ROM Images */ = {isa = PBXBuildFile; fileRef = 32439F8422ECD8AD0077AAE0 /* apple.rom */; };
@@ -286,6 +289,7 @@
 /* Begin PBXFileReference section */
 		32089E4724556DBD0036E667 /* PRNumber3.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = PRNumber3.ttf; sourceTree = "<group>"; };
 		320B3FC324AD88B0005EA133 /* power.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = power.png; sourceTree = "<group>"; };
+		320B4FC024B182DD00070038 /* Apple Disk II.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Apple Disk II.png"; sourceTree = "<group>"; };
 		323D042D248980600086A901 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = "<group>"; };
 		323D042F24898AB70086A901 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = "<group>"; };
 		323D04312489BFD80086A901 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
@@ -427,6 +431,8 @@
 		32E3126C24AC033A00E61891 /* ToolBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolBarController.swift; sourceTree = "<group>"; };
 		32E3127224AC0AC400E61891 /* doc.on.clipboard.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = doc.on.clipboard.png; sourceTree = "<group>"; };
 		32EDB7A123272CA80073AF2D /* fail1.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = fail1.txt; sourceTree = "<group>"; };
+		32F04B0C24B189D3006B5ECB /* Apple Disk II D1 Open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Apple Disk II D1 Open.png"; sourceTree = "<group>"; };
+		32F04B0D24B189D4006B5ECB /* Apple Disk II D2 Open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Apple Disk II D2 Open.png"; sourceTree = "<group>"; };
 		32F2C144249218A400FDC61B /* locksmith_v6.0.woz */ = {isa = PBXFileReference; lastKnownFileType = file; path = locksmith_v6.0.woz; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -820,6 +826,9 @@
 				326B56E424AD8E89009BA0AC /* gobackward.png */,
 				325DC41124AC692D00EB8858 /* rgb_mono.png */,
 				325DC40F24AC691B00EB8858 /* rgb_color.png */,
+				320B4FC024B182DD00070038 /* Apple Disk II.png */,
+				32F04B0C24B189D3006B5ECB /* Apple Disk II D1 Open.png */,
+				32F04B0D24B189D4006B5ECB /* Apple Disk II D2 Open.png */,
 			);
 			path = img;
 			sourceTree = "<group>";
@@ -1083,6 +1092,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				32F04B0E24B189D4006B5ECB /* Apple Disk II D1 Open.png in Resources */,
 				3296223424A709CE002DEB78 /* disk_ii_motor_w_floppy.sfx in Resources */,
 				320B3FC424AD88B0005EA133 /* power.png in Resources */,
 				32877F8D24ADA6AF003A940D /* joystick.png in Resources */,
@@ -1091,8 +1101,10 @@
 				326B56E724AD906D009BA0AC /* doc.text.viewfinder.png in Resources */,
 				32BFFB5F22EACC660003B53F /* Assets.xcassets in Resources */,
 				324D15D324ADAC71008AAFB0 /* floppy.png in Resources */,
+				32F04B0F24B189D4006B5ECB /* Apple Disk II D2 Open.png in Resources */,
 				323D042E248980600086A901 /* Preferences.storyboard in Resources */,
 				326B56E524AD8E89009BA0AC /* gobackward.png in Resources */,
+				320B4FC124B182DE00070038 /* Apple Disk II.png in Resources */,
 				32E3126524A7193700E61891 /* disk_ii_arm.sfx in Resources */,
 				3296223824A710CD002DEB78 /* disk_ii_io_error.sfx in Resources */,
 			);
diff --git a/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Dark.png b/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Dark.png
new file mode 100644
index 0000000..d2746e1
Binary files /dev/null and b/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Dark.png differ
diff --git a/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Light.png b/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Light.png
new file mode 100644
index 0000000..a23aa0c
Binary files /dev/null and b/A2Mac/Assets.xcassets/Disk 1.imageset/Apple Disk II D1 Open Light.png differ
diff --git a/A2Mac/Assets.xcassets/Disk 1.imageset/Contents.json b/A2Mac/Assets.xcassets/Disk 1.imageset/Contents.json
new file mode 100644
index 0000000..e26730d
--- /dev/null
+++ b/A2Mac/Assets.xcassets/Disk 1.imageset/Contents.json	
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Apple Disk II D1 Open Light.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Apple Disk II D1 Open Dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Dark.png b/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Dark.png
new file mode 100644
index 0000000..f1e8643
Binary files /dev/null and b/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Dark.png differ
diff --git a/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Light.png b/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Light.png
new file mode 100644
index 0000000..26c215d
Binary files /dev/null and b/A2Mac/Assets.xcassets/Disk 2.imageset/Apple Disk II D2 Open Light.png differ
diff --git a/A2Mac/Assets.xcassets/Disk 2.imageset/Contents.json b/A2Mac/Assets.xcassets/Disk 2.imageset/Contents.json
new file mode 100644
index 0000000..8bf3afa
--- /dev/null
+++ b/A2Mac/Assets.xcassets/Disk 2.imageset/Contents.json	
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Apple Disk II D2 Open Light.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Apple Disk II D2 Open Dark.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard
index 363e779..813c729 100644
--- a/A2Mac/Base.lproj/Main.storyboard
+++ b/A2Mac/Base.lproj/Main.storyboard
@@ -1685,8 +1685,42 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Fdf-pv-iEw" userLabel="Side Panel">
                                 <rect key="frame" x="1160" y="8" width="120" height="784"/>
                                 <subviews>
+                                    <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="-20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5gO-h7-NcU" userLabel="Prefipheries">
+                                        <rect key="frame" x="0.0" y="606" width="120" height="178"/>
+                                        <subviews>
+                                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3q5-zS-jTc">
+                                                <rect key="frame" x="0.0" y="79" width="120" height="99"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Disk 1" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="1px-15-mLF">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                                <color key="contentTintColor" red="0.84313725490000002" green="0.0039215686269999999" blue="0.45098039220000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </button>
+                                            <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="T0r-xy-OJF">
+                                                <rect key="frame" x="0.0" y="0.0" width="120" height="99"/>
+                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="Disk 2" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="z4y-xq-1UN">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
+                                            </button>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="trailing" secondItem="3q5-zS-jTc" secondAttribute="trailing" id="6ka-qx-fr1"/>
+                                            <constraint firstItem="T0r-xy-OJF" firstAttribute="leading" secondItem="5gO-h7-NcU" secondAttribute="leading" id="N3X-wj-QNL"/>
+                                            <constraint firstItem="3q5-zS-jTc" firstAttribute="leading" secondItem="5gO-h7-NcU" secondAttribute="leading" id="Oq9-9S-Olv"/>
+                                            <constraint firstAttribute="trailing" secondItem="T0r-xy-OJF" secondAttribute="trailing" id="ntu-ND-2Tg"/>
+                                        </constraints>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VKJ-wY-R2U" userLabel="Quick Settings">
-                                        <rect key="frame" x="8" y="730" width="104" height="46"/>
+                                        <rect key="frame" x="0.0" y="552" width="120" height="46"/>
                                         <subviews>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ab2-by-2SH">
                                                 <rect key="frame" x="-2" y="30" width="69" height="16"/>
@@ -1697,7 +1731,7 @@
                                                 </textFieldCell>
                                             </textField>
                                             <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TEd-9V-yhI">
-                                                <rect key="frame" x="0.0" y="-1" width="104" height="23"/>
+                                                <rect key="frame" x="0.0" y="-1" width="120" height="23"/>
                                                 <popUpButtonCell key="cell" type="roundTextured" title="Normal" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" selectedItem="72n-9g-iH3" id="x7E-wS-qz1">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
@@ -1944,10 +1978,13 @@
                                 </subviews>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="lVP-FP-u6x" secondAttribute="bottom" constant="8" id="DtK-7e-K5K"/>
-                                    <constraint firstAttribute="trailing" secondItem="VKJ-wY-R2U" secondAttribute="trailing" constant="8" id="HS6-y3-9Zf"/>
+                                    <constraint firstAttribute="trailing" secondItem="VKJ-wY-R2U" secondAttribute="trailing" id="HS6-y3-9Zf"/>
+                                    <constraint firstItem="VKJ-wY-R2U" firstAttribute="top" secondItem="5gO-h7-NcU" secondAttribute="bottom" constant="8" id="Mhw-1T-Z6Q"/>
+                                    <constraint firstItem="5gO-h7-NcU" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" id="PKR-Iu-37M"/>
                                     <constraint firstAttribute="width" constant="120" id="Vob-hf-WSu"/>
-                                    <constraint firstItem="VKJ-wY-R2U" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" constant="8" id="WV2-0l-Qzh"/>
-                                    <constraint firstItem="VKJ-wY-R2U" firstAttribute="top" secondItem="Fdf-pv-iEw" secondAttribute="top" constant="8" id="dxT-Qs-IeT"/>
+                                    <constraint firstItem="VKJ-wY-R2U" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" id="WV2-0l-Qzh"/>
+                                    <constraint firstItem="5gO-h7-NcU" firstAttribute="top" secondItem="Fdf-pv-iEw" secondAttribute="top" id="hLf-YC-yBF"/>
+                                    <constraint firstAttribute="trailing" secondItem="5gO-h7-NcU" secondAttribute="trailing" id="ldB-KD-cfy"/>
                                     <constraint firstAttribute="trailing" secondItem="lVP-FP-u6x" secondAttribute="trailing" constant="8" id="oC3-82-hiy"/>
                                     <constraint firstItem="lVP-FP-u6x" firstAttribute="leading" secondItem="Fdf-pv-iEw" secondAttribute="leading" constant="8" id="tk8-7H-382"/>
                                 </constraints>
@@ -2004,6 +2041,8 @@
         </scene>
     </scenes>
     <resources>
+        <image name="Disk 1" width="160" height="98.5"/>
+        <image name="Disk 2" width="160" height="98.5"/>
         <image name="NSAdvanced" width="32" height="32"/>
         <image name="NSTouchBarAudioOutputMuteTemplate" width="26" height="30"/>
         <image name="NSTouchBarAudioOutputVolumeLowTemplate" width="23" height="30"/>
diff --git a/A2Mac/ViewController.swift b/A2Mac/ViewController.swift
index e3b3bba..10e2c45 100644
--- a/A2Mac/ViewController.swift
+++ b/A2Mac/ViewController.swift
@@ -818,6 +818,14 @@ class ViewController: NSViewController  {
         // Mouse 2 JoyStick (Game Controller / Paddle)
         mouseLocation = view.window!.mouseLocationOutsideOfEventStream
         
+        if ( Mouse2Joystick || Keyboard2Joystick ) {
+            if let flags = NSApp.currentEvent?.modifierFlags {
+                if flags.contains(.command){
+                    // somethings
+                }
+            }
+        }
+    
         if ( Mouse2Joystick ) {
             pdl_prevarr[0] = pdl_valarr[0]
             pdl_valarr[0] = Double(mouseLocation.x / (displayField.frame.width) )
@@ -837,6 +845,7 @@ class ViewController: NSViewController  {
             pdl_valarr[3] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
             pdl_diffarr[3] = pdl_valarr[3] - pdl_prevarr[3]
         }
+        
     }
 
     
diff --git a/Resources/img/Apple Disk II D1 Open.png b/Resources/img/Apple Disk II D1 Open.png
new file mode 100644
index 0000000..97fd6fc
Binary files /dev/null and b/Resources/img/Apple Disk II D1 Open.png differ
diff --git a/Resources/img/Apple Disk II D2 Open.png b/Resources/img/Apple Disk II D2 Open.png
new file mode 100644
index 0000000..dc2eeed
Binary files /dev/null and b/Resources/img/Apple Disk II D2 Open.png differ
diff --git a/Resources/img/Apple Disk II.png b/Resources/img/Apple Disk II.png
new file mode 100644
index 0000000..0ec10f3
Binary files /dev/null and b/Resources/img/Apple Disk II.png differ
diff --git a/src/cpu/6502.c b/src/cpu/6502.c
index aea529d..1153dee 100644
--- a/src/cpu/6502.c
+++ b/src/cpu/6502.c
@@ -681,8 +681,9 @@ void rom_loadFile( const char * bundlePath, const char * filename ) {
 
 
 void openLog() {
+#ifdef DISASSEMBLY
     outdev = fopen("/Users/trudnai/Library/Containers/com.gamealloy.A2Mac/Data/disassembly_new.log", "w+");
-    
+#endif
     // for DEBUG ONLY!!! -- use stdout if could not create log file
 //    if (outdev == NULL) {
 //        outdev = stdout;