diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="3.125" altunitdist="mil" altunit="mil"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="6.25" 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"/>
@@ -31,7 +31,7 @@
 <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"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -168,10 +168,10 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="46.0248" y2="0" width="0" layer="20"/>
-<wire x1="46.0248" y1="0" x2="46.0248" y2="12.6746" width="0" layer="20"/>
-<wire x1="46.0248" y1="12.6746" x2="0" y2="12.6746" width="0" layer="20"/>
-<wire x1="0" y1="12.6746" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="1.27" x2="45.0723" y2="1.27" width="0" layer="20"/>
+<wire x1="45.0723" y1="1.27" x2="45.0723" y2="12.6746" width="0" layer="20"/>
+<wire x1="45.0723" y1="12.6746" x2="0" y2="12.6746" width="0" layer="20"/>
+<wire x1="0" y1="12.6746" x2="0" y2="1.27" width="0" layer="20"/>
 <dimension x1="0" y1="0" x2="45.4025" y2="-0.9525" x3="22.70125" y3="19.05" textsize="1.778" layer="209" dtype="horizontal" unit="inch" precision="6" visible="yes"/>
 <dimension x1="46.6598" y1="0" x2="45.3898" y2="12.6746" x3="-8.255" y3="6.3373" textsize="1.778" layer="209" dtype="vertical" unit="inch" precision="6" visible="yes"/>
 <text x="31.4325" y="12.065" size="0.8128" layer="22" ratio="16" rot="SMR180">protofusion.org/therm</text>
@@ -189,12 +189,13 @@
 <text x="26.51125" y="7.77875" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="33.81375" y="11.033125" size="0.8128" layer="22" ratio="16" rot="SMR180">Ethan Zonca 2014</text>
 <text x="43.33875" y="7.381875" size="0.8128" layer="22" ratio="16" rot="MR270">SWD</text>
-<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="17.78" size="1.778" layer="21">ADD TEST POINTS FOR SWD</text>
+<text x="-1.27" y="12.7" size="0.8128" layer="1" ratio="16">LED placement?
+</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>
+<text x="-0.635" y="22.86" size="1.778" layer="21">Add breakaway mounting tabs</text>
+<text x="-0.635" y="25.4" size="1.778" layer="21">Add GPIO breakaway?</text>
+<text x="-0.635" y="28.575" size="1.778" layer="21">Add pogos for USB? (pads for SWD too?) Right next to eachother...</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2318,11 +2319,11 @@ 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">
+<package name="TP06R">
 <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>
+<smd name="TP" x="0" y="0" dx="0.6" dy="0.6" layer="1" roundness="100" cream="no"/>
+<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
+<text x="-0.254" y="-0.381" 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>
@@ -2424,9 +2425,6 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="5mil"/>
-<param name="AutoGrid" value="1"/>
-<param name="Efforts" value="0"/>
-<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2518,13 +2516,13 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="11.90625" smashed="yes">
-<attribute name="NAME" x="-3.3655" y="10.44575" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="2.9845" y="11.27125" size="0.4064" layer="27" ratio="10"/>
+<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="11.1125" smashed="yes" rot="R180">
+<attribute name="NAME" x="6.5405" y="12.573" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="0.1905" y="11.7475" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
-<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="10.4775" smashed="yes">
-<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 name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="9.525" smashed="yes" rot="R180">
+<attribute name="NAME" x="6.5405" y="8.4455" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="0.1905" y="10.16" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <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"/>
@@ -2533,10 +2531,10 @@ design rules under a new name.</descript
 <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"/>
 </element>
-<element name="J101" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="44.7675" y="6.985" smashed="yes" rot="R90">
-<attribute name="PROD_ID" value="CONN-09505" x="79.0575" y="34.925" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="NAME" x="45.1175" y="5.385" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="47.9425" y="5.08" size="0.762" layer="27" rot="R90"/>
+<element name="J101" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="6.985" smashed="yes" rot="R90">
+<attribute name="PROD_ID" value="CONN-09505" x="78.105" y="34.925" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="NAME" x="44.165" y="5.385" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="46.99" y="5.08" size="0.762" layer="27" rot="R90"/>
 </element>
 <element name="U104" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="6.35" smashed="yes" rot="R180">
 <attribute name="NAME" x="24.765" y="6.0325" size="0.8128" layer="21" font="vector" ratio="16"/>
@@ -2546,56 +2544,57 @@ design rules under a new name.</descript
 <attribute name="NAME" x="20.066" y="6.2865" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="22.5425" y="6.858" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="40.16375" y="10.4775" smashed="yes" rot="R180">
-<attribute name="NAME" x="39.90975" y="11.176" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="39.08425" y="11.4935" size="0.4064" layer="27" rot="R270"/>
+<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.0525" y="11.7475" smashed="yes" rot="R270">
+<attribute name="NAME" x="38.354" y="11.4935" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="38.0365" y="10.668" size="0.4064" layer="27"/>
 </element>
 <element name="JP101" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="23.8125" y="11.43" rot="MR0"/>
 <element name="JP102" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="18.415" y="11.43" rot="MR0"/>
 <element name="JP103" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="29.21" y="11.43" rot="MR0"/>
-<element name="D101" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="42.2275" y="11.90625" smashed="yes">
-<attribute name="NAME" x="40.2209" y="12.46505" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="41.5417" y="10.91565" size="0.4064" layer="27"/>
+<element name="D101" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="33.02" y="12.065" smashed="yes">
+<attribute name="NAME" x="31.0134" y="12.6238" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="32.3342" y="11.0744" size="0.4064" layer="27"/>
 </element>
-<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.525" smashed="yes" rot="R180">
-<attribute name="NAME" x="21.68525" y="11.20775" size="0.8128" layer="25" ratio="16" rot="R180"/>
-<attribute name="VALUE" x="22.51075" y="10.668" size="0.4064" layer="27" rot="R180"/>
+<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.763125" smashed="yes" rot="R180">
+<attribute name="NAME" x="21.68525" y="11.445875" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="22.51075" y="10.906125" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="4.1275" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.939" y="4.064" size="0.8128" layer="25" ratio="16" rot="R180"/>
-<attribute name="VALUE" x="22.6695" y="5.2705" size="0.4064" layer="27" rot="R180"/>
+<element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="4.1275" smashed="yes">
+<attribute name="NAME" x="23.241" y="4.191" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="20.5105" y="2.9845" size="0.4064" layer="27"/>
 </element>
-<element name="R102" library="SparkFun-Passives" package="0402-RES" value="" x="38.4175" y="11.43" smashed="yes">
-<attribute name="NAME" x="36.8935" y="12.1285" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="37.338" y="10.287" size="0.4064" layer="27"/>
+<element name="R102" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="10.4775" smashed="yes" rot="R180">
+<attribute name="NAME" x="40.894" y="9.779" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="40.4495" y="11.6205" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C111" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" smashed="yes" rot="R270">
 <attribute name="NAME" x="28.6385" y="9.5885" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="28.702" y="10.287" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="32.0675" y="-4.60375" smashed="yes"/>
+<element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="37.62375" y="1.5875" smashed="yes"/>
 <element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="" x="0.635" y="6.82625" smashed="yes" rot="R180">
 <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="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"/>
-<attribute name="MPN" value="" x="40.64" y="4.1275" size="0.8128" layer="27" ratio="16" display="off"/>
-<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 name="RN1" library="resistor-dil" package="EXBV4V" value="EXB-V4V220JV" x="19.3675" y="2.69875" rot="R270">
+<attribute name="OC_NEWARK" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="MPN" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="MF" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
+<attribute name="OC_FARNELL" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
 </element>
 <element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="6.746875" rot="R270"/>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="13.573125" y="10.4775" rot="R180"/>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="18.494375" y="9.604375"/>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="12.85875" y="2.619375"/>
-<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="17.145" y="-2.06375">
-<attribute name="TP_SIGNAL_NAME" value="" x="17.145" y="-2.06375" size="1.778" layer="27" display="off"/>
+<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.00125" rot="R180"/>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.763125"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" rot="R180"/>
+<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" rot="R270"/>
+<element name="TP1" library="testpad" package="TP06R" value="TPTP06R" x="18.25625" y="4.445">
+<attribute name="TP_SIGNAL_NAME" value="" x="18.25625" y="4.445" size="1.778" layer="27" display="off"/>
 </element>
-<element name="TP2" library="testpad" package="TP09R" value="TPTP09R" x="15.5575" y="-1.42875">
-<attribute name="TP_SIGNAL_NAME" value="" x="15.5575" y="-1.42875" size="1.778" layer="27" display="off"/>
+<element name="TP2" library="testpad" package="TP06R" value="TPTP06R" x="17.62125" y="3.730625">
+<attribute name="TP_SIGNAL_NAME" value="" x="17.62125" y="3.730625" size="1.778" layer="27" display="off"/>
 </element>
+<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="13.97" y="2.38125" rot="MR0"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2618,32 +2617,25 @@ design rules under a new name.</descript
 <vertex x="46.99" y="15.875"/>
 <vertex x="-1.27" y="15.875"/>
 </polygon>
-<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"/>
-<wire x1="22.08125" y1="9.525" x2="22.86" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="7.9676" x2="21.59" y2="9.271875" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="9.271875" x2="22.08125" y2="9.763125" width="0.2032" layer="1"/>
+<via x="22.86" y="9.763125" extent="1-16" drill="0.3048"/>
+<wire x1="22.08125" y1="9.763125" x2="22.86" y2="9.763125" width="0.2032" layer="1"/>
 <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"/>
 <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"/>
-<wire x1="44.7675" y1="10.985" x2="44.895" y2="11.62" width="0.2032" layer="1"/>
-<wire x1="44.895" y1="11.62" x2="44.92625" y2="10.95375" width="0.2032" layer="1"/>
-<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"/>
-<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"/>
+<via x="43.97375" y="10.95375" extent="1-16" drill="0.3048"/>
+<via x="43.97375" y="2.8575" extent="1-16" drill="0.3048"/>
+<wire x1="43.815" y1="10.985" x2="43.9425" y2="11.62" width="0.2032" layer="1"/>
+<wire x1="43.9425" y1="11.62" x2="43.97375" y2="10.95375" width="0.2032" layer="1"/>
+<wire x1="43.97375" y1="2.8575" x2="44.29125" y2="2.69875" width="0.2032" layer="1"/>
+<wire x1="44.29125" y1="2.69875" x2="43.4975" y2="2.54" width="0.2032" layer="1"/>
+<wire x1="43.4975" y1="2.54" x2="43.37" y2="2.54" width="0.2032" layer="1"/>
+<via x="23.33625" y="4.365625" extent="1-16" drill="0.3048"/>
+<wire x1="43.815" y1="2.985" x2="43.6875" y2="2.35" width="0.2032" layer="1"/>
+<wire x1="43.6875" y1="2.35" x2="43.4975" y2="2.54" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="6"/>
-<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"/>
-<wire x1="6.50875" y1="8.255" x2="3.65125" y2="8.255" width="0.2032" layer="16"/>
-<wire x1="3.65125" y1="8.255" x2="3.175" y2="7.9375" width="0.2032" layer="16"/>
-<wire x1="3.175" y1="7.9375" x2="1.905" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="29.845" y1="9.8575" x2="30.01875" y2="10.01625" width="0.2032" layer="1"/>
 <wire x1="30.01875" y1="10.01625" x2="30.48" y2="10.4775" width="0.2032" layer="1"/>
 <wire x1="30.48" y1="10.4775" x2="31.115" y2="10.95375" width="0.2032" layer="1"/>
@@ -2652,67 +2644,70 @@ design rules under a new name.</descript
 <contactref element="C5" pad="2"/>
 <contactref element="C7" pad="2"/>
 <contactref element="U$13" pad="EXP"/>
-<via x="40.79875" y="8.255" extent="1-16" drill="0.3048"/>
-<wire x1="42.1175" y1="8.285" x2="40.82875" y2="8.285" width="0.2032" layer="1"/>
-<wire x1="40.82875" y1="8.285" x2="40.79875" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="37.276128125" y1="9.336128125" x2="38.1" y2="10.16" width="0.2032" layer="1"/>
-<wire x1="38.1" y1="10.16" x2="39.60425" y2="10.16" width="0.2032" layer="1"/>
-<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"/>
+<via x="39.84625" y="8.255" extent="1-16" drill="0.3048"/>
+<wire x1="41.165" y1="8.285" x2="39.87625" y2="8.285" width="0.2032" layer="1"/>
+<wire x1="39.87625" y1="8.285" x2="39.84625" y2="8.255" width="0.2032" layer="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="8.185" x2="0.8125" y2="7.385" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="7.385" x2="0.8125" y2="6.585" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="6.585" x2="0.8125" y2="5.785" width="0.2032" layer="1"/>
+<wire x1="0.8125" y1="5.785" 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="7.385" x2="0.8125" y2="5.785" 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="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="19.144375" y1="9.604375" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
+<wire x1="19.779375" y1="9.763125" 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"/>
-<wire x1="12.923125" y1="10.4775" x2="12.144375" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="12.144375" y1="9.8425" x2="12.065" y2="9.763125" width="0.2032" layer="1"/>
-<via x="12.065" y="9.763125" extent="1-16" drill="0.3048"/>
-<wire x1="12.065" y1="9.763125" x2="12.065" y2="9.525" width="0.2032" layer="16"/>
-<wire x1="14.12875" y1="6.746875" x2="13.50875" y2="2.619375" width="0" layer="19" extent="1-1"/>
+<wire x1="8.335" y1="8.12625" x2="3.81" y2="8.12625" width="0.2032" layer="16"/>
+<wire x1="22.24" y1="4.1275" x2="23.098125" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="23.098125" y1="4.1275" x2="23.33625" y2="4.365625" width="0.2032" layer="1"/>
+<via x="10.16" y="3.413125" extent="1-16" drill="0.3048"/>
+<via x="36.35375" y="8.255" extent="1-16" drill="0.3048"/>
+<wire x1="37.276128125" y1="9.336128125" x2="37.276128125" y2="9.177378125" width="0.2032" layer="1"/>
+<wire x1="37.276128125" y1="9.177378125" x2="36.35375" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="39.9295" y1="11.7475" x2="41.11625" y2="11.7475" width="0.2032" layer="1"/>
+<via x="41.11625" y="11.7475" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="3.413125" x2="9.286875" y2="3.413125" width="0.2032" layer="1"/>
+<wire x1="9.286875" y1="3.413125" x2="9.04875" y2="3.65125" width="0.2032" layer="1"/>
+<wire x1="9.04875" y1="3.65125" x2="9.04875" y2="4.43" width="0.2032" layer="1"/>
+<wire x1="9.04875" y1="4.43" x2="9.03375" y2="4.445" width="0.2032" layer="1"/>
+<via x="8.89" y="11.985625" extent="1-16" drill="0.3048"/>
+<wire x1="8.954375" y1="10.00125" x2="8.954375" y2="11.92125" width="0.2032" layer="1"/>
+<wire x1="8.954375" y1="11.92125" x2="8.89" y2="11.985625" 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="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="4.83125" y1="10.72625" x2="8.335" y2="10.72625" width="0.2032" layer="16"/>
+<wire x1="4.445" y1="11.1125" x2="2.2375" y2="11.1125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="C106" pad="2"/>
-<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="4.975" y1="11.37625" x2="8.335" y2="11.37625" width="0.2032" layer="16"/>
+<wire x1="4.445" y1="11.90625" x2="1.11125" y2="11.90625" width="0.2032" layer="1"/>
+<wire x1="1.11125" y1="11.90625" x2="0.9525" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="0.9525" y1="11.7475" x2="0.9525" y2="11.1275" width="0.2032" layer="1"/>
+<wire x1="0.9525" y1="11.1275" x2="0.9375" y2="11.1125" width="0.2032" layer="1"/>
 </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="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="4.54375" y1="9.42625" x2="8.335" y2="9.42625" width="0.2032" layer="16"/>
+<wire x1="4.445" y1="9.525" x2="2.2375" y2="9.525" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C105" pad="2"/>
@@ -2720,8 +2715,10 @@ design rules under a new name.</descript
 <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="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"/>
+<wire x1="4.445" y1="10.31875" x2="1.11125" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="1.11125" y1="10.31875" x2="0.9525" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="0.9525" y1="10.16" x2="0.9525" y2="9.54" width="0.2032" layer="1"/>
+<wire x1="0.9525" y1="9.54" x2="0.9375" y2="9.525" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="R103" pad="2"/>
@@ -2733,17 +2730,17 @@ design rules under a new name.</descript
 <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"/>
+<via x="3.4925" y="6.50875" extent="1-16" drill="0.3048"/>
 <wire x1="3.74125" y1="2.92625" x2="3.33375" y2="3.33375" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="3.33375" x2="3.33375" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="4.445" x2="3.81" y2="4.92125" width="0.2032" layer="16"/>
-<wire x1="3.81" y1="4.92125" x2="3.81" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="3.81" y1="6.50875" x2="3.4925" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="3.81" y1="4.92125" x2="3.81" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="3.81" y1="6.19125" x2="3.4925" y2="6.50875" 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="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"/>
+<wire x1="2.3625" y1="6.585" x2="3.41625" y2="6.585" width="0.2032" layer="1"/>
+<wire x1="3.41625" y1="6.585" x2="3.4925" y2="6.50875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="5.23875" extent="1-16" drill="0.3048"/>
@@ -2753,9 +2750,9 @@ design rules under a new name.</descript
 <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="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"/>
+<wire x1="2.3625" y1="5.785" x2="3.105" y2="5.785" width="0.2032" layer="1"/>
+<wire x1="3.105" y1="5.785" x2="3.175" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="5.715" x2="3.175" y2="5.23875" width="0.2032" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U102" pad="5"/>
@@ -2763,20 +2760,13 @@ design rules under a new name.</descript
 <contactref element="C111" pad="2"/>
 <contactref element="C110" pad="1"/>
 <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.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="10.16" y="11.1125" extent="1-16" drill="0.3048"/>
 <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="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="20.0025" y1="6.985" x2="20.0025" y2="8.810625" 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="10.115" y1="8.77625" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="5"/>
@@ -2791,7 +2781,7 @@ design rules under a new name.</descript
 <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="10.16" y1="9.525" x2="10.16" y2="10.63625" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="8.255" x2="10.16" y2="11.1125" width="0.2032" layer="16"/>
 <contactref element="C6" pad="1"/>
 <contactref element="U$13" pad="1"/>
 <contactref element="U$13" pad="5"/>
@@ -2800,36 +2790,39 @@ design rules under a new name.</descript
 <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"/>
+<wire x1="2.3625" y1="7.385" x2="4.21" y2="7.385" width="0.2032" layer="1"/>
+<wire x1="4.21" y1="7.385" 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.81125" 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="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.844375" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="9.096875" x2="16.94" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="14.223125" y1="10.4775" x2="14.208125" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="14.208125" y1="9.921875" x2="14.2875" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="14.2875" y1="9.8425" x2="14.2875" y2="8.47375" width="0.2032" layer="1"/>
-<wire x1="14.2875" y1="8.47375" x2="14.275625" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="22.54" y1="5.3674" x2="22.54" y2="4.4275" width="0.2032" layer="1"/>
-<wire x1="22.54" y1="4.4275" x2="22.24" y2="4.1275" width="0.2032" layer="1"/>
-<wire x1="12.20875" y1="2.619375" x2="11.033125" y2="2.619375" width="0.2032" layer="1"/>
-<wire x1="11.033125" y1="2.619375" x2="10.16" y2="3.4925" width="0.2032" layer="1"/>
-<wire x1="12.20875" y1="2.619375" x2="12.20875" y2="3.195" width="0.2032" layer="1"/>
-<wire x1="12.20875" y1="3.195" x2="12.775625" y2="4.396875" width="0.2032" layer="1"/>
-<wire x1="14.2875" y1="9.8425" x2="16.891875" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="16.891875" y1="9.8425" x2="17.844375" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="16.94" y1="9.096875" x2="17.844375" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="13.81125" y1="11.826875" x2="14.366875" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="14.366875" y1="11.27125" x2="14.366875" y2="10.62125" width="0.2032" layer="1"/>
-<wire x1="14.366875" y1="10.62125" x2="14.223125" y2="10.4775" width="0.2032" layer="1"/>
+<via x="10.16" y="5.715" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="5.715" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="7.46125" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
+<wire x1="20.0025" y1="8.810625" x2="19.764375" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="19.764375" y1="9.04875" x2="19.19375" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="19.19375" y1="9.04875" x2="18.479375" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="18.479375" y1="9.763125" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="14.223125" y1="9.149375" x2="14.275625" y2="9.096875" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.096875" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.759375" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="5.3674" x2="21.639275" y2="5.3674" width="0.2032" layer="1"/>
+<wire x1="21.639275" y1="5.3674" x2="21.351875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="21.351875" y1="5.08" x2="21.351875" y2="4.539375" width="0.2032" layer="1"/>
+<wire x1="21.351875" y1="4.539375" x2="20.94" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="8.35" y1="7.46125" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
+<wire x1="10.33375" y1="4.445" x2="12.7275" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.54125" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="5.54125" x2="10.16" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="16.271875" y1="9.763125" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="10.254375" y1="10.00125" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
+<wire x1="10.254375" y1="11.018125" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="9.096875" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="9.763125" x2="14.275625" y2="10.330625" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="10.330625" x2="13.6525" y2="10.95375" width="0.2032" layer="1"/>
+<wire x1="13.6525" y1="10.95375" x2="10.31875" y2="10.95375" width="0.2032" layer="1"/>
+<wire x1="10.31875" y1="10.95375" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
+<wire x1="2.3625" y1="8.185" x2="3.89875" y2="8.185" width="0.2032" layer="1"/>
+<wire x1="3.89875" y1="8.185" x2="4.445" y2="8.73125" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP101" pad="P1"/>
@@ -2838,121 +2831,152 @@ design rules under a new name.</descript
 <contactref element="D101" pad="C"/>
 <contactref element="C107" pad="2"/>
 <wire x1="20.64" y1="7.9676" x2="20.64" y2="9.38375" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="9.38375" x2="20.78125" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="9.38375" x2="20.78125" y2="9.763125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.9676" x2="22.54" y2="7.14125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.14125" x2="22.38375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="22.38375" y1="6.985" x2="20.79625" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="20.79625" y1="6.985" x2="20.6375" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="7.14375" x2="20.6375" y2="7.9701" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="7.9701" x2="20.64" y2="7.9676" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="9.525" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
+<wire x1="20.78125" y1="9.763125" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="10.93875" x2="21.2725" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="40.3225" y1="12.22375" x2="30.48" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="30.48" y1="12.22375" x2="30.32125" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="12.065" x2="30.32125" y2="10.4775" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="10.4775" x2="30.1625" y2="10.31875" width="0.2032" layer="16"/>
 <wire x1="30.1625" y1="10.31875" x2="24.4475" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="24.4475" y1="10.31875" x2="23.65375" y2="9.525" width="0.2032" layer="16"/>
-<via x="23.65375" y="9.525" extent="1-16" drill="0.3048"/>
-<wire x1="23.65375" y1="9.525" x2="23.65375" y2="8.62018125" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
+<via x="23.65375" y="10.00125" extent="1-16" drill="0.3048"/>
+<wire x1="23.65375" y1="10.00125" 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="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"/>
+<wire x1="32.42" y1="12.065" x2="31.115" y2="12.065" width="0.2032" layer="1"/>
+<via x="31.115" y="12.065" extent="1-16" drill="0.3048"/>
+<wire x1="31.115" y1="12.065" x2="31.115" y2="12.22375" width="0.2032" layer="16"/>
+<wire x1="31.115" y1="12.22375" x2="30.48" y2="12.22375" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
-<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"/>
+<via x="19.129375" y="6.985" extent="1-16" drill="0.3048"/>
+<via x="31.75" y="7.14375" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="29"/>
+<wire x1="19.129375" y1="6.985" x2="19.605625" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="6.985" x2="20.16125" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="20.16125" y1="7.540625" x2="31.353125" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="6.996875" x2="19.1175" y2="6.996875" width="0.2032" layer="1"/>
+<wire x1="19.1175" y1="6.996875" x2="19.129375" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="31.353125" y1="7.540625" x2="31.75" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="31.75" y1="7.14375" x2="31.75" y2="5.7899" width="0.2032" layer="1"/>
+<wire x1="31.75" y1="5.7899" x2="31.58391875" y2="5.62381875" width="0.2032" layer="1"/>
 </signal>
 <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="34.76625" y2="4.7625" width="0.2032" layer="1"/>
-<via x="34.76625" y="4.7625" extent="1-16" drill="0.381"/>
+<via x="34.76625" y="4.7625" extent="1-16" drill="0.3048"/>
 <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"/>
+<wire x1="34.44875" y1="4.445" x2="33.02" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="33.02" y1="4.445" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
+<via x="19.05" y="5.87375" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="27"/>
+<wire x1="19.05" y1="5.87375" x2="19.605625" y2="5.87375" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="5.87375" x2="20.47875" y2="6.746875" width="0.2032" layer="16"/>
+<wire x1="20.47875" y1="6.746875" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="5.996875" x2="17.815625" y2="5.996875" width="0.2032" layer="1"/>
+<wire x1="17.815625" y1="5.996875" x2="17.93875" y2="5.87375" width="0.2032" layer="1"/>
+<wire x1="17.93875" y1="5.87375" x2="19.05" y2="5.87375" width="0.2032" layer="1"/>
+<wire x1="34.76625" y1="4.7625" x2="34.6824" y2="4.7625" width="0.2032" layer="1"/>
+<wire x1="34.6824" y1="4.7625" x2="33.56381875" y2="3.64391875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
-<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"/>
-<wire x1="35.34100625" y1="9.36625" x2="36.286178125" y2="10.326078125" width="0.2032" layer="1"/>
+<via x="19.05" y="8.09625" extent="1-16" drill="0.3048"/>
+<via x="35.2425" y="8.09625" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="31"/>
+<wire x1="19.05" y1="8.09625" x2="19.446875" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="19.446875" y1="8.09625" x2="19.685" y2="8.334375" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="8.334375" x2="32.464375" y2="8.334375" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="7.996875" x2="18.950625" y2="7.996875" width="0.2032" layer="1"/>
+<wire x1="18.950625" y1="7.996875" x2="19.05" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="36.286178125" y1="10.326078125" x2="35.2425" y2="9.2824" width="0.2032" layer="1"/>
+<wire x1="35.2425" y1="9.2824" x2="35.2425" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="32.464375" y1="8.334375" x2="33.17875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="33.17875" y1="7.62" x2="34.76625" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="34.76625" y1="7.62" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
-<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"/>
-<wire x1="38.96865" y1="8.41375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
+<via x="18.494375" y="7.46125" extent="1-16" drill="0.3048"/>
+<via x="36.98875" y="7.14375" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="30"/>
+<wire x1="18.494375" y1="7.46125" x2="19.3675" y2="7.46125" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="7.46125" x2="19.84375" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="7.9375" x2="32.305625" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="7.496875" x2="18.45875" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="18.45875" y1="7.496875" x2="18.494375" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="36.98875" y1="7.14375" x2="37.06365" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="37.06365" y1="7.14375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
+<wire x1="32.305625" y1="7.9375" x2="33.099375" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="33.099375" y1="7.14375" x2="36.98875" y2="7.14375" width="0.2032" layer="16"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
 <contactref element="RN1" pad="4"/>
-<wire x1="42.1175" y1="6.985" x2="40.48125" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="40.48125" y1="6.985" x2="40.16375" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="40.16375" y1="6.6675" x2="40.16375" y2="4.82625" width="0.2032" layer="1"/>
-<wire x1="40.16375" y1="4.82625" x2="40.24" y2="4.9025" width="0.2032" layer="1"/>
+<wire x1="41.165" y1="6.985" x2="40.005" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="40.005" y1="6.985" x2="39.6875" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.8575" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="2.8575" x2="39.21125" y2="2.38125" width="0.2032" layer="1"/>
+<wire x1="39.21125" y1="2.38125" x2="22.225" y2="2.38125" width="0.2032" layer="1"/>
+<wire x1="22.225" y1="2.38125" x2="21.5075" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="21.5075" y1="3.09875" x2="20.1425" y2="3.09875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J101" pad="D-"/>
 <contactref element="RN1" pad="3"/>
-<wire x1="42.1175" y1="6.335" x2="41.10125" y2="6.335" width="0.2032" layer="1"/>
-<wire x1="41.10125" y1="6.335" x2="40.9575" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="40.9575" y1="6.19125" x2="40.9575" y2="4.97875" width="0.2032" layer="1"/>
-<wire x1="40.9575" y1="4.97875" x2="41.04" y2="4.9025" width="0.2032" layer="1"/>
+<wire x1="41.165" y1="6.335" x2="40.3075" y2="6.335" width="0.2032" layer="1"/>
+<wire x1="40.3075" y1="6.335" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="21.9075" y1="1.905" x2="39.6875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="1.905" x2="40.16375" y2="2.38125" width="0.2032" layer="1"/>
+<wire x1="40.16375" y1="2.38125" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="21.9075" y1="1.905" x2="21.51375" y2="2.29875" width="0.2032" layer="1"/>
+<wire x1="21.51375" y1="2.29875" x2="20.1425" y2="2.29875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="J101" pad="VBUS"/>
 <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="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"/>
+<wire x1="41.165" y1="5.685" x2="42.1975" y2="5.685" width="0.2032" layer="1"/>
+<wire x1="42.1975" y1="5.685" x2="42.38625" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="42.38625" y1="6.0325" x2="42.38625" y2="11.495" width="0.2032" layer="1"/>
+<via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
+<wire x1="42.38625" y1="11.495" x2="41.81625" y2="12.065" width="0.2032" layer="16"/>
+<wire x1="41.81625" y1="12.065" x2="34.925" y2="12.065" width="0.2032" layer="16"/>
+<via x="34.925" y="12.065" extent="1-16" drill="0.3048"/>
+<wire x1="34.925" y1="12.065" x2="33.72" y2="12.065" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP102" pad="P1"/>
+<contactref element="U$13" pad="7"/>
+<wire x1="13.275625" y1="9.096875" x2="13.275625" y2="9.783125" width="0.2032" layer="1"/>
+<wire x1="13.275625" y1="9.783125" x2="13.335" y2="9.8425" width="0.2032" layer="1"/>
+<via x="13.335" y="9.8425" extent="1-16" drill="0.3048"/>
+<wire x1="13.335" y1="9.8425" x2="14.9225" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="14.9225" y1="11.43" x2="15.875" y2="11.43" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED102" pad="A"/>
 <contactref element="R102" pad="2"/>
-<wire x1="39.0675" y1="11.43" x2="38.977" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="38.977" y1="11.43" x2="40.16375" y2="11.3545" width="0.2032" layer="1"/>
+<wire x1="38.72" y1="10.4775" x2="38.72" y2="11.203" width="0.2032" layer="1"/>
+<wire x1="38.72" y1="11.203" x2="38.1755" y2="11.7475" width="0.2032" layer="1"/>
 </signal>
 <signal name="LED_PWR">
 <contactref element="R102" pad="1"/>
-<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"/>
-<wire x1="33.3525" y1="11.445" x2="33.02" y2="11.1125" width="0.2032" layer="1"/>
+<via x="18.57375" y="8.73125" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="32"/>
+<wire x1="18.57375" y1="8.73125" x2="32.86125" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="8.496875" x2="18.339375" y2="8.496875" width="0.2032" layer="1"/>
+<wire x1="18.339375" y1="8.496875" x2="18.57375" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="32.86125" y1="8.73125" x2="33.655" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="33.655" y1="9.525" x2="40.005" y2="9.525" width="0.2032" layer="16"/>
+<via x="40.005" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="40.005" y1="9.525" x2="40.02" y2="10.4775" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="5.715" y="5.87375" extent="1-16" drill="0.3048"/>
@@ -2997,41 +3021,31 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-BTN">
 <contactref element="SW101" pad="2"/>
-<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="33.655" y2="5.715" width="0.2032" layer="1"/>
+<via x="18.494375" y="6.429375" extent="1-16" drill="0.3048"/>
+<wire x1="32.385" y1="5.715" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
+<via x="33.655" y="5.715" extent="1-16" drill="0.3048"/>
+<contactref element="U$13" pad="28"/>
+<wire x1="18.494375" y1="6.429375" x2="19.605625" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="6.429375" x2="20.32" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="20.32" y1="7.14375" x2="30.95625" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="30.95625" y1="7.14375" x2="32.385" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="6.496875" x2="18.426875" y2="6.496875" width="0.2032" layer="1"/>
+<wire x1="18.426875" y1="6.496875" x2="18.494375" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="33.655" y1="5.715" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="U$13" pad="22"/>
 <contactref element="RN1" pad="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.319375" y2="3.01625" width="0.2032" layer="16"/>
-<via x="15.319375" y="3.01625" extent="1-16" drill="0.3048"/>
-<wire x1="15.319375" y1="3.01625" x2="15.24" y2="3.72625" width="0.2032" layer="1"/>
-<wire x1="15.24" y1="3.72625" x2="15.275625" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="15.275625" y1="4.396875" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
+<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="15.95125" y1="3.09875" x2="18.5925" y2="3.09875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="U$13" pad="21"/>
 <contactref element="RN1" pad="2"/>
-<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="15.954375" y2="2.69875" width="0.2032" layer="16"/>
-<wire x1="15.954375" y1="2.69875" x2="15.636875" y2="2.38125" width="0.2032" layer="16"/>
-<wire x1="15.636875" y1="2.38125" x2="14.76375" y2="2.38125" width="0.2032" layer="16"/>
-<via x="14.76375" y="2.38125" extent="1-16" drill="0.3048"/>
-<wire x1="14.76375" y1="2.38125" x2="14.76375" y2="3.75" width="0.2032" layer="1"/>
-<wire x1="14.76375" y1="3.75" x2="14.775625" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="14.775625" y1="4.396875" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
+<wire x1="14.775625" y1="3.639375" x2="16.11625" y2="2.29875" width="0.2032" layer="1"/>
+<wire x1="16.11625" y1="2.29875" x2="18.5925" y2="2.29875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
 <via x="5.23875" y="4.28625" extent="1-16" drill="0.3048"/>
@@ -3049,19 +3063,23 @@ design rules under a new name.</descript
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U104" pad="7"/>
-<wire x1="26.9875" y1="3.64" x2="26.9875" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="26.9875" y1="3.64" x2="26.9875" y2="5.715" width="0.2032" layer="1"/>
 <wire x1="27.066875" y1="3.560625" x2="26.9875" y2="3.64" width="0.2032" layer="1"/>
 <contactref element="U$13" pad="12"/>
-<via x="26.9875" y="3.81" extent="1-16" drill="0.3048"/>
-<wire x1="26.9875" y1="3.81" x2="26.908125" y2="3.889375" width="0.2032" layer="16"/>
-<wire x1="26.908125" y1="3.889375" x2="26.035" y2="3.81" width="0.2032" layer="16"/>
-<wire x1="26.035" y1="3.81" x2="11.668125" y2="3.81" width="0.2032" layer="16"/>
+<via x="26.9875" y="5.715" extent="1-16" drill="0.3048"/>
+<wire x1="26.19375" y1="5.000625" x2="25.479375" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="25.479375" y1="5.000625" x2="24.526875" y2="5.953125" width="0.2032" layer="16"/>
+<wire x1="24.526875" y1="5.953125" x2="21.034375" y2="5.953125" width="0.2032" layer="16"/>
+<wire x1="21.034375" y1="5.953125" x2="19.84375" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="4.7625" x2="12.97560625" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="12.97560625" y1="4.7625" x2="11.191875" y2="6.54623125" width="0.2032" layer="16"/>
+<wire x1="11.191875" y1="6.54623125" x2="11.191875" y2="6.746875" width="0.2032" layer="16"/>
 <via x="11.27125" y="6.82625" extent="1-16" drill="0.3048"/>
 <wire x1="12.175625" y1="6.996875" x2="11.441875" y2="6.996875" width="0.2032" layer="1"/>
 <wire x1="11.441875" y1="6.996875" x2="11.27125" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="11.668125" y1="3.81" x2="11.191875" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="11.191875" y1="4.28625" x2="11.191875" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="11.191875" y1="6.746875" x2="11.27125" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="26.19375" y1="5.000625" x2="26.9875" y2="5.55625" width="0.2032" layer="16"/>
+<wire x1="26.9875" y1="5.55625" x2="26.9875" y2="5.715" width="0.2032" layer="16"/>
 </signal>
 <signal name="SPI_SCK">
 <via x="4.445" y="4.7625" extent="1-16" drill="0.3048"/>
@@ -3072,16 +3090,13 @@ design rules under a new name.</descript
 <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"/>
-<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"/>
+<via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="11"/>
 <wire x1="10.830625" y1="7.4175" x2="10.715625" y2="7.3025" width="0.2032" layer="1"/>
 <via x="10.715625" y="7.3025" extent="1-16" drill="0.3048"/>
-<wire x1="10.715625" y1="7.3025" x2="10.715625" y2="2.460625" width="0.2032" layer="16"/>
-<wire x1="10.715625" y1="2.460625" x2="11.43" y2="1.74625" width="0.2032" layer="16"/>
-<wire x1="11.43" y1="1.74625" x2="24.13" y2="1.74625" width="0.2032" layer="16"/>
-<wire x1="24.13" y1="1.74625" x2="24.4475" y2="2.06375" width="0.2032" layer="16"/>
+<wire x1="10.715625" y1="7.3025" x2="10.715625" y2="6.423484375" width="0.2032" layer="16"/>
+<wire x1="10.715625" y1="6.423484375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
+<wire x1="12.852859375" y1="4.28625" x2="20.0025" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="12.175625" y1="7.496875" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
 <wire x1="10.795" y1="7.496875" x2="7.735" y2="7.496875" width="0.2032" layer="1"/>
 <wire x1="7.735" y1="7.496875" x2="7.223125" y2="6.985" width="0.2032" layer="1"/>
@@ -3091,6 +3106,11 @@ design rules under a new name.</descript
 <wire x1="4.55875" y1="4.87625" x2="4.445" y2="4.7625" width="0.2032" layer="1"/>
 <wire x1="10.830625" y1="7.4175" x2="10.830625" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="10.830625" y1="7.46125" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="4.28625" x2="21.193125" y2="5.476875" width="0.2032" layer="16"/>
+<wire x1="21.193125" y1="5.476875" x2="23.891875" y2="5.476875" width="0.2032" layer="16"/>
+<wire x1="24.4475" y1="3.64" x2="24.45875" y2="4.91" width="0.2032" layer="1"/>
+<wire x1="24.45875" y1="4.91" x2="24.13" y2="5.23875" width="0.2032" layer="1"/>
+<wire x1="23.891875" y1="5.476875" x2="24.13" y2="5.23875" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
@@ -3103,18 +3123,46 @@ design rules under a new name.</descript
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U104" pad="6"/>
-<contactref element="U$13" pad="27"/>
-<wire x1="16.875625" y1="5.996875" x2="25.7175" y2="3.64" width="0" layer="19" extent="1-1"/>
+<contactref element="U$13" pad="25"/>
+<wire x1="16.875625" y1="4.996875" x2="17.77625" y2="4.996875" width="0.2032" layer="1"/>
+<wire x1="17.77625" y1="4.996875" x2="18.018125" y2="5.23875" width="0.2032" layer="1"/>
+<via x="18.018125" y="5.23875" extent="1-16" drill="0.3048"/>
+<wire x1="18.018125" y1="5.23875" x2="19.52625" y2="5.23875" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="5.23875" x2="20.6375" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="6.35" x2="24.765" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="6.35" x2="24.844375" y2="6.270625" width="0.2032" layer="16"/>
+<wire x1="24.844375" y1="6.270625" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
+<via x="25.7175" y="5.794375" extent="1-16" drill="0.3048"/>
+<wire x1="25.7175" y1="5.794375" x2="25.7175" y2="3.64" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$13" pad="24"/>
 <contactref element="TP1" pad="TP"/>
-<wire x1="17.145" y1="-2.06375" x2="16.275625" y2="4.396875" width="0" layer="19" extent="1-1"/>
+<wire x1="16.275625" y1="4.396875" x2="17.986875" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="17.986875" y1="4.396875" x2="18.25625" y2="4.445" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$13" pad="23"/>
 <contactref element="TP2" pad="TP"/>
-<wire x1="15.5575" y1="-1.42875" x2="15.775625" y2="4.396875" width="0" layer="19" extent="1-1"/>
+<wire x1="15.775625" y1="4.396875" x2="15.775625" y2="3.98875" width="0.2032" layer="1"/>
+<wire x1="15.775625" y1="3.98875" x2="16.03375" y2="3.730625" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="3.730625" x2="17.62125" y2="3.730625" width="0.2032" layer="1"/>
+</signal>
+<signal name="AUX-TX">
+<contactref element="JP1" pad="P1"/>
+<contactref element="U$13" pad="19"/>
+<wire x1="13.775625" y1="4.396875" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
+<wire x1="13.775625" y1="3.933125" x2="13.49375" y2="3.65125" width="0.2032" layer="1"/>
+<wire x1="13.49375" y1="3.65125" x2="11.58875" y2="3.65125" width="0.2032" layer="1"/>
+<wire x1="11.58875" y1="3.65125" x2="11.43" y2="3.4925" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="3.4925" x2="11.43" y2="2.38125" width="0.2032" layer="1"/>
+</signal>
+<signal name="AUX-RX">
+<contactref element="JP1" pad="P2"/>
+<contactref element="U$13" pad="20"/>
+<wire x1="14.275625" y1="4.396875" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="3.798125" x2="13.97" y2="3.4925" width="0.2032" layer="1"/>
+<wire x1="13.97" y1="3.4925" x2="13.97" y2="2.38125" width="0.2032" layer="1"/>
 </signal>
 </signals>
 </board>