diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="6.25" altunitdist="mil" altunit="mil"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="3.125" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -23,10 +23,10 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="yes"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
@@ -192,9 +192,9 @@
 <text x="40.16375" y="10.00125" size="0.8128" layer="21" ratio="16">pwr</text>
 <text x="46.355" y="11.43" size="0.8128" layer="1" ratio="16">LED placement?
 Could eliminate 1 or both</text>
-<text x="-0.635" y="15.24" size="1.778" layer="21">Add cap arrays for C&lt;=1uF</text>
 <text x="-0.635" y="17.78" size="1.778" layer="21">ADD TEST POINTS FOR SWD</text>
 <text x="-0.635" y="20.32" size="1.778" layer="21">Add slight corner bevel</text>
+<text x="1.27" y="15.24" size="1.778" layer="1">Change all drills to 12</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2166,6 +2166,46 @@ You are welcome to use this library for 
 <vertex x="-1.75" y="-1.5"/>
 </polygon>
 </package>
+<package name="1206-ARV-4">
+<wire x1="-1.55" y1="0.75" x2="-1.35" y2="0.75" width="0.1016" layer="51"/>
+<wire x1="-1.05" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
+<wire x1="-0.55" y1="0.75" x2="-0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="-0.4" y1="0.6" x2="-0.25" y2="0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="-0.25" y1="0.75" x2="0.25" y2="0.75" width="0.1016" layer="51"/>
+<wire x1="0.55" y1="0.75" x2="1.05" y2="0.75" width="0.1016" layer="51"/>
+<wire x1="1.35" y1="0.75" x2="1.55" y2="0.75" width="0.1016" layer="51"/>
+<wire x1="1.55" y1="0.75" x2="1.55" y2="-0.75" width="0.1016" layer="21"/>
+<wire x1="1.55" y1="-0.75" x2="1.35" y2="-0.75" width="0.1016" layer="51"/>
+<wire x1="1.05" y1="-0.75" x2="0.55" y2="-0.75" width="0.1016" layer="51"/>
+<wire x1="0.25" y1="-0.75" x2="-0.25" y2="-0.75" width="0.1016" layer="51"/>
+<wire x1="-0.25" y1="-0.75" x2="-0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="-0.4" y1="-0.6" x2="-0.55" y2="-0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="-0.55" y1="-0.75" x2="-1.05" y2="-0.75" width="0.1016" layer="51"/>
+<wire x1="-1.35" y1="-0.75" x2="-1.55" y2="-0.75" width="0.1016" layer="51"/>
+<wire x1="-1.55" y1="-0.75" x2="-1.55" y2="0.75" width="0.1016" layer="21"/>
+<wire x1="-1.35" y1="0.75" x2="-1.2" y2="0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="-1.2" y1="0.6" x2="-1.05" y2="0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="-1.05" y1="-0.75" x2="-1.2" y2="-0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="-1.2" y1="-0.6" x2="-1.35" y2="-0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="1.05" y1="0.75" x2="1.2" y2="0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="1.2" y1="0.6" x2="1.35" y2="0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="1.35" y1="-0.75" x2="1.2" y2="-0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="1.2" y1="-0.6" x2="1.05" y2="-0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="0.25" y1="0.75" x2="0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="0.4" y1="0.6" x2="0.55" y2="0.75" width="0.1016" layer="51" curve="90"/>
+<wire x1="0.55" y1="-0.75" x2="0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
+<wire x1="0.4" y1="-0.6" x2="0.25" y2="-0.75" width="0.1016" layer="51" curve="90"/>
+<smd name="C1A" x="-1.2" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
+<smd name="C2A" x="-0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
+<smd name="C3A" x="0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
+<smd name="C4A" x="1.2" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
+<smd name="C4B" x="1.2" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
+<smd name="C3B" x="0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
+<smd name="C2B" x="-0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
+<smd name="C1B" x="-1.2" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
+<text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2272,6 +2312,21 @@ Source: PANASONIC .. aoc0000ce1.pdf</des
 </package>
 </packages>
 </library>
+<library name="testpad">
+<description>&lt;b&gt;Test Pins/Pads&lt;/b&gt;&lt;p&gt;
+Cream on SMD OFF.&lt;br&gt;
+new: Attribute TP_SIGNAL_NAME&lt;br&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="TP09R">
+<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
+<smd name="TP" x="0" y="0" dx="0.9" dy="0.9" layer="1" roundness="100" cream="no"/>
+<text x="-0.4501" y="0.5001" size="1.27" layer="25">&gt;NAME</text>
+<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
+<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
+</package>
+</packages>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -2471,9 +2526,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="-3.3655" y="11.557" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="2.9845" y="9.8425" size="0.4064" layer="27" ratio="10"/>
 </element>
-<element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="3.175" smashed="yes">
-<attribute name="NAME" x="-3.3655" y="2.9845" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="2.9845" y="2.54" size="0.4064" layer="27" ratio="10"/>
+<element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="4.445" smashed="yes">
+<attribute name="NAME" x="-3.3655" y="4.2545" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="2.9845" y="3.81" size="0.4064" layer="27" ratio="10"/>
 </element>
 <element name="SW101" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.985" smashed="yes" rot="R45">
 <attribute name="NAME" x="35.44119375" y="9.75685625" size="0.8128" layer="25" ratio="16" rot="R315"/>
@@ -2523,10 +2578,6 @@ design rules under a new name.</descript
 <attribute name="NAME" x="9.68" y="42.23625" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="30.635" y="14.32625" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
-<element name="C1" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="9.128125" rot="R180"/>
-<element name="C2" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="7.699375" rot="R180"/>
-<element name="C3" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="4.683125" rot="R180"/>
-<element name="C4" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="6.19125" rot="R180"/>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="11.43" y="6.82625" rot="MR180"/>
 <element name="RN1" library="resistor-dil" package="EXBV4V" value="EXB-V4V220JV" x="40.64" y="4.1275">
 <attribute name="OC_NEWARK" value="unknown" x="40.64" y="4.1275" size="0.8128" layer="27" ratio="16" display="off"/>
@@ -2534,10 +2585,17 @@ design rules under a new name.</descript
 <attribute name="MF" value="" x="40.64" y="4.1275" size="0.8128" layer="27" ratio="16" display="off"/>
 <attribute name="OC_FARNELL" value="unknown" x="40.64" y="4.1275" size="0.8128" layer="27" ratio="16" display="off"/>
 </element>
-<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="13.0175" y="6.35" rot="R90"/>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="8.89" y="7.46125" rot="R90"/>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="15.24" y="9.68375"/>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="13.81125" y="2.69875"/>
+<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.684375" y="6.588125" rot="R90"/>
+<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="12.22375" y="2.936875" rot="R180"/>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="17.93875" y="9.445625"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="15.5575" y="2.936875"/>
+<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="7.3025" rot="R270"/>
+<element name="TP1" library="testpad" package="TP09R" value="TPTP09R" x="11.350625" y="9.286875">
+<attribute name="TP_SIGNAL_NAME" value="" x="11.350625" y="9.286875" size="1.778" layer="27" display="off"/>
+</element>
+<element name="TP2" library="testpad" package="TP09R" value="TPTP09R" x="11.43" y="10.556875">
+<attribute name="TP_SIGNAL_NAME" value="" x="11.43" y="10.556875" size="1.778" layer="27" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
@@ -2560,7 +2618,6 @@ design rules under a new name.</descript
 <vertex x="46.99" y="15.875"/>
 <vertex x="-1.27" y="15.875"/>
 </polygon>
-<wire x1="16.70875" y1="9.32625" x2="17.4625" y2="8.5725" width="0.2032" layer="1"/>
 <wire x1="21.59" y1="7.9676" x2="21.59" y2="9.03375" width="0.2032" layer="1"/>
 <wire x1="21.59" y1="9.03375" x2="22.08125" y2="9.525" width="0.2032" layer="1"/>
 <via x="22.86" y="9.525" extent="1-16" drill="0.3048"/>
@@ -2568,7 +2625,6 @@ design rules under a new name.</descript
 <wire x1="28.2575" y1="9.525" x2="28.575" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="28.575" y1="9.8425" x2="29.83" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="29.83" y1="9.8425" x2="29.845" y2="9.8575" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="3.175" x2="0.9017" y2="4.63955" width="0.2032" layer="1"/>
 <via x="31.115" y="10.95375" extent="1-16" drill="0.3048"/>
 <via x="44.92625" y="10.95375" extent="1-16" drill="0.3048"/>
 <via x="44.92625" y="2.8575" extent="1-16" drill="0.3048"/>
@@ -2577,22 +2633,11 @@ design rules under a new name.</descript
 <wire x1="44.92625" y1="2.8575" x2="45.24375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="45.24375" y1="2.69875" x2="44.45" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="44.45" y1="2.54" x2="44.3225" y2="2.54" width="0.2032" layer="1"/>
-<wire x1="17.4625" y1="6.35" x2="17.4625" y2="8.5725" width="0.2032" layer="1"/>
-<via x="18.7325" y="8.5725" extent="1-16" drill="0.3048"/>
-<wire x1="18.7325" y1="8.5725" x2="17.4625" y2="8.5725" width="0.2032" layer="1"/>
+<via x="20.081875" y="4.1275" extent="1-16" drill="0.3048"/>
 <wire x1="44.7675" y1="2.985" x2="44.64" y2="2.35" width="0.2032" layer="1"/>
 <wire x1="44.64" y1="2.35" x2="44.45" y2="2.54" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="6"/>
-<wire x1="20.94" y1="4.1275" x2="19.685" y2="4.1275" width="0.2032" layer="1"/>
-<wire x1="19.685" y1="4.1275" x2="17.4625" y2="6.35" width="0.2032" layer="1"/>
-<contactref element="C1" pad="2"/>
-<contactref element="C3" pad="2"/>
-<contactref element="C2" pad="2"/>
-<contactref element="C4" pad="2"/>
-<wire x1="0.9375" y1="9.128125" x2="0.9375" y2="7.699375" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="7.699375" x2="0.9375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="6.19125" x2="0.9375" y2="4.683125" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="4.683125" x2="0.9375" y2="3.175" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="4.1275" x2="20.081875" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="8.12625" x2="7.62" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="7.62" y1="8.09625" x2="6.985" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="6.985" y1="8.09625" x2="6.50875" y2="8.255" width="0.2032" layer="16"/>
@@ -2615,56 +2660,78 @@ design rules under a new name.</descript
 <wire x1="39.60425" y1="10.16" x2="40.16375" y2="9.6005" width="0.2032" layer="1"/>
 <wire x1="40.82875" y1="8.285" x2="40.82875" y2="8.9355" width="0.2032" layer="1"/>
 <wire x1="40.82875" y1="8.9355" x2="40.16375" y2="9.6005" width="0.2032" layer="1"/>
-<wire x1="16.70875" y1="9.32625" x2="15.89" y2="9.68375" width="0" layer="19" extent="1-1"/>
-<wire x1="8.89" y1="8.11125" x2="8.335" y2="8.12625" width="0" layer="19" extent="1-16"/>
-<wire x1="0.9375" y1="7.699375" x2="1.905" y2="7.9375" width="0" layer="19" extent="1-16"/>
-<wire x1="13.0175" y1="6.35" x2="15.89" y2="9.68375" width="0" layer="19" extent="1-1"/>
-<wire x1="14.46125" y1="2.69875" x2="13.0175" y2="6.35" width="0" layer="19" extent="1-1"/>
+<contactref element="RA1" pad="C1A"/>
+<contactref element="RA1" pad="C2A"/>
+<contactref element="RA1" pad="C3A"/>
+<contactref element="RA1" pad="C4A"/>
+<wire x1="0.8125" y1="8.5025" x2="0.8125" y2="7.7025" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="7.7025" x2="0.8125" y2="6.9025" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="6.9025" x2="0.8125" y2="6.1025" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="6.1025" x2="0.8125" y2="4.57" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="4.57" x2="0.9375" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="7.7025" x2="0.8125" y2="6.1025" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="4.57" x2="0.8125" y2="3.315" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="3.315" x2="0.9525" y2="3.175" width="0.2032" layer="1"/>
+<via x="0.9525" y="3.175" extent="1-16" drill="0.381"/>
+<wire x1="0.9525" y1="3.175" x2="1.27" y2="1.905" width="0.2032" layer="16"/>
+<wire x1="1.27" y1="1.905" x2="1.905" y2="1.27" width="0.2032" layer="16"/>
+<wire x1="11.57375" y1="2.936875" x2="10.874375" y2="2.936875" width="0.2032" layer="1"/>
+<via x="10.874375" y="2.936875" extent="1-16" drill="0.3048"/>
+<wire x1="10.874375" y1="2.936875" x2="10.874375" y2="2.619375" width="0.2032" layer="16"/>
+<wire x1="10.874375" y1="2.619375" x2="10.795" y2="2.54" width="0.2032" layer="16"/>
+<wire x1="16.2075" y1="2.936875" x2="18.89125" y2="2.936875" width="0.2032" layer="1"/>
+<wire x1="18.89125" y1="2.936875" x2="20.081875" y2="4.1275" width="0.2032" layer="1"/>
+<via x="14.12875" y="6.746875" extent="1-16" drill="0.3048"/>
+<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="14.525625" y1="6.746875" x2="14.684375" y2="6.588125" width="0.2032" layer="1"/>
+<wire x1="18.58875" y1="9.445625" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
+<wire x1="18.58875" y1="11.25625" x2="18.415" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
 <wire x1="0.9375" y1="11.90625" x2="0.9375" y2="11.28625" width="0.2032" layer="1"/>
 <wire x1="0.9375" y1="11.28625" x2="1.11125" y2="11.1125" width="0.2032" layer="1"/>
-<wire x1="1.11125" y1="11.1125" x2="3.175" y2="11.1125" width="0.2032" layer="1"/>
-<via x="3.175" y="11.1125" extent="1-16" drill="0.3048"/>
-<wire x1="3.175" y1="11.1125" x2="3.56125" y2="10.72625" width="0.2032" layer="16"/>
+<wire x1="1.11125" y1="11.1125" x2="4.445" y2="11.1125" width="0.2032" layer="1"/>
+<via x="4.445" y="11.1125" extent="1-16" drill="0.3048"/>
+<wire x1="4.445" y1="11.1125" x2="4.83125" y2="10.72625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="2"/>
-<wire x1="3.56125" y1="10.72625" x2="8.335" y2="10.72625" width="0.2032" layer="16"/>
+<wire x1="4.83125" y1="10.72625" x2="8.335" y2="10.72625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$2">
 <contactref element="C106" pad="2"/>
-<wire x1="2.2375" y1="11.90625" x2="3.175" y2="11.90625" width="0.2032" layer="1"/>
-<via x="3.175" y="11.90625" extent="1-16" drill="0.3048"/>
-<wire x1="3.175" y1="11.90625" x2="3.705" y2="11.37625" width="0.2032" layer="16"/>
+<wire x1="2.2375" y1="11.90625" x2="4.445" y2="11.90625" width="0.2032" layer="1"/>
+<via x="4.445" y="11.90625" extent="1-16" drill="0.3048"/>
+<wire x1="4.445" y1="11.90625" x2="4.975" y2="11.37625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="1"/>
-<wire x1="3.705" y1="11.37625" x2="8.335" y2="11.37625" width="0.2032" layer="16"/>
+<wire x1="4.975" y1="11.37625" x2="8.335" y2="11.37625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
 <contactref element="C105" pad="1"/>
 <wire x1="0.9375" y1="10.4775" x2="0.9375" y2="9.69875" width="0.2032" layer="1"/>
 <wire x1="0.9375" y1="9.69875" x2="1.11125" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="1.11125" y1="9.525" x2="3.175" y2="9.525" width="0.2032" layer="1"/>
-<via x="3.175" y="9.525" extent="1-16" drill="0.3048"/>
-<wire x1="3.27375" y1="9.42625" x2="3.175" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="1.11125" y1="9.525" x2="4.445" y2="9.525" width="0.2032" layer="1"/>
+<via x="4.445" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="4.54375" y1="9.42625" x2="4.445" y2="9.525" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="4"/>
-<wire x1="3.27375" y1="9.42625" x2="8.335" y2="9.42625" width="0.2032" layer="16"/>
+<wire x1="4.54375" y1="9.42625" x2="8.335" y2="9.42625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$4">
 <contactref element="C105" pad="2"/>
-<wire x1="2.2375" y1="10.4775" x2="3.175" y2="10.31875" width="0.2032" layer="1"/>
-<via x="3.175" y="10.31875" extent="1-16" drill="0.3048"/>
-<wire x1="3.4175" y1="10.07625" x2="3.175" y2="10.31875" width="0.2032" layer="16"/>
+<via x="4.445" y="10.31875" extent="1-16" drill="0.3048"/>
+<wire x1="4.6875" y1="10.07625" x2="4.445" y2="10.31875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="3.4175" y1="10.07625" x2="8.335" y2="10.07625" width="0.2032" layer="16"/>
+<wire x1="4.6875" y1="10.07625" x2="8.335" y2="10.07625" width="0.2032" layer="16"/>
+<wire x1="2.2375" y1="10.4775" x2="2.39625" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="2.39625" y1="10.31875" x2="4.445" y2="10.31875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="R103" pad="2"/>
-<wire x1="2.2375" y1="3.175" x2="4.206875" y2="3.095625" width="0.2032" layer="1"/>
-<wire x1="4.206875" y1="3.095625" x2="3.96875" y2="3.96875" width="0.2032" layer="1"/>
 <via x="3.96875" y="3.96875" extent="1-16" drill="0.3048"/>
 <wire x1="3.96875" y1="3.96875" x2="4.36125" y2="3.57625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
 <wire x1="4.36125" y1="3.57625" x2="8.335" y2="3.57625" width="0.2032" layer="16"/>
+<wire x1="2.2375" y1="4.445" x2="3.4925" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="4.445" x2="3.96875" y2="3.96875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$9">
 <via x="3.4925" y="6.82625" extent="1-16" drill="0.3048"/>
@@ -2675,10 +2742,9 @@ design rules under a new name.</descript
 <wire x1="3.81" y1="6.50875" x2="3.4925" y2="6.82625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
 <wire x1="3.74125" y1="2.92625" x2="8.335" y2="2.92625" width="0.2032" layer="16"/>
-<contactref element="C2" pad="1"/>
-<wire x1="3.4925" y1="6.82625" x2="3.4925" y2="7.39549375" width="0.2032" layer="1"/>
-<wire x1="3.4925" y1="7.39549375" x2="3.26799375" y2="7.62" width="0.2032" layer="1"/>
-<wire x1="3.26799375" y1="7.62" x2="2.2375" y2="7.699375" width="0.2032" layer="1"/>
+<contactref element="RA1" pad="C3B"/>
+<wire x1="2.3625" y1="6.9025" x2="3.41625" y2="6.9025" width="0.2032" layer="1"/>
+<wire x1="3.41625" y1="6.9025" x2="3.4925" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="5.23875" extent="1-16" drill="0.3048"/>
@@ -2687,10 +2753,10 @@ design rules under a new name.</descript
 <wire x1="2.8575" y1="4.92125" x2="3.175" y2="5.23875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
 <wire x1="3.5975" y1="2.27625" x2="8.335" y2="2.27625" width="0.2032" layer="16"/>
-<contactref element="C4" pad="1"/>
-<wire x1="3.175" y1="5.23875" x2="3.175" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="3.175" y1="6.19125" x2="2.8575" y2="6.50875" width="0.2032" layer="1"/>
-<wire x1="2.8575" y1="6.50875" x2="2.2375" y2="6.19125" width="0.2032" layer="1"/>
+<contactref element="RA1" pad="C4B"/>
+<wire x1="2.3625" y1="6.1025" x2="3.105" y2="6.1025" width="0.2032" layer="1"/>
+<wire x1="3.105" y1="6.1025" x2="3.175" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="6.0325" x2="3.175" y2="5.23875" width="0.2032" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U102" pad="5"/>
@@ -2700,59 +2766,70 @@ design rules under a new name.</descript
 <wire x1="22.5425" y1="5.3699" x2="22.54" y2="5.3674" width="0.2032" layer="1"/>
 <wire x1="10.16" y1="7.14375" x2="10.00125" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.00125" y1="7.46125" x2="8.35" y2="7.46125" width="0.2032" layer="16"/>
-<via x="10.16" y="10.00125" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="10.00125" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
-<via x="17.145" y="9.8425" extent="1-16" drill="0.3048"/>
+<via x="10.16" y="10.63625" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="10.63625" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
+<via x="20.240625" y="9.763125" extent="1-16" drill="0.3048"/>
 <wire x1="10.16" y1="8.255" x2="10.16" y2="7.14375" width="0.2032" layer="16"/>
-<via x="3.175" y="8.73125" extent="1-16" drill="0.3048"/>
-<wire x1="6.35" y1="7.77875" x2="6.6525" y2="7.47625" width="0.2032" layer="16"/>
-<wire x1="1.5875" y1="4.60375" x2="1.5875" y2="2.2225" width="0.2032" layer="1"/>
+<via x="4.445" y="8.73125" extent="1-16" drill="0.3048"/>
+<wire x1="4.445" y1="7.62" x2="4.58875" y2="7.47625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="5.3699" x2="22.5425" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="6.35" x2="20.6375" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="6.35" x2="20.0025" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="6.985" x2="20.0025" y2="8.5725" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="8.5725" x2="18.7325" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="18.7325" y1="9.8425" x2="17.145" y2="9.8425" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="8.5725" x2="19.52625" y2="8.651875" width="0.2032" layer="1"/>
+<wire x1="19.52625" y1="8.651875" x2="20.240625" y2="9.763125" width="0.2032" layer="1"/>
 <wire x1="29.86" y1="8.5725" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
-<wire x1="6.35" y1="7.77875" x2="3.65125" y2="7.77875" width="0.2032" layer="16"/>
 <wire x1="10.115" y1="8.77625" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="6.6525" y1="7.47625" x2="8.335" y2="7.47625" width="0.2032" layer="16"/>
+<wire x1="4.58875" y1="7.47625" x2="8.335" y2="7.47625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="8.77625" x2="10.115" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="7.47625" x2="8.35" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="3.175" y1="8.73125" x2="3.28875" y2="8.77625" width="0.2032" layer="16"/>
-<wire x1="3.28875" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
-<contactref element="C1" pad="1"/>
-<contactref element="C3" pad="1"/>
-<wire x1="2.2375" y1="9.128125" x2="3.175" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="1.5875" y1="4.60375" x2="2.07875" y2="4.60375" width="0.2032" layer="1"/>
-<wire x1="2.07875" y1="4.60375" x2="2.2375" y2="4.683125" width="0.2032" layer="1"/>
-<wire x1="3.65125" y1="7.77875" x2="1.74625" y2="5.87375" width="0.2032" layer="16"/>
-<wire x1="1.74625" y1="5.87375" x2="1.74625" y2="2.06375" width="0.2032" layer="16"/>
-<via x="1.74625" y="2.06375" extent="1-16" drill="0.381"/>
-<wire x1="1.5875" y1="2.2225" x2="1.74625" y2="2.06375" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.73125" x2="4.55875" y2="8.77625" width="0.2032" layer="16"/>
+<wire x1="4.55875" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="6.35" x2="23.65375" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="7.46125" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="9.04" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="29.845" y1="8.5575" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="17.145" y1="9.8425" x2="16.8275" y2="9.525" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="9.525" x2="10.16" y2="9.525" width="0.2032" layer="16"/>
-<wire x1="10.16" y1="9.525" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="9.525" x2="10.16" y2="10.63625" width="0.2032" layer="16"/>
 <contactref element="C6" pad="1"/>
 <contactref element="U$13" pad="1"/>
 <contactref element="U$13" pad="5"/>
 <contactref element="C5" pad="1"/>
 <contactref element="U$13" pad="17"/>
 <contactref element="C7" pad="1"/>
+<contactref element="RA1" pad="C1B"/>
+<contactref element="RA1" pad="C2B"/>
+<wire x1="2.3625" y1="8.5025" x2="4.21625" y2="8.5025" width="0.2032" layer="1"/>
+<wire x1="4.21625" y1="8.5025" x2="4.445" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="2.3625" y1="7.7025" x2="4.36875" y2="7.7025" width="0.2032" layer="1"/>
+<wire x1="4.36875" y1="7.7025" x2="4.445" y2="7.62" width="0.2032" layer="1"/>
+<via x="4.445" y="7.62" extent="1-16" drill="0.3048"/>
+<wire x1="19.954375" y1="9.49375" x2="20.240625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="11.826875" x2="10.556875" y2="11.826875" width="0.2032" layer="1"/>
+<wire x1="10.556875" y1="11.826875" x2="10.16" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="10.16" y1="11.43" x2="10.16" y2="10.63625" width="0.2032" layer="1"/>
+<via x="10.16" y="3.4925" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="3.4925" x2="10.16" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="14.934375" y1="4.238125" x2="14.934375" y2="3.360625" width="0.2032" layer="1"/>
+<wire x1="14.934375" y1="3.360625" x2="14.9075" y2="2.936875" width="0.2032" layer="1"/>
+<wire x1="12.934375" y1="4.238125" x2="12.934375" y2="2.9975" width="0.2032" layer="1"/>
+<wire x1="12.934375" y1="2.9975" x2="12.87375" y2="2.936875" width="0.2032" layer="1"/>
+<wire x1="12.934375" y1="2.9975" x2="14.846875" y2="2.9975" width="0.2032" layer="1"/>
+<wire x1="14.846875" y1="2.9975" x2="14.9075" y2="2.936875" width="0.2032" layer="1"/>
+<wire x1="10.16" y1="3.4925" x2="10.16" y2="2.54" width="0.2032" layer="1"/>
+<wire x1="10.16" y1="2.54" x2="10.63625" y2="2.06375" width="0.2032" layer="1"/>
+<wire x1="10.63625" y1="2.06375" x2="12.000625" y2="2.06375" width="0.2032" layer="1"/>
+<wire x1="12.000625" y1="2.06375" x2="12.87375" y2="2.936875" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="11.826875" x2="15.24" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="15.24" y1="10.00125" x2="16.733125" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="16.733125" y1="10.00125" x2="17.28875" y2="9.445625" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="5.3674" x2="22.24" y2="4.1275" width="0" layer="19" extent="1-1"/>
-<wire x1="8.89" y1="6.81125" x2="8.35" y2="7.46125" width="0" layer="19" extent="1-16"/>
-<wire x1="14.7675" y1="8.7" x2="16.8275" y2="9.525" width="0" layer="19" extent="1-16"/>
-<wire x1="14.59" y1="9.68375" x2="14.7675" y2="8.7" width="0" layer="19" extent="1-1"/>
-<wire x1="11.2675" y1="4" x2="10.16" y2="7.14375" width="0" layer="19" extent="1-16"/>
-<wire x1="13.2675" y1="4" x2="11.2675" y2="4" width="0" layer="19" extent="1-1"/>
-<wire x1="13.16125" y1="2.69875" x2="13.2675" y2="4" width="0" layer="19" extent="1-1"/>
+<wire x1="16.434375" y1="8.938125" x2="16.78125" y2="8.938125" width="0.2032" layer="1"/>
+<wire x1="16.78125" y1="8.938125" x2="17.28875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="19.52625" y1="8.651875" x2="18.0825" y2="8.651875" width="0.2032" layer="1"/>
+<wire x1="18.0825" y1="8.651875" x2="17.28875" y2="9.445625" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP101" pad="P1"/>
@@ -2780,21 +2857,19 @@ design rules under a new name.</descript
 <wire x1="23.65375" y1="9.525" x2="23.65375" y2="8.62018125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="8.62018125" x2="23.00116875" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="23.00116875" y1="7.9676" x2="22.54" y2="7.9676" width="0.2032" layer="1"/>
-<wire x1="41.6275" y1="11.90625" x2="41.11625" y2="11.90625" width="0.2032" layer="1"/>
-<wire x1="41.11625" y1="11.90625" x2="41.91" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="41.91" y1="11.43" x2="40.64" y2="12.3825" width="0.2032" layer="1"/>
-<via x="40.64" y="12.3825" extent="1-16" drill="0.381"/>
-<wire x1="40.64" y1="12.3825" x2="39.37" y2="12.54125" width="0.2032" layer="16"/>
-<wire x1="39.37" y1="12.54125" x2="40.3225" y2="12.22375" width="0.2032" layer="16"/>
+<wire x1="40.3225" y1="12.22375" x2="41.5925" y2="10.95375" width="0.2032" layer="16"/>
+<via x="41.5925" y="10.95375" extent="1-16" drill="0.3048"/>
+<wire x1="41.5925" y1="10.95375" x2="41.5925" y2="11.87125" width="0.2032" layer="1"/>
+<wire x1="41.5925" y1="11.87125" x2="41.6275" y2="11.90625" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
-<via x="16.66875" y="4.28625" extent="1-16" drill="0.3048"/>
-<wire x1="18.0975" y1="5.23875" x2="29.68625" y2="5.23875" width="0.2032" layer="16"/>
-<wire x1="29.68625" y1="5.23875" x2="30.1625" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="5.715" x2="31.59125" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="18.0975" y1="5.23875" x2="17.145" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="17.145" y1="4.28625" x2="16.66875" y2="4.28625" width="0.2032" layer="16"/>
+<via x="19.05" y="5.715" extent="1-16" drill="0.3048"/>
+<wire x1="31.59125" y1="5.715" x2="31.115" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="31.115" y1="6.35" x2="31.035625" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="31.035625" y1="6.429375" x2="19.84375" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="6.429375" x2="19.129375" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="19.129375" y1="5.715" x2="19.05" y2="5.715" width="0.2032" layer="16"/>
 <via x="31.59125" y="5.715" extent="1-16" drill="0.381"/>
 <wire x1="31.58391875" y1="5.62381875" x2="32.3101" y2="5.715" width="0.2032" layer="1"/>
 <wire x1="32.3101" y1="5.715" x2="31.59125" y2="5.715" width="0.2032" layer="1"/>
@@ -2802,22 +2877,21 @@ design rules under a new name.</descript
 <signal name="SW-C">
 <contactref element="SW101" pad="3"/>
 <wire x1="33.56381875" y1="3.64391875" x2="33.48891875" y2="3.64391875" width="0.2032" layer="1"/>
-<wire x1="33.48891875" y1="3.64391875" x2="33.49625" y2="3.65125" width="0.2032" layer="1"/>
-<via x="33.49625" y="3.65125" extent="1-16" drill="0.381"/>
-<wire x1="33.49625" y1="3.65125" x2="33.02" y2="3.175" width="0.2032" layer="16"/>
-<wire x1="33.02" y1="3.175" x2="30.7975" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="30.7975" y1="4.28625" x2="18.415" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="18.415" y1="4.28625" x2="16.8275" y2="2.54" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="2.54" x2="16.51" y2="2.54" width="0.2032" layer="16"/>
-<wire x1="16.51" y1="2.54" x2="15.875" y2="3.175" width="0.2032" layer="16"/>
+<wire x1="33.48891875" y1="3.64391875" x2="34.76625" y2="4.7625" width="0.2032" layer="1"/>
+<via x="34.76625" y="4.7625" extent="1-16" drill="0.381"/>
+<wire x1="34.76625" y1="4.7625" x2="34.44875" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="34.44875" y1="4.445" x2="31.115" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="31.115" y1="4.445" x2="29.924375" y2="5.635625" width="0.2032" layer="16"/>
+<wire x1="29.924375" y1="5.635625" x2="20.399375" y2="5.635625" width="0.2032" layer="16"/>
+<wire x1="20.399375" y1="5.635625" x2="19.129375" y2="4.445" width="0.2032" layer="16"/>
+<via x="19.129375" y="4.445" extent="1-16" drill="0.3048"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
-<via x="16.35125" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="16.8275" y1="6.19125" x2="29.21" y2="6.19125" width="0.2032" layer="16"/>
-<wire x1="29.21" y1="6.19125" x2="30.1625" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="6.19125" x2="16.35125" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="6.985" x2="34.13125" y2="6.985" width="0.2032" layer="16"/>
+<via x="19.05" y="6.985" extent="1-16" drill="0.3048"/>
+<wire x1="34.13125" y1="6.985" x2="33.893125" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="33.893125" y1="7.223125" x2="19.288125" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="19.288125" y1="7.223125" x2="19.05" y2="6.985" width="0.2032" layer="16"/>
 <wire x1="34.13125" y1="6.985" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
 <via x="35.2425" y="8.09625" extent="1-16" drill="0.381"/>
 <wire x1="35.2425" y1="8.09625" x2="35.34100625" y2="9.36625" width="0.2032" layer="1"/>
@@ -2825,12 +2899,13 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
-<via x="16.35125" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="16.35125" y1="5.715" x2="29.36875" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="29.36875" y1="5.715" x2="30.32125" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="6.50875" x2="32.22625" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="32.22625" y1="6.50875" x2="33.9725" y2="5.3975" width="0.2032" layer="16"/>
-<wire x1="33.9725" y1="5.3975" x2="38.25875" y2="8.255" width="0.2032" layer="16"/>
+<via x="18.57375" y="6.35" extent="1-16" drill="0.3048"/>
+<wire x1="18.57375" y1="6.35" x2="19.20875" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="6.35" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="6.82625" x2="33.416875" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="33.416875" y1="6.82625" x2="33.734375" y2="6.50875" width="0.2032" layer="16"/>
+<wire x1="33.734375" y1="6.50875" x2="35.08375" y2="6.50875" width="0.2032" layer="16"/>
+<wire x1="35.08375" y1="6.50875" x2="38.25875" y2="8.255" width="0.2032" layer="16"/>
 <via x="38.25875" y="8.255" extent="1-16" drill="0.381"/>
 <wire x1="38.25875" y1="8.255" x2="37.62375" y2="7.77875" width="0.2032" layer="1"/>
 <wire x1="37.62375" y1="7.77875" x2="38.96865" y2="8.41375" width="0.2032" layer="1"/>
@@ -2857,34 +2932,13 @@ design rules under a new name.</descript
 <contactref element="D101" pad="A"/>
 <wire x1="42.1175" y1="5.685" x2="43.15" y2="5.685" width="0.2032" layer="1"/>
 <wire x1="43.15" y1="5.685" x2="43.33875" y2="6.0325" width="0.2032" layer="1"/>
-<wire x1="43.33875" y1="6.0325" x2="43.33875" y2="10.86" width="0.2032" layer="1"/>
-<wire x1="43.33875" y1="10.86" x2="42.9275" y2="11.90625" width="0.2032" layer="1"/>
-</signal>
-<signal name="SPI1_MOSI">
-<via x="5.23875" y="4.28625" extent="1-16" drill="0.3048"/>
-<contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="4.22625" x2="5.29875" y2="4.22625" width="0.2032" layer="16"/>
-<wire x1="5.29875" y1="4.22625" x2="5.23875" y2="4.28625" width="0.2032" layer="16"/>
-</signal>
-<signal name="SPI1_SCK">
-<via x="4.445" y="4.7625" extent="1-16" drill="0.3048"/>
-<wire x1="4.55875" y1="4.87625" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
-<contactref element="LCD1" pad="11"/>
-<wire x1="8.335" y1="4.87625" x2="5.91875" y2="4.87625" width="0.2032" layer="16"/>
-<wire x1="5.91875" y1="4.87625" x2="5.715" y2="5.08" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="5.08" x2="4.7625" y2="5.08" width="0.2032" layer="16"/>
-<wire x1="4.7625" y1="5.08" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
-</signal>
-<signal name="SPI2_MISO">
-<contactref element="U104" pad="7"/>
-</signal>
-<signal name="SPI2_SCK">
-<contactref element="U104" pad="5"/>
+<wire x1="43.33875" y1="6.0325" x2="43.33875" y2="11.495" width="0.2032" layer="1"/>
+<wire x1="43.33875" y1="11.495" x2="42.9275" y2="11.90625" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP102" pad="P1"/>
 <contactref element="U$13" pad="16"/>
-<wire x1="15.3675" y1="8.1" x2="15.875" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="17.034375" y1="8.338125" x2="15.875" y2="11.43" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED102" pad="A"/>
@@ -2894,10 +2948,9 @@ design rules under a new name.</descript
 </signal>
 <signal name="LED_PWR">
 <contactref element="R102" pad="1"/>
-<via x="16.51" y="7.3025" extent="1-16" drill="0.3048"/>
-<wire x1="16.51" y1="7.3025" x2="16.98625" y2="6.6675" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="6.6675" x2="28.73375" y2="6.6675" width="0.2032" layer="16"/>
-<wire x1="28.73375" y1="6.6675" x2="33.02" y2="11.1125" width="0.2032" layer="16"/>
+<via x="18.57375" y="7.62" extent="1-16" drill="0.3048"/>
+<wire x1="18.57375" y1="7.62" x2="29.68625" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="29.68625" y1="7.62" x2="33.02" y2="11.1125" width="0.2032" layer="16"/>
 <via x="33.02" y="11.1125" extent="1-16" drill="0.3048"/>
 <wire x1="36.18" y1="11.445" x2="37.7675" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="36.18" y1="11.445" x2="33.3525" y2="11.445" width="0.2032" layer="1"/>
@@ -2915,7 +2968,8 @@ design rules under a new name.</descript
 <wire x1="8.335" y1="6.17625" x2="8.27" y2="6.17625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="6.17625" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="29"/>
-<wire x1="8.335" y1="6.17625" x2="10.6675" y2="6.1" width="0" layer="19" extent="1-16"/>
+<wire x1="12.334375" y1="6.338125" x2="6.1" y2="6.4175" width="0.2032" layer="1"/>
+<wire x1="6.1" y1="6.4175" x2="5.715" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D/!C">
 <via x="6.50875" y="5.87375" extent="1-16" drill="0.3048"/>
@@ -2923,7 +2977,8 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="10"/>
 <wire x1="8.335" y1="5.52625" x2="6.85625" y2="5.52625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="30"/>
-<wire x1="8.335" y1="5.52625" x2="10.6675" y2="5.6" width="0" layer="19" extent="1-16"/>
+<wire x1="12.334375" y1="5.838125" x2="7.743125" y2="5.838125" width="0.2032" layer="1"/>
+<wire x1="7.743125" y1="5.838125" x2="6.50875" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
 <contactref element="U104" pad="2"/>
@@ -2941,45 +2996,120 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-BTN">
 <contactref element="SW101" pad="2"/>
-<via x="15.39875" y="3.96875" extent="1-16" drill="0.3048"/>
-<wire x1="15.39875" y1="3.96875" x2="16.03375" y2="3.96875" width="0.2032" layer="16"/>
-<wire x1="16.03375" y1="3.96875" x2="16.51" y2="3.4925" width="0.2032" layer="16"/>
-<wire x1="16.51" y1="3.4925" x2="16.98625" y2="3.4925" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="3.4925" x2="18.25625" y2="4.7625" width="0.2032" layer="16"/>
-<wire x1="18.25625" y1="4.7625" x2="32.0675" y2="4.7625" width="0.2032" layer="16"/>
-<wire x1="32.0675" y1="4.7625" x2="32.54375" y2="4.60375" width="0.2032" layer="16"/>
-<via x="32.54375" y="4.60375" extent="1-16" drill="0.381"/>
+<via x="18.57375" y="5.08" extent="1-16" drill="0.3048"/>
+<wire x1="18.57375" y1="5.08" x2="19.20875" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="5.08" x2="20.16125" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="20.16125" y1="6.0325" x2="30.1625" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="30.1625" y1="6.0325" x2="31.115" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="31.115" y1="5.08" x2="33.02" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="33.02" y1="5.08" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
+<via x="33.655" y="5.715" extent="1-16" drill="0.381"/>
 <wire x1="32.57386875" y1="4.63386875" x2="32.73261875" y2="3.99886875" width="0.2032" layer="1"/>
-<wire x1="32.73261875" y1="3.99886875" x2="32.54375" y2="4.60375" width="0.2032" layer="1"/>
+<wire x1="32.73261875" y1="3.99886875" x2="33.655" y2="5.715" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="U$13" pad="22"/>
 <contactref element="RN1" pad="1"/>
-<wire x1="12.2675" y1="8.7" x2="40.24" y2="3.3525" width="0" layer="19" extent="1-1"/>
+<wire x1="40.24" y1="3.3525" x2="39.38875" y2="3.3525" width="0.2032" layer="1"/>
+<wire x1="39.38875" y1="3.3525" x2="39.21125" y2="3.175" width="0.2032" layer="1"/>
+<via x="39.21125" y="3.175" extent="1-16" drill="0.3048"/>
+<wire x1="39.21125" y1="3.175" x2="15.875" y2="3.81" width="0.2032" layer="16"/>
+<wire x1="15.875" y1="3.81" x2="15.24" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="15.24" y1="4.445" x2="15.24" y2="8.33875" width="0.2032" layer="16"/>
+<wire x1="15.24" y1="8.33875" x2="15.204375" y2="8.461875" width="0.2032" layer="16"/>
+<wire x1="13.934375" y1="8.938125" x2="13.934375" y2="9.64" width="0.2032" layer="1"/>
+<wire x1="13.934375" y1="9.64" x2="13.731875" y2="9.8425" width="0.2032" layer="1"/>
+<via x="13.731875" y="9.8425" extent="1-16" drill="0.3048"/>
+<wire x1="13.731875" y1="9.8425" x2="15.24" y2="9.775625" width="0.2032" layer="16"/>
+<wire x1="15.24" y1="9.775625" x2="15.204375" y2="8.461875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$18">
 <contactref element="U$13" pad="21"/>
 <contactref element="RN1" pad="2"/>
-<wire x1="12.7675" y1="8.7" x2="41.04" y2="3.3525" width="0" layer="19" extent="1-1"/>
+<wire x1="41.04" y1="3.3525" x2="41.04" y2="2.94" width="0.2032" layer="1"/>
+<wire x1="41.04" y1="2.94" x2="40.64" y2="2.54" width="0.2032" layer="1"/>
+<via x="40.64" y="2.54" extent="1-16" drill="0.3048"/>
+<wire x1="40.64" y1="2.54" x2="40.48125" y2="2.69875" width="0.2032" layer="16"/>
+<wire x1="40.48125" y1="2.69875" x2="13.731875" y2="2.69875" width="0.2032" layer="16"/>
+<wire x1="13.731875" y1="2.69875" x2="12.620625" y2="3.81" width="0.2032" layer="16"/>
+<wire x1="12.620625" y1="3.81" x2="12.620625" y2="10.556875" width="0.2032" layer="16"/>
+<wire x1="14.434375" y1="8.938125" x2="14.434375" y2="10.330625" width="0.2032" layer="1"/>
+<wire x1="14.434375" y1="10.330625" x2="14.208125" y2="10.556875" width="0.2032" layer="1"/>
+<wire x1="14.208125" y1="10.556875" x2="12.620625" y2="10.556875" width="0.2032" layer="1"/>
+<via x="12.620625" y="10.556875" extent="1-16" drill="0.3048"/>
 </signal>
 <signal name="SPI_MOSI">
-<contactref element="U$13" pad="13"/>
+<via x="5.23875" y="4.28625" extent="1-16" drill="0.3048"/>
+<contactref element="LCD1" pad="12"/>
+<wire x1="8.335" y1="4.22625" x2="5.29875" y2="4.22625" width="0.2032" layer="16"/>
+<wire x1="5.29875" y1="4.22625" x2="5.23875" y2="4.28625" width="0.2032" layer="16"/>
+<contactref element="U$13" pad="28"/>
+<wire x1="12.334375" y1="6.838125" x2="5.965" y2="6.838125" width="0.2032" layer="1"/>
+<wire x1="5.965" y1="6.838125" x2="5.159375" y2="6.111875" width="0.2032" layer="1"/>
+<wire x1="5.159375" y1="6.111875" x2="5.159375" y2="4.365625" width="0.2032" layer="1"/>
+<wire x1="5.159375" y1="4.365625" x2="5.23875" y2="4.28625" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U$13" pad="12"/>
+<contactref element="U104" pad="7"/>
+<wire x1="26.9875" y1="3.64" x2="26.9875" y2="5.08" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="27"/>
+<wire x1="12.334375" y1="7.338125" x2="11.545" y2="7.338125" width="0.2032" layer="1"/>
+<wire x1="11.545" y1="7.338125" x2="11.509375" y2="7.3025" width="0.2032" layer="1"/>
+<via x="11.509375" y="7.3025" extent="1-16" drill="0.3048"/>
+<wire x1="11.509375" y1="7.3025" x2="11.509375" y2="4.60375" width="0.2032" layer="16"/>
+<wire x1="11.509375" y1="4.60375" x2="13.731875" y2="2.38125" width="0.2032" layer="16"/>
+<wire x1="13.731875" y1="2.38125" x2="26.749375" y2="2.38125" width="0.2032" layer="16"/>
+<wire x1="26.749375" y1="2.38125" x2="27.066875" y2="2.06375" width="0.2032" layer="16"/>
+<via x="27.066875" y="2.06375" extent="1-16" drill="0.3048"/>
+<wire x1="27.066875" y1="2.06375" x2="27.066875" y2="3.560625" width="0.2032" layer="1"/>
+<wire x1="27.066875" y1="3.560625" x2="26.9875" y2="3.64" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
-<contactref element="U$13" pad="11"/>
+<via x="4.445" y="4.7625" extent="1-16" drill="0.3048"/>
+<wire x1="4.55875" y1="4.87625" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
+<contactref element="LCD1" pad="11"/>
+<wire x1="8.335" y1="4.87625" x2="5.91875" y2="4.87625" width="0.2032" layer="16"/>
+<wire x1="5.91875" y1="4.87625" x2="5.715" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="5.715" y1="5.08" x2="4.7625" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="4.7625" y1="5.08" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
+<contactref element="U104" pad="5"/>
+<contactref element="U$13" pad="26"/>
+<wire x1="12.334375" y1="7.838125" x2="6.33" y2="7.838125" width="0.2032" layer="1"/>
+<wire x1="6.33" y1="7.838125" x2="4.445" y2="5.87375" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="5.87375" x2="4.445" y2="4.7625" width="0.2032" layer="1"/>
+<wire x1="12.334375" y1="7.838125" x2="11.013125" y2="7.838125" width="0.2032" layer="1"/>
+<wire x1="11.013125" y1="7.838125" x2="10.95375" y2="7.77875" width="0.2032" layer="1"/>
+<via x="10.95375" y="7.77875" extent="1-16" drill="0.3048"/>
+<wire x1="10.95375" y1="7.77875" x2="10.95375" y2="4.841875" width="0.2032" layer="16"/>
+<wire x1="10.95375" y1="4.841875" x2="13.6525" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="13.6525" y1="2.143125" x2="24.368125" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="24.368125" y1="2.143125" x2="24.4475" y2="2.06375" width="0.2032" layer="16"/>
+<via x="24.4475" y="2.06375" extent="1-16" drill="0.3048"/>
+<wire x1="24.4475" y1="2.06375" x2="24.4475" y2="3.64" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
 <contactref element="U$13" pad="25"/>
-<wire x1="8.335" y1="6.82625" x2="10.6675" y2="8.1" width="0" layer="19" extent="1-16"/>
+<wire x1="12.334375" y1="8.338125" x2="6.274375" y2="8.338125" width="0.2032" layer="1"/>
+<wire x1="6.274375" y1="8.338125" x2="4.60375" y2="6.82625" width="0.2032" layer="1"/>
+<via x="4.60375" y="6.82625" extent="1-16" drill="0.3048"/>
+<wire x1="4.60375" y1="6.82625" x2="4.683125" y2="6.905625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="6.82625" x2="4.60375" y2="6.82625" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U104" pad="6"/>
+<contactref element="U$13" pad="9"/>
+<wire x1="17.034375" y1="4.838125" x2="25.7175" y2="3.64" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$5">
 <contactref element="U$13" pad="24"/>
-<wire x1="11.2675" y1="8.7" x2="25.7175" y2="3.64" width="0" layer="19" extent="1-1"/>
+<contactref element="TP1" pad="TP"/>
+<wire x1="11.350625" y1="9.286875" x2="12.934375" y2="8.938125" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$6">
+<contactref element="U$13" pad="23"/>
+<contactref element="TP2" pad="TP"/>
+<wire x1="11.43" y1="10.556875" x2="13.434375" y2="8.938125" width="0" layer="19" extent="1-1"/>
 </signal>
 </signals>
 </board>