diff --git a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/UserInterfaceState.xcuserstate b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/UserInterfaceState.xcuserstate
index 20d86d1..286c589 100644
Binary files a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/UserInterfaceState.xcuserstate and b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
index debe652..be563af 100644
--- a/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
+++ b/A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -3,76 +3,53 @@
    version = "1.0">
    <ContextStates>
       <ContextState
-         contextName = "woz_write:woz.c">
-         <PersistentStrings>
-            <PersistentString
-               value = "WOZwrite.data">
-            </PersistentString>
-            <PersistentString
-               value = "new">
-            </PersistentString>
-            <PersistentString
-               value = "WOZwrite.shift16">
-            </PersistentString>
-            <PersistentString
-               value = "WOZwrite.shift">
-            </PersistentString>
-            <PersistentString
-               value = "bitOffset">
-            </PersistentString>
-            <PersistentString
-               value = "(1 &lt;&lt; i) - 1">
-            </PersistentString>
-            <PersistentString
-               value = "WOZtmp.shift16">
-            </PersistentString>
-         </PersistentStrings>
+         contextName = "AND:6502_instr_logic.h">
       </ContextState>
       <ContextState
          contextName = "HiRes.compute():HiRes.swift">
          <PersistentStrings>
             <PersistentString
-               value = "computePipelineState.maxTotalThreadsPerThreadgroup">
+               value = "UnsafeRawBufferPointer(result)">
             </PersistentString>
             <PersistentString
                value = "result[2]">
             </PersistentString>
             <PersistentString
-               value = "UnsafeRawBufferPointer(result)">
+               value = "computePipelineState.maxTotalThreadsPerThreadgroup">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "HiRes.initMetal():HiRes.swift">
+         contextName = "ViewController.mouseMoved(with:):ViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "mtlBufferB">
+               value = "oldLocation">
             </PersistentString>
             <PersistentString
-               value = "addFunction">
+               value = "mouseLocation">
             </PersistentString>
             <PersistentString
-               value = "device">
-            </PersistentString>
-            <PersistentString
-               value = "mtlBufferA">
-            </PersistentString>
-            <PersistentString
-               value = "mtlBufferC">
+               value = "view.bounds">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
-         contextName = "specialized closure #1 in DebuggerViewController.DisplayDisassembly():DebuggerViewController.swift">
+         contextName = "closure #1 in ViewController.Update():ViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "line_number">
+               value = "MEMcfg.txt_page_2">
             </PersistentString>
             <PersistentString
-               value = "currentScrollLine">
+               value = "self.shadowTxt">
             </PersistentString>
             <PersistentString
-               value = "current_line_number">
+               value = "txt">
+            </PersistentString>
+            <PersistentString
+               value = "MEMcfg.is_80STORE">
+            </PersistentString>
+            <PersistentString
+               value = "txtArr">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -111,10 +88,10 @@
                value = "disassLineRange[forLine]">
             </PersistentString>
             <PersistentString
-               value = "disassLineRange">
+               value = "disassLineRange.count">
             </PersistentString>
             <PersistentString
-               value = "disassLineRange.count">
+               value = "disassLineRange">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -154,10 +131,10 @@
          contextName = "HiRes.draw(_:):HiRes.swift">
          <PersistentStrings>
             <PersistentString
-               value = "linAddr">
+               value = "ctx?.bitsPerComponent">
             </PersistentString>
             <PersistentString
-               value = "shadowScreen">
+               value = "ctx?.data">
             </PersistentString>
             <PersistentString
                value = "ctx?.width">
@@ -174,21 +151,21 @@
             <PersistentString
                value = "ctx?.bitmapInfo">
             </PersistentString>
+            <PersistentString
+               value = "shadowScreen">
+            </PersistentString>
             <PersistentString
                value = "(blockH7 | ( block &amp; bitMask ))">
             </PersistentString>
             <PersistentString
                value = "HiRes.blockCols">
             </PersistentString>
+            <PersistentString
+               value = "linAddr">
+            </PersistentString>
             <PersistentString
                value = "ctx?.height">
             </PersistentString>
-            <PersistentString
-               value = "ctx?.bitsPerComponent">
-            </PersistentString>
-            <PersistentString
-               value = "ctx?.data">
-            </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
@@ -215,7 +192,7 @@
          contextName = "DebuggerViewController.DisplayDisassembly():DebuggerViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "line_number">
+               value = "disass_addr_min">
             </PersistentString>
             <PersistentString
                value = "disass_addr">
@@ -224,7 +201,7 @@
                value = "m6502.PC">
             </PersistentString>
             <PersistentString
-               value = "disass_addr_min">
+               value = "line_number">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -358,6 +335,14 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "mach_msg2_trap:(null)">
+         <PersistentStrings>
+            <PersistentString
+               value = "m6502">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "ViewController.Reset(_:):ViewController.swift">
          <PersistentStrings>
@@ -491,7 +476,7 @@
                value = "m6502_saved.PC">
             </PersistentString>
             <PersistentString
-               value = "scroll_line_number">
+               value = "isCurrentLine">
             </PersistentString>
             <PersistentString
                value = "highlighted_line_number">
@@ -500,7 +485,7 @@
                value = "m6502.PC">
             </PersistentString>
             <PersistentString
-               value = "isCurrentLine">
+               value = "scroll_line_number">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -514,7 +499,7 @@
                value = "textDisplay_height_diff">
             </PersistentString>
             <PersistentString
-               value = "textDisplay.frame">
+               value = "MonitorView.textViewBounds">
             </PersistentString>
             <PersistentString
                value = "frame.size">
@@ -526,7 +511,7 @@
                value = "textDisplay_width_diff">
             </PersistentString>
             <PersistentString
-               value = "MonitorView.textViewBounds">
+               value = "textDisplay.frame">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -592,10 +577,10 @@
          contextName = "set_flags_NZC:common.h">
          <PersistentStrings>
             <PersistentString
-               value = "(unsigned)test ">
+               value = "(unsigned)0xFF">
             </PersistentString>
             <PersistentString
-               value = "(unsigned)0xFF">
+               value = "(unsigned)test ">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -700,10 +685,10 @@
                value = "MEMcfg.int_Cx_ROM">
             </PersistentString>
             <PersistentString
-               value = "(int)IOframe">
+               value = "m6502.clkfrm">
             </PersistentString>
             <PersistentString
-               value = "m6502.clkfrm">
+               value = "(int)IOframe">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -714,10 +699,10 @@
                value = "Apple2_64K_AUX + 0xC600">
             </PersistentString>
             <PersistentString
-               value = "(void*)rom">
+               value = "Apple2_64K_RAM + 0xC600">
             </PersistentString>
             <PersistentString
-               value = "Apple2_64K_RAM + 0xC600">
+               value = "(void*)rom">
             </PersistentString>
             <PersistentString
                value = "strlen(fullPath)">
@@ -841,16 +826,16 @@
          contextName = "DisplayScrollView.scrollWheel(with:):DisplayScrollView.swift">
          <PersistentStrings>
             <PersistentString
-               value = "textView.defaultParagraphStyle?.lineSpacing">
+               value = "subviews[1].subviews">
             </PersistentString>
             <PersistentString
                value = "subviews">
             </PersistentString>
             <PersistentString
-               value = "subviews[1].subviews">
+               value = "documentView">
             </PersistentString>
             <PersistentString
-               value = "documentView">
+               value = "textView.defaultParagraphStyle?.lineSpacing">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -942,25 +927,25 @@
          contextName = "_fetch_dbg:mmio.c">
          <PersistentStrings>
             <PersistentString
-               value = "memread8_low(m6502.PC)">
+               value = "disassembly.pOpcode">
             </PersistentString>
             <PersistentString
-               value = "disassembly.pOpcode">
+               value = "memread8_low(m6502.PC)">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
          contextName = "m6502_dbg_bp_add:6502_bp.c">
          <PersistentStrings>
+            <PersistentString
+               value = "bp">
+            </PersistentString>
             <PersistentString
                value = "bp_array">
             </PersistentString>
             <PersistentString
                value = "mem_bp_arr">
             </PersistentString>
-            <PersistentString
-               value = "bp">
-            </PersistentString>
          </PersistentStrings>
       </ContextState>
       <ContextState
@@ -1031,16 +1016,16 @@
          contextName = "DebuggerViewController.DisplayDisassembly(scrollY:):DebuggerViewController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "highlighted_line_number">
+               value = "scroll_line_number">
             </PersistentString>
             <PersistentString
-               value = "isCurrentLine">
+               value = "highlighted_line_number">
             </PersistentString>
             <PersistentString
                value = "m6502.PC">
             </PersistentString>
             <PersistentString
-               value = "scroll_line_number">
+               value = "isCurrentLine">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1156,7 +1141,7 @@
          contextName = "LoRes.Update():LoRes.swift">
          <PersistentStrings>
             <PersistentString
-               value = "blockChanged[ screenIdx ]">
+               value = "UInt8( (block &gt;&gt; 4) &amp; 0x0F )">
             </PersistentString>
             <PersistentString
                value = "UInt8(block)">
@@ -1165,7 +1150,7 @@
                value = "UInt8(block &amp; 4)">
             </PersistentString>
             <PersistentString
-               value = "UInt8( (block &gt;&gt; 4) &amp; 0x0F )">
+               value = "blockChanged[ screenIdx ]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1222,10 +1207,10 @@
                value = "m6502">
             </PersistentString>
             <PersistentString
-               value = "(void*)Apple2_64K_RAM">
+               value = "Apple2_64K_AUX + 0x3600">
             </PersistentString>
             <PersistentString
-               value = "Apple2_64K_RAM + 0x3600">
+               value = "m6502.clkfrm">
             </PersistentString>
             <PersistentString
                value = "m6502.ecoSpindown">
@@ -1234,10 +1219,10 @@
                value = "m6502.PC">
             </PersistentString>
             <PersistentString
-               value = "Apple2_64K_AUX + 0x3600">
+               value = "(void*)Apple2_64K_RAM">
             </PersistentString>
             <PersistentString
-               value = "m6502.clkfrm">
+               value = "Apple2_64K_RAM + 0x3600">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1251,7 +1236,7 @@
                value = "pdl_value[pdl]">
             </PersistentString>
             <PersistentString
-               value = "normalized_time &gt;= pdl_value[pdl] ? 255 : 0">
+               value = "normalized_time">
             </PersistentString>
             <PersistentString
                value = "(3300 * 255/3300)">
@@ -1263,7 +1248,7 @@
                value = "1 * 512 * (1  - ( 3300 / 3300.0  ))">
             </PersistentString>
             <PersistentString
-               value = "normalized_time">
+               value = "normalized_time &gt;= pdl_value[pdl] ? 255 : 0">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1282,10 +1267,10 @@
          contextName = "ToolBarController.GamePort(_:):ToolBarController.swift">
          <PersistentStrings>
             <PersistentString
-               value = "ViewController.current?.mouseCursorJoystickEmulation">
+               value = "ViewController.current?.mouseCursorHidden">
             </PersistentString>
             <PersistentString
-               value = "ViewController.current?.mouseCursorHidden">
+               value = "ViewController.current?.mouseCursorJoystickEmulation">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1508,7 +1493,7 @@
                value = "m6502.PC">
             </PersistentString>
             <PersistentString
-               value = "m6502.clkfrm">
+               value = "m6502.debugger.on">
             </PersistentString>
             <PersistentString
                value = "textLines * (textCols+1) + textCols">
@@ -1517,7 +1502,7 @@
                value = "frameCounter">
             </PersistentString>
             <PersistentString
-               value = "m6502.debugger.on">
+               value = "m6502.clkfrm">
             </PersistentString>
             <PersistentString
                value = "spkr_play_disk_motor_time">
@@ -1547,13 +1532,13 @@
          contextName = "m6502_Debug:6502.c">
          <PersistentStrings>
             <PersistentString
-               value = "m6502.SP">
+               value = "m6502.debugger.SP">
             </PersistentString>
             <PersistentString
                value = "m6502.debugger.mask.ret">
             </PersistentString>
             <PersistentString
-               value = "m6502.debugger.SP">
+               value = "m6502.SP">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1568,6 +1553,66 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "woz_write:woz.c">
+         <PersistentStrings>
+            <PersistentString
+               value = "WOZwrite.data">
+            </PersistentString>
+            <PersistentString
+               value = "new">
+            </PersistentString>
+            <PersistentString
+               value = "WOZtmp.shift16">
+            </PersistentString>
+            <PersistentString
+               value = "WOZwrite.shift">
+            </PersistentString>
+            <PersistentString
+               value = "bitOffset">
+            </PersistentString>
+            <PersistentString
+               value = "(1 &lt;&lt; i) - 1">
+            </PersistentString>
+            <PersistentString
+               value = "WOZwrite.shift16">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "HiRes.initMetal():HiRes.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "mtlBufferB">
+            </PersistentString>
+            <PersistentString
+               value = "addFunction">
+            </PersistentString>
+            <PersistentString
+               value = "device">
+            </PersistentString>
+            <PersistentString
+               value = "mtlBufferA">
+            </PersistentString>
+            <PersistentString
+               value = "mtlBufferC">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "specialized closure #1 in DebuggerViewController.DisplayDisassembly():DebuggerViewController.swift">
+         <PersistentStrings>
+            <PersistentString
+               value = "line_number">
+            </PersistentString>
+            <PersistentString
+               value = "currentScrollLine">
+            </PersistentString>
+            <PersistentString
+               value = "current_line_number">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "ViewController.newUpdateTimer(timeInterval:):ViewController.swift">
          <PersistentStrings>
@@ -1583,7 +1628,7 @@
                value = "default_MHz_6502 * 1000 * 1000 / spkr_sample_rate">
             </PersistentString>
             <PersistentString
-               value = "( (spkr_clk + m6502.clkfrm) / ( 1024000 / spkr_sample_rate ) ) * 2">
+               value = "( (spkr_clk + m6502.clkfrm) / ( default_MHz_6502 * 1000 * 1000 / spkr_sample_rate)) * 2">
             </PersistentString>
             <PersistentString
                value = "(int16_t)28000 + (int16_t)-32768">
@@ -1601,7 +1646,7 @@
                value = "(spkr_clk + m6502.clkfrm)">
             </PersistentString>
             <PersistentString
-               value = "( (spkr_clk + m6502.clkfrm) / ( default_MHz_6502 * 1000 * 1000 / spkr_sample_rate)) * 2">
+               value = "( (spkr_clk + m6502.clkfrm) / ( 1024000 / spkr_sample_rate ) ) * 2">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
@@ -1616,42 +1661,5 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
-      <ContextState
-         contextName = "AND:6502_instr_logic.h">
-      </ContextState>
-      <ContextState
-         contextName = "ViewController.mouseMoved(with:):ViewController.swift">
-         <PersistentStrings>
-            <PersistentString
-               value = "oldLocation">
-            </PersistentString>
-            <PersistentString
-               value = "mouseLocation">
-            </PersistentString>
-            <PersistentString
-               value = "view.bounds">
-            </PersistentString>
-         </PersistentStrings>
-      </ContextState>
-      <ContextState
-         contextName = "closure #1 in ViewController.Update():ViewController.swift">
-         <PersistentStrings>
-            <PersistentString
-               value = "txtArr">
-            </PersistentString>
-            <PersistentString
-               value = "self.shadowTxt">
-            </PersistentString>
-            <PersistentString
-               value = "txt">
-            </PersistentString>
-            <PersistentString
-               value = "MEMcfg.is_80STORE">
-            </PersistentString>
-            <PersistentString
-               value = "MEMcfg.txt_page_2">
-            </PersistentString>
-         </PersistentStrings>
-      </ContextState>
    </ContextStates>
 </VariablesViewState>
diff --git a/A2Mac/Base.lproj/Debugger.storyboard b/A2Mac/Base.lproj/Debugger.storyboard
index 875b367..ae4067d 100644
--- a/A2Mac/Base.lproj/Debugger.storyboard
+++ b/A2Mac/Base.lproj/Debugger.storyboard
@@ -236,7 +236,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="1280" height="800"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uQh-oP-EwQ" userLabel="DisassBackground">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uQh-oP-EwQ" userLabel="DisassBackground">
                                 <rect key="frame" x="12" y="10" width="362" height="751"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" drawsBackground="YES" id="YJj-UG-uPe">
                                     <font key="font" metaFont="system" size="10"/>
@@ -244,7 +244,7 @@
                                     <color key="backgroundColor" red="0.1137254902" green="0.1137254902" blue="0.1137254902" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KwD-2D-fNp" userLabel="DisassHighlighter">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KwD-2D-fNp" userLabel="DisassHighlighter">
                                 <rect key="frame" x="12" y="746" width="362" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="ZoQ-wC-c4X"/>
@@ -255,7 +255,7 @@
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mgy-Qm-MWH" userLabel="DisassCursor">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mgy-Qm-MWH" userLabel="DisassCursor">
                                 <rect key="frame" x="12" y="700" width="362" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="iWk-6p-CrU"/>
@@ -266,7 +266,7 @@
                                     <color key="backgroundColor" white="1" alpha="0.33000000000000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lw3-np-MbY" userLabel="Disassembly">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lw3-np-MbY" userLabel="Disassembly">
                                 <rect key="frame" x="10" y="10" width="366" height="751"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" id="V2q-LD-et1">
                                     <font key="font" metaFont="system" size="10"/>
@@ -274,7 +274,7 @@
                                     <color key="backgroundColor" red="0.11372549019607843" green="0.11372549019607843" blue="0.11372549019607843" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TWP-wN-aCW" userLabel="MemoryBackground">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TWP-wN-aCW" userLabel="MemoryBackground">
                                 <rect key="frame" x="374" y="10" width="664" height="448"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" drawsBackground="YES" id="1Ul-O8-InU">
                                     <font key="font" metaFont="system" size="10"/>
@@ -282,7 +282,7 @@
                                     <color key="backgroundColor" red="0.1137254902" green="0.1137254902" blue="0.1137254902" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VVf-7D-pjV" userLabel="MemoryHighlighter Horizontal">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VVf-7D-pjV" userLabel="MemoryHighlighter Horizontal">
                                 <rect key="frame" x="374" y="395" width="664" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="DD3-Fv-9rp"/>
@@ -293,7 +293,7 @@
                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.44" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f2z-vp-zIf" userLabel="MemoryHighlighter Vertical">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f2z-vp-zIf" userLabel="MemoryHighlighter Vertical">
                                 <rect key="frame" x="492" y="10" width="10" height="448"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="10" id="sVL-zn-P6J"/>
@@ -304,7 +304,7 @@
                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.33000000000000002" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kXX-RT-0Bb" userLabel="MemoryCursor">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kXX-RT-0Bb" userLabel="MemoryCursor">
                                 <rect key="frame" x="490" y="392" width="14" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="14" id="RyF-lI-kBO"/>
@@ -316,7 +316,7 @@
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4pW-7e-eaj" userLabel="Memory">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4pW-7e-eaj" userLabel="Memory">
                                 <rect key="frame" x="372" y="10" width="668" height="448"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" id="iea-16-EtD">
                                     <font key="font" metaFont="system" size="10"/>
@@ -330,7 +330,7 @@
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lUp-Ww-thA">
                                         <rect key="frame" x="0.0" y="760" width="366" height="20"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yYC-5c-mvY" userLabel="Leading Space">
+                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yYC-5c-mvY" userLabel="Leading Space">
                                                 <rect key="frame" x="-2" y="0.0" width="16" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="12" id="6Nf-9P-EJo"/>
@@ -342,7 +342,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bwO-w1-hlg" userLabel="Disass Addr Field">
+                                            <textField focusRingType="none" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bwO-w1-hlg" userLabel="Disass Addr Field">
                                                 <rect key="frame" x="20" y="0.0" width="44" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="XCd-Q5-6sX"/>
@@ -357,7 +357,7 @@
                                                     </connections>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lht-UO-OM3" userLabel="Middle Space">
+                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lht-UO-OM3" userLabel="Middle Space">
                                                 <rect key="frame" x="70" y="0.0" width="8" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="57Q-CT-Gpn"/>
@@ -376,7 +376,7 @@
                                                     <font key="font" metaFont="system"/>
                                                 </buttonCell>
                                             </button>
-                                            <textField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jya-Sa-f8i" userLabel="Middle Space">
+                                            <textField focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jya-Sa-f8i" userLabel="Middle Space">
                                                 <rect key="frame" x="132" y="0.0" width="154" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="150" id="W3U-D5-7k9"/>
@@ -388,7 +388,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hxo-9P-cZv">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hxo-9P-cZv">
                                                 <rect key="frame" x="290" y="4" width="78" height="16"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="16" identifier="Disassembly.Height" id="jZh-9c-yY6"/>
@@ -428,7 +428,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="Hwx-Gd-XW1" userLabel="Disass Display" customClass="DisassView" customModule="A2MacTests" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="-807" width="366" height="754"/>
+                                                    <rect key="frame" x="0.0" y="-807" width="364" height="754"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" red="0.12549019610000001" green="0.12549019610000001" blue="0.12549019610000001" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -472,7 +472,7 @@
   C1F1: 60         RTS</mutableString>
                                                             <attributes>
                                                                 <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                                                <font key="NSFont" metaFont="system" size="10"/>
+                                                                <font key="NSFont" size="10" name="HelveticaNeue"/>
                                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" lineHeightMultiple="1.5" tighteningFactorForTruncation="0.0"/>
                                                             </attributes>
                                                         </fragment>
@@ -523,7 +523,7 @@
                                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Crh-BM-MCy" userLabel="CPU View">
                                                         <rect key="frame" x="0.0" y="0.0" width="300" height="256"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XKO-8T-LZ7">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XKO-8T-LZ7">
                                                                 <rect key="frame" x="4" y="240" width="298" height="16"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="16" id="kwa-Y6-h52"/>
@@ -541,7 +541,7 @@
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" horizontallyResizable="YES" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="Wrs-Qt-Kmd" userLabel="CPU Display" customClass="DisplayView" customModule="A2MacTests" customModuleProvider="target">
-                                                                            <rect key="frame" x="0.0" y="32" width="298" height="270"/>
+                                                                            <rect key="frame" x="0.0" y="-12" width="298" height="270"/>
                                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                             <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -592,7 +592,7 @@
                                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tkP-fH-zDU">
                                                         <rect key="frame" x="308" y="0.0" width="356" height="256"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ugZ-j3-huv">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ugZ-j3-huv">
                                                                 <rect key="frame" x="4" y="240" width="354" height="16"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="16" id="OVy-Wd-oXn"/>
@@ -679,7 +679,7 @@
                                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fik-fC-8sT" userLabel="Search View">
                                                         <rect key="frame" x="0.0" y="484" width="664" height="20"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P9L-wR-0tv" userLabel="Leading Space">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P9L-wR-0tv" userLabel="Leading Space">
                                                                 <rect key="frame" x="-2" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="4" id="39F-LA-n7O"/>
@@ -691,7 +691,7 @@
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p3x-F3-IOa" userLabel="Memory Search Field">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p3x-F3-IOa" userLabel="Memory Search Field">
                                                                 <rect key="frame" x="12" y="0.0" width="572" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="bS5-Xb-qDz"/>
@@ -705,7 +705,7 @@
                                                                     </connections>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eCI-1T-iQB" userLabel="Middle Space">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eCI-1T-iQB" userLabel="Middle Space">
                                                                 <rect key="frame" x="590" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="4" id="O5P-Di-Yom"/>
@@ -753,7 +753,7 @@
                                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d0p-Gc-l7M" userLabel="Memory Header View">
                                                         <rect key="frame" x="0.0" y="456" width="664" height="20"/>
                                                         <subviews>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1q0-LV-pXH" userLabel="Leading Space">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1q0-LV-pXH" userLabel="Leading Space">
                                                                 <rect key="frame" x="-2" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="OJw-Kd-vPY"/>
@@ -765,7 +765,7 @@
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Xtr-61-22R" userLabel="Memory Addr Field">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Xtr-61-22R" userLabel="Memory Addr Field">
                                                                 <rect key="frame" x="12" y="0.0" width="44" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="0zw-JT-a8l"/>
@@ -780,7 +780,7 @@
                                                                     </connections>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19i-lm-kK6" userLabel="Middle Space">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19i-lm-kK6" userLabel="Middle Space">
                                                                 <rect key="frame" x="62" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="4" id="SL4-Al-t75"/>
@@ -792,7 +792,7 @@
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gUS-Q0-ezQ" userLabel="Low Nibble Label">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gUS-Q0-ezQ" userLabel="Low Nibble Label">
                                                                 <rect key="frame" x="74" y="4" width="424" height="16"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="16" identifier="Low Nibble Label.Height" id="EGq-Si-0ib"/>
@@ -843,7 +843,7 @@
                                                                     <constraint firstAttribute="width" constant="34" id="Yk3-Fa-Bge"/>
                                                                 </constraints>
                                                             </button>
-                                                            <textField hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LCb-7J-76T" userLabel="Right Space">
+                                                            <textField hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LCb-7J-76T" userLabel="Right Space">
                                                                 <rect key="frame" x="-2" y="0.0" width="8" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="20" identifier="Memory Addr Field.Height" id="5wb-72-6Pa"/>
@@ -975,7 +975,7 @@
                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aqD-5D-Xz1" userLabel="IO View">
                                                 <rect key="frame" x="0.0" y="390" width="226" height="390"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DmO-qw-owI">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DmO-qw-owI">
                                                         <rect key="frame" x="-2" y="374" width="230" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="16" id="ISe-0R-r82"/>
@@ -1040,7 +1040,7 @@
                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ypu-2G-o19" userLabel="ZP View">
                                                 <rect key="frame" x="0.0" y="0.0" width="226" height="370"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6av-it-wJZ">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6av-it-wJZ">
                                                         <rect key="frame" x="4" y="354" width="224" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="16" id="N6w-DV-CWZ"/>
@@ -1184,9 +1184,14 @@
                         <outlet property="DisassTextField" destination="lw3-np-MbY" id="xv3-mQ-zMX"/>
                         <outlet property="Disass_Display" destination="Hwx-Gd-XW1" id="XHS-dZ-gCR"/>
                         <outlet property="Disass_Scroll" destination="Pcn-4j-EEM" id="5w1-DZ-ypu"/>
+                        <outlet property="IO_Display" destination="dAS-QV-erJ" id="pEh-27-sTo"/>
+                        <outlet property="Mem1_AddrInfo" destination="gUS-Q0-ezQ" id="ioC-JR-0Km"/>
+                        <outlet property="Mem1_Addr_Nibbles" destination="gUS-Q0-ezQ" id="kZD-sw-cx4"/>
                         <outlet property="Mem1_Display" destination="qqp-t0-j4i" id="85A-sB-M0p"/>
                         <outlet property="MemoryAddressField" destination="p3x-F3-IOa" id="9yv-2e-Lm7"/>
+                        <outlet property="MemoryTextField" destination="4pW-7e-eaj" id="RLj-FT-AJb"/>
                         <outlet property="Stack_Display" destination="BHr-Q4-rBI" id="qlA-JC-xkW"/>
+                        <outlet property="ZP_Display" destination="Gsx-fZ-jrH" id="gXI-UV-mg5"/>
                     </connections>
                 </viewController>
                 <customObject id="DyX-eh-3mW" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
diff --git a/A2Mac/Base.lproj/Main.storyboard b/A2Mac/Base.lproj/Main.storyboard
index ff1aee7..af90902 100644
--- a/A2Mac/Base.lproj/Main.storyboard
+++ b/A2Mac/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -1525,7 +1525,7 @@ Gw
                                     <popUpButton key="view" id="rfS-6q-EKe">
                                         <rect key="frame" x="0.0" y="14" width="43" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Quick Disk" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="8bV-Aa-zHf">
+                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf:image" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="8bV-Aa-zHf">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="7Vp-Rc-UbT">
@@ -1548,7 +1548,7 @@ Gw
                                     <popUpButton key="view" id="MAv-S5-diZ">
                                         <rect key="frame" x="0.0" y="14" width="43" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Chip" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="WVW-Wo-mc9">
+                                        <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf:image" imagePosition="only" alignment="right" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" id="WVW-Wo-mc9">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
                                             <menu key="menu" id="Gc4-Or-LMB">
@@ -1948,7 +1948,7 @@ Gw
                                         <subviews>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="49f-8R-QCc" userLabel="Disk1 Button">
                                                 <rect key="frame" x="-5" y="75" width="109" height="99"/>
-                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:CNs-lh-urM:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" id="CNs-lh-urM" userLabel="Disk1 Pop Up Button Cell">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" id="CNs-lh-urM" userLabel="Disk1 Pop Up Button Cell">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
                                                     <menu key="menu" id="N33-K0-nba" userLabel="Disk1 Menu">
@@ -2000,7 +2000,7 @@ Gw
                                             </popUpButton>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="QDr-Cp-9QQ" userLabel="Disk2 Button">
                                                 <rect key="frame" x="-5" y="0.0" width="109" height="99"/>
-                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:CNs-lh-urM:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" selectedItem="28N-X8-n7Q" id="8FA-1D-k8p">
+                                                <popUpButtonCell key="cell" type="bevel" bezelStyle="regularSquare" image="popUpButtonCell:8bV-Aa-zHf:image" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" imageScaling="proportionallyUpOrDown" inset="2" pullsDown="YES" arrowPosition="noArrow" altersStateOfSelectedItem="NO" selectedItem="28N-X8-n7Q" id="8FA-1D-k8p">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
                                                     <menu key="menu" id="8He-mk-LVI">
@@ -139134,7 +139134,7 @@ fRFJAH0RSwB9EU0AfSLtAH0i8gB9Iv8AfSMCAH0jDwB9IxQAfSMcAH0jHwB9IyQAfSMsAAAAAAAABAEA
 AAAAAAAAUQAAAAAAAAAAAAAAAAB9Iy8
 </mutableData>
         </image>
-        <image name="popUpButtonCell:CNs-lh-urM:image" width="1" height="1">
+        <image name="popUpButtonCell:8bV-Aa-zHf:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGvEBcLDBkaIRQmKywzNjs+P0RHSEtVXV5iZVUkbnVsbNYNDg8Q
diff --git a/A2Mac/DebuggerViewController.swift b/A2Mac/DebuggerViewController.swift
index b40c3fc..89918ab 100644
--- a/A2Mac/DebuggerViewController.swift
+++ b/A2Mac/DebuggerViewController.swift
@@ -28,10 +28,14 @@ class DebuggerViewController: NSViewController {
 
     @IBOutlet var CPU_Display: DisplayView!
     @IBOutlet var Stack_Display: DisplayView!
+    @IBOutlet var Mem1_Addr_Nibbles: NSTextField!
     @IBOutlet var Mem1_Display: DisplayView!
+    @IBOutlet var ZP_Display: DisplayView!
+    @IBOutlet var IO_Display: DisplayView!
     @IBOutlet var Disass_Scroll: DisplayScrollView!
     @IBOutlet var Disass_Display: DisplayView!
     @IBOutlet weak var MemoryAddressField: NSTextField!
+    @IBOutlet weak var MemoryTextField: NSTextField!
     @IBOutlet weak var DisassAddressField: NSTextField!
     @IBOutlet weak var DisassAddressPC: NSButton!
     @IBOutlet weak var DisassTextField: NSTextField!
@@ -42,27 +46,43 @@ class DebuggerViewController: NSViewController {
     @IBOutlet weak var DisassBackground: NSTextField!
 
 
-    let textFont : NSFont = NSFont(name: "Print Char 21", size: 10.0)!
+    let infoFont : NSFont = NSFont(name: "Print Char 21", size: 10.0)!
+    let disassFont : NSFont = NSFont(name: "Print Char 21", size: 10.0)!
     let textColor : NSColor = NSColor.white
     let highlightColor : NSColor = NSColor.blue
-    let textParagraph : NSMutableParagraphStyle = NSMutableParagraphStyle()
-    let textAttribs : [NSAttributedString.Key : NSObject]
-    let highlightAttribs : [NSAttributedString.Key : NSObject]
+    let infoTextParagraph : NSMutableParagraphStyle = NSMutableParagraphStyle()
+    let disassTextParagraph : NSMutableParagraphStyle = NSMutableParagraphStyle()
+    let infoTextAttribs : [NSAttributedString.Key : NSObject]
+    let disassTextAttribs : [NSAttributedString.Key : NSObject]
+    let infoHighlightAttribs : [NSAttributedString.Key : NSObject]
+    let disassHighlightAttribs : [NSAttributedString.Key : NSObject]
 
     required init?(coder: NSCoder) {
 //        textParagraph.lineSpacing = 10.0  /*this sets the space BETWEEN lines to 10points*/
 //        textParagraph.maximumLineHeight = 12.0/*this sets the MAXIMUM height of the lines to 12points*/
-        textParagraph.lineHeightMultiple = 1.15
-        textAttribs = [
-            NSAttributedString.Key.font: textFont,
+        disassTextParagraph.lineHeightMultiple = 1.15
+        disassTextAttribs = [
+            NSAttributedString.Key.font: disassFont,
             NSAttributedString.Key.foregroundColor: textColor,
-            NSAttributedString.Key.paragraphStyle: textParagraph
+            NSAttributedString.Key.paragraphStyle: disassTextParagraph
         ]
-        highlightAttribs = [
-            NSAttributedString.Key.font: textFont,
+        disassHighlightAttribs = [
+            NSAttributedString.Key.font: disassFont,
             NSAttributedString.Key.foregroundColor: textColor,
             NSAttributedString.Key.backgroundColor: highlightColor,
-            NSAttributedString.Key.paragraphStyle: textParagraph
+            NSAttributedString.Key.paragraphStyle: disassTextParagraph
+        ]
+        infoTextParagraph.lineHeightMultiple = 1.15
+        infoTextAttribs = [
+            NSAttributedString.Key.font: disassFont,
+            NSAttributedString.Key.foregroundColor: textColor,
+            NSAttributedString.Key.paragraphStyle: infoTextParagraph
+        ]
+        infoHighlightAttribs = [
+            NSAttributedString.Key.font: disassFont,
+            NSAttributedString.Key.foregroundColor: textColor,
+            NSAttributedString.Key.backgroundColor: highlightColor,
+            NSAttributedString.Key.paragraphStyle: infoTextParagraph
         ]
 
         super.init(coder: coder)
@@ -71,8 +91,8 @@ class DebuggerViewController: NSViewController {
 
 
     func disassDisplay(str : String) {
-        let attrString = NSAttributedString.init(string: String(str.dropLast()), attributes: textAttribs)
-        DisassTextField.attributedStringValue = attrString
+        let disassAttrString = NSAttributedString.init(string: String(str.dropLast()), attributes: disassTextAttribs)
+        DisassTextField.attributedStringValue = disassAttrString
     }
 
 
@@ -87,6 +107,14 @@ class DebuggerViewController: NSViewController {
         var r = Disass_Display.frame
         r.size.height = 65535
         Disass_Display.frame = r
+        
+        
+        CPU_Display.font = infoFont
+        Stack_Display.font = infoFont
+        Mem1_Addr_Nibbles.font = infoFont
+        Mem1_Display.font = infoFont
+        ZP_Display.font = infoFont
+        IO_Display.font = infoFont
 
     }