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="6.5.0">
+<eagle version="7.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="3.125" altunitdist="mil" altunit="mil"/>
+<grid distance="12.5" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" 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"/>
@@ -37,7 +37,7 @@
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -64,6 +64,8 @@
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="90" name="Modules" color="7" fill="1" visible="no" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="no" active="no"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="no" active="no"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="no"/>
@@ -199,9 +201,9 @@
 <dimension x1="1.27" y1="0" x2="45.72" y2="19.05" x3="-8.89" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="45.72" y1="3.81" x2="45.72" y2="15.24" x3="-5.715" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="0" y1="19.685" x2="45.085" y2="19.685" x3="22.5425" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
-<text x="13.096875" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
-<text x="10.95375" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="13.0175" y="3.96875" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="16.66875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
+<text x="14.366875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
+<text x="24.209375" y="0.3175" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
 <circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
 <circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -243,6 +245,8 @@
 <hole x="0.9525" y="15.24" drill="0.381"/>
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
+<circle x="14.12875" y="14.44625" radius="0.127" width="0.2032" layer="21"/>
+<text x="20.32" y="-3.175" size="1.778" layer="1">progconn orientation?</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -256,10 +260,10 @@
 <wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
 <smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
@@ -275,8 +279,25 @@
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
+<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
+<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
+<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
+<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
+<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
+<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
+<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
+<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
+<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
+<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
+<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
+<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
+<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
+<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
+<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
+<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 </library>
@@ -1902,125 +1923,6 @@ You are welcome to use this library for 
 <rectangle x1="11.2522" y1="6.5786" x2="11.3538" y2="6.6294" layer="21"/>
 <rectangle x1="12.4714" y1="6.5786" x2="12.7254" y2="6.6294" layer="21"/>
 </package>
-<package name="UFQFPN32">
-<wire x1="-2.4" y1="2.4" x2="2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="2.4" x2="2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-2.4" x2="-2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="-2.4" x2="-2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.225" layer="31"/>
-<smd name="1" x="-2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="2" x="-2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="3" x="-2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="4" x="-2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="5" x="-2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="6" x="-2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="7" x="-2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="8" x="-2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="9" x="-1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="10" x="-1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="11" x="-0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="12" x="-0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="13" x="0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="14" x="0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="15" x="1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="16" x="1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="17" x="2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="18" x="2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="19" x="2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="20" x="2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="21" x="2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="22" x="2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="23" x="2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="24" x="2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="25" x="1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="26" x="1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="27" x="0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="28" x="0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="29" x="-0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="30" x="-0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="31" x="-1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="32" x="-1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="EXP" x="0" y="0" dx="3.5" dy="3.5" layer="1" roundness="10" stop="no" cream="no"/>
-<rectangle x1="-2.45" y1="2" x2="-2" y2="2.45" layer="21"/>
-<rectangle x1="-2.45" y1="0" x2="0" y2="2.45" layer="51"/>
-<rectangle x1="-1.5" y1="0.25" x2="-0.25" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="0.25" x2="1.5" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="-1.5" x2="1.5" y2="-0.25" layer="31"/>
-<rectangle x1="-1.5" y1="-1.5" x2="-0.25" y2="-0.25" layer="31"/>
-<polygon width="0.2" layer="29">
-<vertex x="-1.75" y="1.25"/>
-<vertex x="-1.25" y="1.75"/>
-<vertex x="1.5" y="1.75" curve="-90"/>
-<vertex x="1.75" y="1.5"/>
-<vertex x="1.75" y="-1.5" curve="-90"/>
-<vertex x="1.5" y="-1.75"/>
-<vertex x="-1.5" y="-1.75" curve="-90"/>
-<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"/>
@@ -2061,26 +1963,6 @@ You are welcome to use this library for 
 <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>
-<package name="POGOPROG-CONN-ALLSMT">
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-</package>
 <package name="THERM_LOGO_SMALL_0.2">
 <rectangle x1="0.0762" y1="0.0254" x2="0.3302" y2="0.0762" layer="21"/>
 <rectangle x1="1.651" y1="0.0254" x2="1.905" y2="0.0762" layer="21"/>
@@ -2252,6 +2134,119 @@ You are welcome to use this library for 
 <rectangle x1="4.445" y1="1.2446" x2="4.5466" y2="1.2954" layer="21"/>
 <rectangle x1="4.9022" y1="1.2446" x2="5.0546" y2="1.2954" layer="21"/>
 </package>
+<package name="LQFP32">
+<wire x1="-3.5" y1="3.15" x2="-3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="-3.5" y1="-3.15" x2="-3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="-3.5" x2="3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="-3.5" x2="3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="-3.15" x2="3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="3.15" x2="3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="3.5" x2="-3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="3.5" x2="-3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="-3.35" y1="3.088" x2="-3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="-3.35" y1="-3.088" x2="-3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="-3.35" x2="3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="-3.35" x2="3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="-3.088" x2="3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="3.088" x2="3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="3.35" x2="-3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="3.35" x2="-3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="-3.235" y1="3.04" x2="-3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="-3.235" y1="-3.04" x2="-3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="-3.235" x2="3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="-3.235" x2="3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="-3.04" x2="3.235" y2="3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="3.04" x2="3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="3.235" x2="-3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="3.235" x2="-3.235" y2="3.04" width="0.1524" layer="21"/>
+<circle x="-2.37" y="2.37" radius="0.475" width="0.1524" layer="21"/>
+<smd name="1" x="-4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="2" x="-4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="3" x="-4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="4" x="-4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="5" x="-4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="6" x="-4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="7" x="-4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="8" x="-4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="9" x="-2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="10" x="-2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="11" x="-1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="12" x="-0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="13" x="0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="14" x="1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="15" x="2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="16" x="2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="17" x="4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="18" x="4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="19" x="4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="20" x="4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="21" x="4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="22" x="4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="23" x="4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="24" x="4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="25" x="2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="26" x="2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="27" x="1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="28" x="0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="29" x="-0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="30" x="-1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="31" x="-2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="32" x="-2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<text x="-3" y="5" size="1.27" layer="21" ratio="10">&gt;NAME</text>
+<rectangle x1="-4.185" y1="2.3" x2="-3.815" y2="3.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="1.5" x2="-3.815" y2="2.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-3.3" x2="-3.815" y2="-2.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-2.5" x2="-3.815" y2="-1.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-1.7" x2="-3.815" y2="-0.7" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.9" x2="-3.815" y2="0.1" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.1" x2="-3.815" y2="0.9" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="0.7" x2="-3.815" y2="1.7" layer="51" rot="R270"/>
+<rectangle x1="-2.985" y1="-4.5" x2="-2.615" y2="-3.5" layer="51"/>
+<rectangle x1="-2.185" y1="-4.5" x2="-1.815" y2="-3.5" layer="51"/>
+<rectangle x1="2.615" y1="-4.5" x2="2.985" y2="-3.5" layer="51"/>
+<rectangle x1="1.815" y1="-4.5" x2="2.185" y2="-3.5" layer="51"/>
+<rectangle x1="1.015" y1="-4.5" x2="1.385" y2="-3.5" layer="51"/>
+<rectangle x1="0.215" y1="-4.5" x2="0.585" y2="-3.5" layer="51"/>
+<rectangle x1="-0.585" y1="-4.5" x2="-0.215" y2="-3.5" layer="51"/>
+<rectangle x1="-1.385" y1="-4.5" x2="-1.015" y2="-3.5" layer="51"/>
+<rectangle x1="3.815" y1="-3.3" x2="4.185" y2="-2.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-2.5" x2="4.185" y2="-1.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="2.3" x2="4.185" y2="3.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="1.5" x2="4.185" y2="2.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="0.7" x2="4.185" y2="1.7" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.1" x2="4.185" y2="0.9" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.9" x2="4.185" y2="0.1" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-1.7" x2="4.185" y2="-0.7" layer="51" rot="R90"/>
+<rectangle x1="2.615" y1="3.5" x2="2.985" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.815" y1="3.5" x2="2.185" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.985" y1="3.5" x2="-2.615" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.185" y1="3.5" x2="-1.815" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-1.385" y1="3.5" x2="-1.015" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-0.585" y1="3.5" x2="-0.215" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
+</package>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="-0.635" y="1.905"/>
+</polygon>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2306,6 +2301,22 @@ chip</description>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 <rectangle x1="-0.2032" y1="-0.3556" x2="0.2032" y2="0.3556" layer="21"/>
 </package>
+<package name="0603-CAP">
+<wire x1="-1.473" y1="0.983" x2="1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="0.983" x2="1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="-0.983" x2="-1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.473" y1="-0.983" x2="-1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.356" y1="0.432" x2="0.356" y2="0.432" width="0.1016" layer="51"/>
+<wire x1="-0.356" y1="-0.419" x2="0.356" y2="-0.419" width="0.1016" layer="51"/>
+<wire x1="0" y1="0.0305" x2="0" y2="-0.0305" width="0.5588" layer="21"/>
+<smd name="1" x="-0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<smd name="2" x="0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<text x="-0.889" y="0.762" size="0.4064" layer="25" font="vector">&gt;NAME</text>
+<text x="-1.016" y="-1.143" size="0.4064" layer="27" font="vector">&gt;VALUE</text>
+<rectangle x1="-0.8382" y1="-0.4699" x2="-0.3381" y2="0.4801" layer="51"/>
+<rectangle x1="0.3302" y1="-0.4699" x2="0.8303" y2="0.4801" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
+</package>
 <package name="0402-CAP">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;&lt;p&gt;
 chip</description>
@@ -2423,6 +2434,9 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.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"/>
@@ -2517,15 +2531,15 @@ design rules under a new name.</descript
 <element name="SW1" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="9.525" smashed="yes" rot="R45">
 <attribute name="NAME" x="35.44119375" y="12.29685625" size="0.8128" layer="25" ratio="16" rot="R315"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
+<element name="JP1" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="78.105" y="37.465" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="NAME" x="44.165" y="8.956875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="46.99" y="7.62" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
+<element name="IC1" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
 <attribute name="NAME" x="31.035625" y="6.19125" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="9.2075" smashed="yes" rot="R180">
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="21.59" y="9.2075" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="20.066" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="9.398" size="0.4064" layer="27" rot="R180"/>
@@ -2541,62 +2555,64 @@ design rules under a new name.</descript
 <attribute name="NAME" x="35.537775" y="14.290675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="13.6144" size="0.4064" layer="27"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="12.3825" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.08225" y="12.557125" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.51075" y="13.5255" size="0.4064" layer="27" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="21.669375" y="12.144375" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.320375" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="22.748875" y="13.287375" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.588125" smashed="yes" rot="R180">
-<attribute name="NAME" x="20.939125" y="8.66775" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.6695" y="7.731125" size="0.4064" layer="27" rot="R180"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.35" smashed="yes">
+<attribute name="NAME" x="22.240875" y="4.270375" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="20.5105" y="5.207" size="0.4064" layer="27"/>
 </element>
 <element name="R1" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="13.0175" smashed="yes" rot="R180">
 <attribute name="NAME" x="40.894" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="40.4495" y="14.1605" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
 <attribute name="NAME" x="23.5585" y="12.080875" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="25.11425" y="8.366125" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.36625" smashed="yes" rot="R180">
-<attribute name="VALUE" x="30.635" y="16.86625" size="0.4064" layer="27" ratio="10" rot="R180"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
+<attribute name="VALUE" x="30.635" y="17.025" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="44.529375" y="5.715" rot="MR0"/>
-<element name="U1" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="9.68375" smashed="yes" rot="R270"/>
-<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="13.49375" y="14.366875" smashed="yes" rot="R180">
-<attribute name="NAME" x="13.160375" y="13.668375" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="14.57325" y="15.509875" size="0.4064" layer="27" rot="R180"/>
+<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="5.715" y="13.573125" smashed="yes" rot="R180">
+<attribute name="NAME" x="5.381625" y="12.874625" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="6.7945" y="14.716125" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="12.3825" smashed="yes">
-<attribute name="NAME" x="18.669" y="10.541" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="18.049875" y="11.2395" size="0.4064" layer="27"/>
+<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="18.653125" y="12.22375" smashed="yes">
+<attribute name="NAME" x="18.19275" y="10.38225" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="17.573625" y="11.08075" size="0.4064" layer="27"/>
 </element>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="6.985" smashed="yes" rot="R180">
-<attribute name="NAME" x="7.604125" y="7.71525" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="10.76325" y="8.128" size="0.4064" layer="27" rot="R180"/>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="4.60375" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="2.524125" y="5.81025" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="5.68325" y="6.223" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
+<element name="CA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
 <attribute name="NAME" x="3.571875" y="10.63625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="11.1125" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="11.43" y="4.92125" rot="MR180"/>
-<element name="J1" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="4.683125" rot="MR90"/>
-<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
-<element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
+<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
-<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
+<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
+<element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="23.1775" y="4.7625" rot="MR90"/>
+<element name="R3" library="SparkFun-Passives" package="0402-RES" value="" x="12.7" y="5.08" rot="MR90"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="11.43" y="5.08" rot="MR90"/>
+<element name="JP5" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="14.9225" y="5.08" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="JP2" pad="P2"/>
 <contactref element="U2" pad="2"/>
 <contactref element="SW1" pad="5"/>
-<contactref element="J2" pad="GND"/>
-<contactref element="J2" pad="MT1"/>
-<contactref element="J2" pad="MT2"/>
+<contactref element="JP1" pad="GND"/>
+<contactref element="JP1" pad="MT1"/>
+<contactref element="JP1" pad="MT2"/>
 <contactref element="JP3" pad="P2"/>
 <contactref element="LED1" pad="C"/>
-<contactref element="C8" pad="1"/>
+<contactref element="C10" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
 <polygon width="0.254" layer="16" isolate="0.2032">
@@ -2605,224 +2621,261 @@ design rules under a new name.</descript
 <vertex x="45.085" y="15.24"/>
 <vertex x="0" y="15.24"/>
 </polygon>
-<via x="22.86" y="12.3825" extent="1-16" drill="0.3048"/>
-<wire x1="22.08125" y1="12.3825" x2="22.86" y2="12.3825" width="0.2032" layer="1"/>
-<via x="21.510625" y="5.635625" extent="1-16" drill="0.3048"/>
+<via x="24.13" y="12.3825" extent="1-16" drill="0.3048"/>
+<via x="23.01875" y="6.35" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
-<contactref element="U1" pad="EXP"/>
-<via x="39.84625" y="10.795" extent="1-16" drill="0.3048"/>
-<wire x1="41.165" y1="10.825" x2="39.87625" y2="10.825" width="0.2032" layer="1"/>
-<wire x1="39.87625" y1="10.825" x2="39.84625" y2="10.795" 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"/>
+<via x="39.84625" y="11.7475" extent="1-16" drill="0.3048"/>
+<contactref element="CA1" pad="C1A"/>
+<contactref element="CA1" pad="C2A"/>
+<contactref element="CA1" pad="C3A"/>
+<contactref element="CA1" pad="C4A"/>
 <wire x1="0.8125" y1="10.725" x2="0.8125" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.125" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
-<via x="14.525625" y="9.68375" extent="1-16" drill="0.3048"/>
-<wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
-<via x="10.16" y="5.953125" extent="1-16" drill="0.3048"/>
-<via x="36.35375" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="8.335" y1="10.825" x2="5.159375" y2="10.825" width="0.2032" layer="16"/>
+<via x="36.195" y="10.63625" extent="1-16" drill="0.3048"/>
 <wire x1="37.276128125" y1="11.876128125" x2="37.276128125" y2="11.717378125" width="0.2032" layer="1"/>
-<wire x1="37.276128125" y1="11.717378125" x2="36.35375" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="37.276128125" y1="11.717378125" x2="36.195" y2="10.63625" width="0.2032" layer="1"/>
 <via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="5.953125" x2="9.286875" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="9.286875" y1="5.953125" x2="9.04875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="9.04875" y1="6.19125" x2="9.04875" y2="6.97" width="0.2032" layer="1"/>
-<wire x1="9.04875" y1="6.97" x2="9.03375" y2="6.985" width="0.2032" layer="1"/>
-<via x="11.7475" y="14.366875" extent="1-16" drill="0.3048"/>
+<via x="5.08" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
-<contactref element="J1" pad="2"/>
-<contactref element="U1" pad="31"/>
-<wire x1="16.875625" y1="10.93375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="13.49375" x2="43.84625" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="13.49375" x2="43.815" y2="13.525" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="12.3825" x2="19.779375" y2="13.875625" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="13.875625" x2="19.685" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="19.685" y1="13.97" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
 <via x="42.38625" y="5.635625" extent="1-16" drill="0.3048"/>
 <via x="44.370625" y="13.97" extent="1-16" drill="0.3048"/>
 <wire x1="43.97375" y1="13.49375" x2="43.97375" y2="13.573125" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="13.573125" x2="44.370625" y2="13.97" width="0.2032" layer="1"/>
 <wire x1="43.815" y1="5.525" x2="43.84625" y2="5.525" width="0.2032" layer="1"/>
-<wire x1="14.525625" y1="9.68375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
-<contactref element="R3" pad="1"/>
+<contactref element="R2" pad="1"/>
 <via x="0.873125" y="6.0325" extent="1-16" drill="0.3048"/>
 <wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
-<contactref element="U3" pad="1"/>
-<wire x1="21.510625" y1="5.635625" x2="21.11375" y2="5.635625" width="0.2032" layer="1"/>
-<wire x1="21.11375" y1="5.635625" x2="20.955" y2="5.794375" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="9.525" x2="25.4" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="25.4" y1="9.525" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
+<contactref element="IC1" pad="1"/>
+<wire x1="29.36875" y1="9.36625" x2="25.24125" y2="9.36625" width="0.2032" layer="1"/>
+<wire x1="25.24125" y1="9.36625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
-<via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
-<wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="9.525" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="11.7475" y1="14.366875" x2="12.84375" y2="14.366875" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="11.27125" x2="22.06625" y2="11.7475" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="11.7475" x2="22.06625" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="12.3675" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
+<wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.11" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.049375" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="5.794375" x2="20.955" y2="6.573125" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="6.573125" x2="20.94" y2="6.588125" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="5.635625" x2="43.704375" y2="5.635625" width="0.2032" layer="1"/>
 <wire x1="43.704375" y1="5.635625" x2="43.815" y2="5.525" width="0.2032" layer="1"/>
+<contactref element="U1" pad="16"/>
+<contactref element="U1" pad="32"/>
+<wire x1="14.73625" y1="12.325" x2="13.43625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="13.43625" y1="12.325" x2="13.414375" y2="12.303125" width="0.2032" layer="1"/>
+<via x="13.414375" y="12.303125" extent="1-16" drill="0.3048"/>
+<via x="2.38125" y="5.08" extent="1-16" drill="0.3048"/>
+<wire x1="3.95375" y1="5.08" x2="2.38125" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="6.725" x2="4.97875" y2="6.725" width="0.2032" layer="1"/>
+<wire x1="4.97875" y1="6.725" x2="4.048125" y2="5.794375" width="0.2032" layer="1"/>
+<wire x1="4.048125" y1="5.794375" x2="4.048125" y2="5.174375" width="0.2032" layer="1"/>
+<wire x1="4.048125" y1="5.174375" x2="3.95375" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="22.24" y1="6.35" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
+<wire x1="41.165" y1="10.825" x2="40.054375" y2="10.825" width="0.2032" layer="1"/>
+<wire x1="40.054375" y1="10.825" x2="39.84625" y2="11.033125" width="0.2032" layer="1"/>
+<wire x1="39.84625" y1="11.033125" x2="39.84625" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="5.065" y1="13.573125" x2="5.08" y2="13.588125" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="13.588125" x2="5.08" y2="14.605" width="0.2032" layer="1"/>
+<contactref element="U1" pad="31"/>
+<wire x1="14.73625" y1="11.525" x2="15.81125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="15.81125" y1="11.525" x2="16.03375" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="11.7475" x2="16.03375" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="12.065" x2="15.795625" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="12.303125" x2="14.758125" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="14.758125" y1="12.303125" x2="14.73625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="12.22375" x2="19.303125" y2="13.081875" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="13.081875" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.215" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="11.215" x2="22.519375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="22.519375" y1="12.144375" x2="23.891875" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="23.891875" y1="12.144375" x2="24.13" y2="12.3825" width="0.2032" layer="1"/>
+<contactref element="J1" pad="2"/>
+<contactref element="R3" pad="2"/>
+<contactref element="C8" pad="2"/>
+<via x="24.28875" y="6.985" extent="1-16" drill="0.3048"/>
+<wire x1="23.97125" y1="8.795625" x2="24.27375" y2="8.795625" width="0.2032" layer="1"/>
+<wire x1="24.27375" y1="8.795625" x2="24.28875" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="24.28875" y1="8.810625" x2="24.28875" y2="6.985" width="0.2032" layer="1"/>
+<via x="16.430625" y="6.50875" extent="1-16" drill="0.3048"/>
+<wire x1="16.430625" y1="6.50875" x2="19.20875" y2="6.50875" width="0.2032" layer="1"/>
+<wire x1="19.20875" y1="6.50875" x2="20.32" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="20.32" y1="5.3975" x2="22.70125" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="22.70125" y1="5.3975" x2="23.01875" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="23.01875" y1="5.715" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
-<via x="4.445" y="13.6525" extent="1-16" drill="0.3048"/>
-<wire x1="4.445" y1="13.6525" x2="4.83125" y2="13.26625" width="0.2032" layer="16"/>
+<via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="2"/>
-<wire x1="4.83125" y1="13.26625" x2="8.335" y2="13.26625" width="0.2032" layer="16"/>
-<contactref element="C9" pad="1"/>
-<wire x1="2.2375" y1="13.6525" x2="4.445" y2="13.6525" width="0.2032" layer="1"/>
+<contactref element="C4" pad="1"/>
+<wire x1="2.2375" y1="13.6525" x2="3.175" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="3.481875" y1="13.345625" x2="3.175" y2="13.6525" width="0.2032" layer="16"/>
+<wire x1="3.481875" y1="13.345625" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="13.425" x2="4.51375" y2="13.425" width="0.2032" layer="16"/>
+<wire x1="4.51375" y1="13.425" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$2">
-<via x="5.3975" y="13.890625" extent="1-16" drill="0.3048"/>
+<via x="3.96875" y="13.97" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="1"/>
 <wire x1="1.11125" y1="14.44625" x2="0.9525" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="14.2875" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<contactref element="C9" pad="2"/>
+<contactref element="C4" pad="2"/>
 <wire x1="0.9375" y1="13.6525" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<wire x1="1.11125" y1="14.44625" x2="4.841875" y2="14.44625" width="0.2032" layer="1"/>
-<wire x1="4.841875" y1="14.44625" x2="5.3975" y2="13.890625" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="13.91625" x2="5.423125" y2="13.91625" width="0.2032" layer="16"/>
-<wire x1="5.423125" y1="13.91625" x2="5.3975" y2="13.890625" width="0.2032" layer="16"/>
+<wire x1="1.11125" y1="14.44625" x2="3.4925" y2="14.44625" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="14.44625" x2="3.96875" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="13.97" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="14.075" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="13.97" x2="3.96875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
-<via x="4.445" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="4.54375" y1="11.96625" x2="4.445" y2="12.065" width="0.2032" layer="16"/>
+<via x="3.175" y="12.065" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="4"/>
-<wire x1="4.54375" y1="11.96625" x2="8.335" y2="11.96625" width="0.2032" layer="16"/>
 <contactref element="C3" pad="2"/>
-<wire x1="2.2375" y1="12.065" x2="4.445" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="12.065" x2="3.175" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.125" x2="3.235" y2="12.125" width="0.2032" layer="16"/>
+<wire x1="3.235" y1="12.125" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$4">
-<via x="4.445" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="4.6875" y1="12.61625" x2="4.445" y2="12.85875" width="0.2032" layer="16"/>
+<via x="3.175" y="12.85875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="4.6875" y1="12.61625" x2="8.335" y2="12.61625" width="0.2032" layer="16"/>
-<wire x1="4.445" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="1.11125" y1="12.85875" x2="0.9525" y2="12.7" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="12.7" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
 <contactref element="C3" pad="1"/>
 <wire x1="0.9375" y1="12.065" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.775" x2="3.25875" y2="12.775" width="0.2032" layer="16"/>
+<wire x1="3.25875" y1="12.775" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$8">
 <via x="3.96875" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="3.96875" y1="6.50875" x2="4.36125" y2="6.11625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
-<wire x1="4.36125" y1="6.11625" x2="8.335" y2="6.11625" width="0.2032" layer="16"/>
 <wire x1="3.4925" y1="6.985" x2="3.96875" y2="6.50875" width="0.2032" layer="1"/>
-<contactref element="R3" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="2.2375" y1="6.985" x2="3.4925" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.275" x2="4.2025" y2="6.275" width="0.2032" layer="16"/>
+<wire x1="4.2025" y1="6.275" x2="3.96875" y2="6.50875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$9">
 <via x="3.4925" y="9.04875" extent="1-16" drill="0.3048"/>
 <wire x1="3.33375" y1="6.985" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
-<wire x1="3.33375" y1="6.22075625" x2="4.08825625" y2="5.46625" width="0.2032" layer="16"/>
-<wire x1="4.08825625" y1="5.46625" x2="8.335" y2="5.46625" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="6.985" x2="3.81" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="7.46125" x2="3.81" y2="8.73125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="8.73125" x2="3.4925" y2="9.04875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
-<contactref element="RA1" pad="C3B"/>
+<contactref element="CA1" pad="C3B"/>
 <wire x1="2.3625" y1="9.125" x2="3.41625" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="3.41625" y1="9.125" x2="3.4925" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="5.625" x2="3.92950625" y2="5.625" width="0.2032" layer="16"/>
+<wire x1="3.92950625" y1="5.625" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="7.77875" extent="1-16" drill="0.3048"/>
 <wire x1="2.8575" y1="7.46125" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
-<wire x1="2.8575" y1="6.022421875" x2="4.063671875" y2="4.81625" width="0.2032" layer="16"/>
-<wire x1="4.063671875" y1="4.81625" x2="8.335" y2="4.81625" width="0.2032" layer="16"/>
 <wire x1="2.8575" y1="7.46125" x2="3.175" y2="7.77875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
-<contactref element="RA1" pad="C4B"/>
+<contactref element="CA1" pad="C4B"/>
 <wire x1="2.3625" y1="8.325" x2="3.105" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="3.105" y1="8.325" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.175" y1="8.255" x2="3.175" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="4.975" x2="7.169375" y2="4.975" width="0.2032" layer="16"/>
+<wire x1="7.169375" y1="4.975" x2="7.14375" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.000625" x2="7.223125" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.223125" y1="5.000625" x2="7.14375" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.08" x2="3.799921875" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="3.799921875" y1="5.08" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
-<contactref element="C8" pad="2"/>
+<contactref element="C10" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="7.9099" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
-<via x="11.350625" y="13.0175" extent="1-16" drill="0.3048"/>
-<via x="3.81" y="11.27125" extent="1-16" drill="0.3048"/>
+<via x="3.175" y="11.27125" extent="1-16" drill="0.3048"/>
 <wire x1="22.5425" y1="7.9099" x2="22.5425" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
-<wire x1="20.558125" y1="8.969375" x2="19.84375" y2="9.68375" width="0.2032" layer="1"/>
-<wire x1="19.84375" y1="9.68375" x2="19.84375" y2="11.0603625" width="0.2032" layer="1"/>
-<wire x1="19.84375" y1="11.0603625" x2="19.4741125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="19.4741125" y1="11.43" x2="18.653125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="18.653125" y1="11.43" x2="18.494375" y2="11.58875" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="8.335" y1="10.01625" x2="8.35" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="3.855" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.175" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
 <contactref element="C1" pad="1"/>
-<contactref element="U1" pad="1"/>
-<contactref element="U1" pad="5"/>
 <contactref element="C2" pad="1"/>
-<contactref element="U1" pad="17"/>
 <contactref element="C6" pad="1"/>
-<contactref element="RA1" pad="C1B"/>
-<contactref element="RA1" pad="C2B"/>
-<via x="4.60375" y="10.00125" extent="1-16" drill="0.3048"/>
-<via x="10.16" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="8.09625" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="14.3025" y1="12.006875" x2="14.275625" y2="12.03375" width="0.2032" layer="1"/>
-<wire x1="8.35" y1="10.00125" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="10.33375" y1="6.985" x2="10.33375" y2="7.9225" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="7.9225" x2="10.16" y2="8.09625" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="12.85875" x2="14.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="12.03375" x2="14.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="2.3625" y1="10.725" x2="3.26375" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="3.26375" y1="10.725" x2="3.81" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="11.31625" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="16.275625" y1="12.03375" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="11.58875" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="12.3675" x2="18.479375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="12.3825" x2="17.859375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="17.859375" y1="12.3825" x2="17.383125" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="17.383125" y1="12.85875" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="12.775625" y1="7.33375" x2="12.775625" y2="6.8225" width="0.2032" layer="1"/>
-<wire x1="12.775625" y1="6.8225" x2="12.620625" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="12.620625" y1="6.6675" x2="10.65125" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="10.65125" y1="6.6675" x2="10.33375" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="11.31625" x2="10.16" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="10.16" y1="11.826875" x2="11.350625" y2="13.0175" width="0.2032" layer="16"/>
-<wire x1="14.275625" y1="12.85875" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="13.49375" x2="14.275625" y2="14.235" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.01625" x2="4.61875" y2="10.01625" width="0.2032" layer="16"/>
-<wire x1="4.61875" y1="10.01625" x2="4.60375" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="2.3625" y1="9.925" x2="4.5275" y2="9.925" width="0.2032" layer="1"/>
-<wire x1="4.5275" y1="9.925" x2="4.60375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="3.855" y1="11.31625" x2="3.81" y2="11.27125" width="0.2032" layer="16"/>
-<contactref element="U3" pad="4"/>
-<wire x1="22.24" y1="6.588125" x2="22.24" y2="6.6825" width="0.2032" layer="1"/>
-<wire x1="22.24" y1="6.6825" x2="22.463125" y2="6.905625" width="0.2032" layer="1"/>
-<wire x1="22.463125" y1="6.905625" x2="22.463125" y2="7.830525" width="0.2032" layer="1"/>
-<wire x1="22.463125" y1="7.830525" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
+<contactref element="CA1" pad="C1B"/>
+<contactref element="CA1" pad="C2B"/>
+<via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
+<wire x1="2.3625" y1="10.725" x2="2.62875" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="2.62875" y1="10.725" x2="3.175" y2="11.27125" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="12.22375" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="2.3625" y1="9.925" x2="3.2575" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="3.2575" y1="9.925" x2="3.33375" y2="10.00125" width="0.2032" layer="1"/>
+<contactref element="IC1" pad="4"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.63625" x2="24.13" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="24.13" y1="10.795" x2="25.470625" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="25.470625" y1="10.795" x2="25.55875" y2="10.706875" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="22.845" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="8.969375" x2="23.97125" y2="10.095625" width="0.2032" layer="1"/>
-<wire x1="11.350625" y1="13.0175" x2="11.826875" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="11.826875" y1="13.49375" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="14.235" x2="14.14375" y2="14.366875" width="0.2032" layer="1"/>
+<contactref element="U1" pad="1"/>
+<contactref element="U1" pad="5"/>
+<contactref element="U1" pad="17"/>
+<wire x1="13.43625" y1="13.625" x2="13.43625" y2="14.6625" width="0.2032" layer="1"/>
+<wire x1="13.43625" y1="14.6625" x2="13.255625" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="13.255625" y1="14.843125" x2="10.23625" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="10.23625" y1="13.625" x2="10.23625" y2="14.843125" width="0.2032" layer="1"/>
+<via x="10.239375" y="12.461875" extent="1-16" drill="0.3048"/>
+<wire x1="10.239375" y1="12.461875" x2="10.239375" y2="13.621875" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="13.621875" x2="10.23625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="5.446875" x2="7.83625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="10.23625" y1="14.843125" x2="6.746875" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="8.969375" x2="18.003125" y2="11.524375" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.101875" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.101875" x2="7.858125" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="5.08" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.746875" y1="14.843125" x2="6.429375" y2="14.525625" width="0.2032" layer="1"/>
+<wire x1="6.429375" y1="14.525625" x2="6.429375" y2="13.6375" width="0.2032" layer="1"/>
+<wire x1="6.429375" y1="13.6375" x2="6.365" y2="13.573125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="11.475" x2="3.37875" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="3.37875" y1="11.475" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="3.33375" y1="10.00125" x2="3.4925" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="3.4925" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="12.85875" x2="14.843125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="14.843125" y1="12.85875" x2="14.049375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="13.6525" x2="13.46375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="13.46375" y1="13.6525" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="12.22375" x2="17.383125" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="11.524375" x2="18.003125" y2="12.22375" width="0.2032" layer="1"/>
+<contactref element="J1" pad="1"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="11.43" x2="10.795" y2="11.90625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="11.475" x2="10.75" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="10.75" y1="11.475" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="4.524375" x2="9.68375" y2="4.206875" width="0.2032" layer="16"/>
+<via x="6.6675" y="4.445" extent="1-16" drill="0.3048"/>
+<wire x1="10.00125" y1="4.524375" x2="10.00125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="6.985" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="9.68375" y1="4.206875" x2="6.905625" y2="4.206875" width="0.2032" layer="16"/>
+<wire x1="6.905625" y1="4.206875" x2="6.6675" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.1375" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.1375" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="7.77875" y1="5.08" x2="6.6675" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="6.6675" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.35" x2="20.94" y2="6.414375" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.414375" x2="22.148125" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="4.7625" x2="24.4475" y2="5.635625" width="0.2032" layer="16"/>
+<via x="24.4475" y="5.635625" extent="1-16" drill="0.3048"/>
+<wire x1="22.54" y1="7.9074" x2="22.54" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="23.175" y1="7.6225" x2="23.65375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="7.14375" x2="23.65375" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="6.429375" x2="24.4475" y2="5.635625" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="7.6225" x2="23.175" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="7.6225" x2="22.148125" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="11.90625" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2836,156 +2889,157 @@ design rules under a new name.</descript
 <wire x1="20.79625" y1="9.525" x2="20.6375" y2="9.68375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="9.68375" x2="20.6375" y2="10.5101" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="10.5101" x2="20.64" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="12.3825" x2="20.78125" y2="13.47875" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="13.47875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
-<via x="23.65375" y="12.54125" extent="1-16" drill="0.3048"/>
-<wire x1="23.65375" y1="12.54125" x2="23.65375" y2="11.16018125" width="0.2032" layer="1"/>
-<wire x1="23.65375" y1="11.16018125" x2="23.00116875" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="23.00116875" y1="10.5076" x2="22.54" y2="10.5076" width="0.2032" layer="1"/>
+<via x="25.479375" y="12.779375" extent="1-16" drill="0.3048"/>
 <wire x1="32.42" y1="14.605" x2="31.115" y2="14.605" width="0.2032" layer="1"/>
 <via x="31.115" y="14.605" extent="1-16" drill="0.3048"/>
-<wire x1="20.64" y1="10.5076" x2="20.64" y2="12.24125" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="12.24125" x2="20.78125" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="23.65375" y1="12.54125" x2="30.216975" y2="12.54125" width="0.2032" layer="16"/>
-<wire x1="30.216975" y1="12.54125" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
+<wire x1="30.4551" y1="12.779375" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="13.439275" x2="31.115" y2="14.605" width="0.2032" layer="16"/>
+<wire x1="30.4551" y1="12.779375" x2="25.479375" y2="12.779375" width="0.2032" layer="16"/>
+<wire x1="20.64" y1="10.5076" x2="20.64" y2="11.965" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="11.965" x2="20.819375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="12.144375" x2="20.819375" y2="13.516875" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="13.516875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="12.779375" x2="24.13" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="11.43" x2="23.8125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="23.8125" y1="11.43" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.5076" x2="22.54" y2="10.7925" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.7925" x2="22.5425" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="10.795" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
 <via x="32.54375" y="9.128125" extent="1-16" drill="0.3048"/>
-<wire x1="20.16125" y1="10.080625" x2="31.59125" y2="10.080625" width="0.2032" layer="16"/>
-<wire x1="20.16125" y1="10.080625" x2="19.84375" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="9.763125" x2="18.335625" y2="9.763125" width="0.2032" layer="16"/>
-<via x="18.335625" y="9.763125" extent="1-16" drill="0.3048"/>
-<contactref element="U1" pad="28"/>
-<wire x1="16.875625" y1="9.43375" x2="18.00625" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="18.00625" y1="9.43375" x2="18.335625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.398125" x2="31.27375" y2="10.398125" width="0.2032" layer="16"/>
+<via x="18.018125" y="10.239375" extent="1-16" drill="0.3048"/>
 <wire x1="31.58391875" y1="8.16381875" x2="32.54375" y2="9.12365" width="0.2032" layer="1"/>
 <wire x1="32.54375" y1="9.12365" x2="32.54375" y2="9.128125" width="0.2032" layer="1"/>
-<wire x1="31.59125" y1="10.080625" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
+<wire x1="31.27375" y1="10.398125" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
+<contactref element="U1" pad="28"/>
+<wire x1="14.73625" y1="9.125" x2="15.63375" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="16.748125" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.398125" x2="19.20875" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="15.63375" y1="9.125" x2="16.748125" y2="10.239375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.48891875" y2="6.18391875" width="0.2032" layer="1"/>
 <via x="34.6075" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="19.605625" y1="8.41375" x2="20.47875" y2="9.286875" width="0.2032" layer="16"/>
-<wire x1="20.47875" y1="9.286875" x2="30.63875" y2="9.286875" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="8.41375" x2="18.89125" y2="8.41375" width="0.2032" layer="16"/>
-<via x="18.89125" y="8.41375" extent="1-16" drill="0.3048"/>
-<wire x1="18.768125" y1="8.536875" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
-<contactref element="U1" pad="26"/>
-<wire x1="16.875625" y1="8.43375" x2="17.4825" y2="8.43375" width="0.2032" layer="1"/>
-<wire x1="17.4825" y1="8.43375" x2="17.541875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="17.541875" y1="8.493125" x2="18.811875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="8.493125" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="19.288125" y1="8.969375" x2="19.923125" y2="9.604375" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="9.604375" x2="30.32125" y2="9.604375" width="0.2032" layer="16"/>
+<via x="19.288125" y="8.969375" extent="1-16" drill="0.3048"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.64766875" y2="6.18391875" width="0.2032" layer="1"/>
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="30.63875" y1="9.286875" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="30.32125" y1="9.604375" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="32.781875" y1="7.14375" x2="34.6075" y2="7.14375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="26"/>
+<wire x1="14.73625" y1="7.525" x2="15.541875" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="16.98625" y1="8.969375" x2="19.288125" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="15.541875" y1="7.525" x2="16.98625" y2="8.969375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW1" pad="4"/>
 <via x="35.2425" y="11.826875" extent="1-16" drill="0.3048"/>
-<via x="18.0975" y="11.033125" extent="1-16" drill="0.3048"/>
-<contactref element="U1" pad="30"/>
-<wire x1="16.875625" y1="10.43375" x2="17.498125" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="10.874375" x2="20.0025" y2="10.874375" width="0.2032" layer="16"/>
+<via x="16.906875" y="11.58875" extent="1-16" drill="0.3048"/>
+<wire x1="32.54375" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="12.866078125" x2="36.281703125" y2="12.866078125" width="0.2032" layer="1"/>
 <wire x1="36.281703125" y1="12.866078125" x2="35.2425" y2="11.826875" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="10.874375" x2="33.49625" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="33.49625" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="20.0025" y1="10.874375" x2="19.84375" y2="11.033125" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="11.033125" x2="18.0975" y2="11.033125" width="0.2032" layer="16"/>
-<wire x1="17.498125" y1="10.43375" x2="18.0975" y2="11.033125" width="0.2032" layer="1"/>
+<wire x1="33.17875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="11.191875" x2="19.129375" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="19.129375" y1="11.58875" x2="16.906875" y2="11.58875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="30"/>
+<wire x1="16.906875" y1="11.58875" x2="16.51" y2="11.58875" width="0.2032" layer="1"/>
+<wire x1="16.51" y1="11.58875" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="14.73625" y1="10.725" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="11.191875" x2="33.17875" y2="11.826875" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
 <via x="37.30625" y="9.921875" extent="1-16" drill="0.3048"/>
-<wire x1="20.0025" y1="10.4775" x2="32.623125" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="10.239375" x2="20.0025" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="10.239375" x2="18.970625" y2="10.239375" width="0.2032" layer="16"/>
-<wire x1="18.970625" y1="10.239375" x2="18.811875" y2="10.398125" width="0.2032" layer="16"/>
-<via x="18.811875" y="10.398125" extent="1-16" drill="0.3048"/>
-<wire x1="18.811875" y1="10.398125" x2="18.176875" y2="10.398125" width="0.2032" layer="1"/>
-<wire x1="18.176875" y1="10.398125" x2="17.7125" y2="9.93375" width="0.2032" layer="1"/>
-<contactref element="U1" pad="29"/>
-<wire x1="16.875625" y1="9.93375" x2="17.7125" y2="9.93375" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.795" x2="31.4325" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="10.795" x2="19.20875" y2="10.95375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="10.95375" x2="17.4625" y2="10.95375" width="0.2032" layer="16"/>
+<via x="17.4625" y="10.95375" extent="1-16" drill="0.3048"/>
 <wire x1="38.266078125" y1="10.886178125" x2="38.266078125" y2="10.881703125" width="0.2032" layer="1"/>
 <wire x1="38.266078125" y1="10.881703125" x2="37.30625" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="32.623125" y1="10.4775" x2="33.17875" y2="9.921875" width="0.2032" layer="16"/>
-<wire x1="33.17875" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="31.4325" y1="10.795" x2="32.305625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="32.305625" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="29"/>
+<wire x1="14.73625" y1="9.925" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="10.95375" x2="16.66875" y2="10.95375" width="0.2032" layer="1"/>
+<wire x1="16.66875" y1="10.95375" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
-<contactref element="J2" pad="D+"/>
+<contactref element="JP1" pad="D+"/>
+<via x="38.4175" y="8.55574375" extent="1-16" drill="0.3048"/>
+<wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="36.67125" y1="6.429375" x2="38.4175" y2="8.175625" width="0.2032" layer="16"/>
+<wire x1="38.4175" y1="8.175625" x2="38.4175" y2="8.55574375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="22"/>
-<wire x1="24.13" y1="6.429375" x2="24.13" y2="5.731878125" width="0.2032" layer="1"/>
-<wire x1="24.13" y1="5.731878125" x2="23.319371875" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="23.319371875" y1="4.92125" x2="18.418125" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="15.275625" y1="7.33375" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
-<contactref element="J1" pad="5"/>
-<wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.63875" width="0.2032" layer="16"/>
-<via x="17.700625" y="5.63875" extent="1-16" drill="0.3048"/>
-<wire x1="18.418125" y1="4.92125" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
-<wire x1="17.700625" y1="5.63875" x2="17.38625" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="17.38625" y1="5.953125" x2="15.636875" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="15.636875" y1="5.953125" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
-<via x="39.0525" y="9.50824375" extent="1-16" drill="0.3048"/>
-<via x="24.13" y="6.429375" extent="1-16" drill="0.3048"/>
-<wire x1="39.0525" y1="9.50824375" x2="41.14824375" y2="9.50824375" width="0.2032" layer="1"/>
-<wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="36.67125" y1="6.429375" x2="24.13" y2="6.429375" width="0.2032" layer="16"/>
-<wire x1="36.67125" y1="6.429375" x2="39.0525" y2="8.810625" width="0.2032" layer="16"/>
-<wire x1="39.0525" y1="8.810625" x2="39.0525" y2="9.50824375" width="0.2032" layer="16"/>
+<via x="12.303125" y="8.89" extent="1-16" drill="0.3048"/>
+<wire x1="41.14824375" y1="9.50824375" x2="39.37" y2="9.50824375" width="0.2032" layer="1"/>
+<wire x1="39.37" y1="9.50824375" x2="38.4175" y2="8.55574375" width="0.2032" layer="1"/>
+<wire x1="36.67125" y1="6.429375" x2="32.623125" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="32.623125" y1="6.429375" x2="31.511875" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="12.303125" y1="8.89" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="22.06625" y1="8.016875" x2="20.973" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="20.973" y1="6.923625" x2="19.270125" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="19.270125" y1="6.923625" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="31.511875" y1="7.540625" x2="25.24125" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="7.540625" x2="24.765" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="8.016875" x2="22.06625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="11.826875" y1="7.508628125" x2="12.303125" y2="7.984878125" width="0.2032" layer="1"/>
+<wire x1="12.303125" y1="7.984878125" x2="12.303125" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.826875" y2="7.508628125" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
-<contactref element="J2" pad="D-"/>
+<contactref element="JP1" pad="D-"/>
+<via x="39.0525" y="7.9375" extent="1-16" drill="0.3048"/>
+<wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
+<wire x1="36.83" y1="6.0325" x2="38.735" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="38.735" y1="7.9375" x2="39.0525" y2="7.9375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="21"/>
-<wire x1="14.775625" y1="7.33375" x2="14.775625" y2="6.179375" width="0.2032" layer="1"/>
-<contactref element="J1" pad="6"/>
-<via x="15.39875" y="4.683125" extent="1-16" drill="0.3048"/>
-<wire x1="14.775625" y1="6.179375" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="4.683125" x2="15.39875" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="17.93875" y1="4.524375" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.906875" y1="5.55625" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="15.39875" y1="5.55625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
-<via x="39.6875" y="8.89" extent="1-16" drill="0.3048"/>
-<wire x1="36.83" y1="6.0325" x2="25.0825" y2="6.0325" width="0.2032" layer="16"/>
-<wire x1="25.0825" y1="6.0325" x2="24.765" y2="5.715" width="0.2032" layer="16"/>
-<via x="24.765" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="17.93875" y1="4.524375" x2="23.574375" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="23.574375" y1="4.524375" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="8.89" x2="41.15" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
-<wire x1="36.83" y1="6.0325" x2="39.6875" y2="8.89" width="0.2032" layer="16"/>
+<via x="11.43" y="8.09625" extent="1-16" drill="0.3048"/>
+<wire x1="41.15" y1="8.89" x2="40.005" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="40.005" y1="8.89" x2="39.0525" y2="7.9375" width="0.2032" layer="1"/>
+<wire x1="36.83" y1="6.0325" x2="32.385" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="32.385" y1="6.0325" x2="31.4325" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="8.09625" x2="12.85875" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="8.09625" x2="13.255625" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="13.255625" y1="8.493125" x2="17.145" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="17.145" y1="8.493125" x2="19.0885875" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="19.0885875" y1="6.5495375" x2="21.2339125" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="21.2339125" y1="6.5495375" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="31.4325" y1="6.985" x2="25.24125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="6.985" x2="24.60625" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="24.60625" y1="7.62" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="11.03625" y1="5.425" x2="11.03625" y2="6.035625" width="0.2032" layer="1"/>
+<wire x1="11.03625" y1="6.035625" x2="11.43" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="6.429375" x2="11.43" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
-<contactref element="J2" pad="VBUS"/>
+<contactref element="JP1" pad="VBUS"/>
 <contactref element="D1" pad="A"/>
-<wire x1="41.165" y1="8.225" x2="42.35625" y2="8.225" width="0.2032" layer="1"/>
 <via x="42.38625" y="14.035" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="14.035" x2="41.81625" y2="14.605" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="14.605" x2="34.925" y2="14.605" width="0.2032" layer="16"/>
 <via x="34.925" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="14.605" x2="33.72" y2="14.605" width="0.2032" layer="1"/>
-<contactref element="J1" pad="1"/>
-<via x="41.11625" y="5.55625" extent="1-16" drill="0.3048"/>
-<wire x1="39.84625" y1="4.28625" x2="41.11625" y2="5.55625" width="0.2032" layer="16"/>
-<wire x1="42.38625" y1="14.035" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="39.84625" y1="4.28625" x2="23.97125" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="23.574375" y1="4.683125" x2="22.780625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="42.38625" y1="8.255" x2="42.38625" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="42.38625" y1="6.82625" x2="41.11625" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="23.97125" y1="4.28625" x2="23.574375" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="41.165" y1="8.225" x2="42.00420625" y2="8.225" width="0.2032" layer="1"/>
+<wire x1="42.00420625" y1="8.225" x2="42.38625" y2="8.60704375" width="0.2032" layer="1"/>
+<wire x1="42.38625" y1="8.60704375" x2="42.38625" y2="14.035" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
 <contactref element="U1" pad="7"/>
-<via x="13.335" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="15.875" y1="13.97" x2="14.44625" y2="13.97" width="0.2032" layer="16"/>
-<wire x1="14.44625" y1="13.97" x2="13.335" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="13.275625" y1="12.03375" x2="13.275625" y2="12.799375" width="0.2032" layer="1"/>
-<wire x1="13.275625" y1="12.799375" x2="13.335" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="8.63625" y1="13.625" x2="8.63625" y2="12.41231875" width="0.2032" layer="1"/>
+<wire x1="8.63625" y1="12.41231875" x2="9.22169375" y2="11.826875" width="0.2032" layer="1"/>
+<wire x1="9.22169375" y1="11.826875" x2="11.668125" y2="11.826875" width="0.2032" layer="1"/>
+<via x="11.985625" y="12.144375" extent="1-16" drill="0.3048"/>
+<wire x1="11.668125" y1="11.826875" x2="11.985625" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="11.985625" y1="12.144375" x2="13.81125" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="13.97" x2="15.875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
@@ -2995,50 +3049,47 @@ design rules under a new name.</descript
 </signal>
 <signal name="LED_PWR">
 <contactref element="R1" pad="1"/>
-<contactref element="U1" pad="32"/>
-<wire x1="19.764375" y1="11.668125" x2="20.16125" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="20.16125" y1="11.27125" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="19.05" y1="12.22375" x2="19.685" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="11.58875" x2="32.385" y2="11.58875" width="0.2032" layer="16"/>
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="19.764375" y1="11.668125" x2="17.62125" y2="11.668125" width="0.2032" layer="16"/>
-<via x="17.62125" y="11.668125" extent="1-16" drill="0.3048"/>
-<wire x1="17.62125" y1="11.668125" x2="17.145" y2="11.668125" width="0.2032" layer="1"/>
-<wire x1="17.145" y1="11.668125" x2="16.875625" y2="11.39875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="11.39875" x2="16.875625" y2="11.43375" width="0.2032" layer="1"/>
+<wire x1="19.05" y1="12.22375" x2="14.76375" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="40.005" y1="13.0025" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="41.195625" y1="12.85875" x2="33.9725" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="33.9725" y1="12.85875" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="12.85875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
 <wire x1="41.195625" y1="12.85875" x2="40.17875" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="40.17875" y1="12.85875" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
+<wire x1="32.385" y1="11.58875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="2"/>
+<wire x1="14.76375" y1="12.22375" x2="13.97" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.97" y1="11.43" x2="13.335" y2="11.43" width="0.2032" layer="16"/>
+<via x="13.335" y="11.43" extent="1-16" drill="0.3048"/>
+<wire x1="12.63625" y1="13.625" x2="12.63625" y2="12.12875" width="0.2032" layer="1"/>
+<wire x1="12.63625" y1="12.12875" x2="13.335" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
-<via x="5.715" y="8.41375" extent="1-16" drill="0.3048"/>
-<wire x1="8.32" y1="8.73125" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="8.255" y1="8.73125" x2="5.87375" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="5.87375" y1="8.73125" x2="5.715" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="8.5725" x2="5.715" y2="8.41375" width="0.2032" layer="16"/>
+<via x="4.206875" y="9.445625" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="9"/>
-<wire x1="8.335" y1="8.71625" x2="8.27" y2="8.71625" width="0.2032" layer="16"/>
-<wire x1="8.27" y1="8.71625" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
 <contactref element="U1" pad="9"/>
-<wire x1="12.175625" y1="11.43375" x2="7.30625" y2="11.43375" width="0.2032" layer="1"/>
-<wire x1="7.30625" y1="11.43375" x2="5.794375" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="5.794375" y1="9.921875" x2="5.794375" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="5.794375" y1="8.493125" x2="5.715" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="12.325" x2="5.457221875" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="5.457221875" y1="12.325" x2="4.206875" y2="11.074653125" width="0.2032" layer="1"/>
+<wire x1="4.206875" y1="11.074653125" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="8.875" x2="4.7775" y2="8.875" width="0.2032" layer="16"/>
+<wire x1="4.7775" y1="8.875" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
 </signal>
 <signal name="D/!C">
-<via x="6.50875" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="6.53875" y1="8.06625" x2="6.50875" y2="8.09625" width="0.2032" layer="16"/>
+<via x="4.445" y="8.255" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="10"/>
-<wire x1="8.335" y1="8.06625" x2="6.53875" y2="8.06625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="10"/>
-<wire x1="12.175625" y1="10.93375" x2="7.485803125" y2="10.93375" width="0.2032" layer="1"/>
-<wire x1="7.485803125" y1="10.93375" x2="6.50875" y2="9.956696875" width="0.2032" layer="1"/>
-<wire x1="6.50875" y1="9.956696875" x2="6.50875" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="8.73125" x2="4.92125" y2="10.894946875" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="10.894946875" x2="5.551303125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="5.551303125" y1="11.525" x2="6.53625" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.92125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.475" y2="8.225" width="0.2032" layer="16"/>
+<wire x1="4.475" y1="8.225" x2="8.335" y2="8.225" width="0.2032" layer="16"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
-<contactref element="C4" pad="1"/>
-<contactref element="U3" pad="2"/>
+<contactref element="C9" pad="1"/>
+<contactref element="IC1" pad="2"/>
 <wire x1="28.09875" y1="10.706875" x2="28.09875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="28.09875" y1="12.288125" x2="28.11375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="28.11375" y1="12.303125" x2="28.11375" y2="12.87375" width="0.2032" layer="1"/>
@@ -3046,8 +3097,8 @@ design rules under a new name.</descript
 </signal>
 <signal name="T+">
 <contactref element="JP4" pad="P1"/>
-<contactref element="C4" pad="2"/>
-<contactref element="U3" pad="3"/>
+<contactref element="C9" pad="2"/>
+<contactref element="IC1" pad="3"/>
 <wire x1="26.82875" y1="10.706875" x2="26.82875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="26.82875" y1="12.288125" x2="26.81375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="26.81375" y1="12.303125" x2="26.81375" y2="13.82625" width="0.2032" layer="1"/>
@@ -3057,132 +3108,158 @@ design rules under a new name.</descript
 <contactref element="SW1" pad="2"/>
 <wire x1="32.305625" y1="8.175625" x2="33.575625" y2="8.175625" width="0.2032" layer="16"/>
 <via x="33.575625" y="8.175625" extent="1-16" drill="0.3048"/>
-<wire x1="20.32" y1="9.68375" x2="30.7975" y2="9.68375" width="0.2032" layer="16"/>
-<wire x1="30.7975" y1="9.68375" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="10.00125" x2="30.48" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="30.48" y1="10.00125" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="33.575625" y1="8.175625" x2="32.57386875" y2="7.17386875" width="0.2032" layer="1"/>
-<wire x1="20.32" y1="9.68375" x2="19.764375" y2="9.128125" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="16"/>
-<via x="19.288125" y="9.128125" extent="1-16" drill="0.3048"/>
+<wire x1="19.605625" y1="10.00125" x2="19.20875" y2="9.604375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="16"/>
+<via x="18.7325" y="9.604375" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="27"/>
-<wire x1="16.875625" y1="8.93375" x2="18.3" y2="8.93375" width="0.2032" layer="1"/>
-<wire x1="18.3" y1="8.93375" x2="18.494375" y2="9.128125" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="14.73625" y1="8.325" x2="15.6275" y2="8.325" width="0.2032" layer="1"/>
+<wire x1="16.906875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="15.6275" y1="8.325" x2="16.906875" y2="9.604375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
-<via x="6.50875" y="6.746875" extent="1-16" drill="0.3048"/>
+<via x="4.365625" y="7.223125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U1" pad="13"/>
-<wire x1="11.43" y1="8.969375" x2="9.2675" y2="8.969375" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="6.76625" x2="6.528125" y2="6.76625" width="0.2032" layer="16"/>
-<wire x1="6.528125" y1="6.76625" x2="6.50875" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="9.2675" y1="8.969375" x2="7.045" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="7.045" y1="6.746875" x2="6.50875" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="9.43375" x2="11.894375" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="11.894375" y1="9.43375" x2="11.43" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="9.125" x2="5.556278125" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="5.556278125" y1="9.125" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="8.255" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.925" x2="4.66375" y2="6.925" width="0.2032" layer="16"/>
+<wire x1="4.66375" y1="6.925" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="8.255" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U3" pad="7"/>
+<contactref element="IC1" pad="7"/>
 <wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
-<contactref element="U1" pad="12"/>
 <via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
-<wire x1="26.114375" y1="8.493125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
-<wire x1="20.79625" y1="8.493125" x2="19.52625" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="19.52625" y1="7.223125" x2="13.05498125" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="13.05498125" y1="7.223125" x2="11.191875" y2="9.08623125" width="0.2032" layer="16"/>
-<via x="11.191875" y="9.604375" extent="1-16" drill="0.3048"/>
-<wire x1="26.114375" y1="8.493125" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="25.796875" y1="8.810625" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="25.796875" y1="8.810625" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.016875" x2="27.46375" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="27.46375" y1="8.016875" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
-<wire x1="12.175625" y1="9.93375" x2="11.52125" y2="9.93375" width="0.2032" layer="1"/>
-<wire x1="11.52125" y1="9.93375" x2="11.191875" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="9.08623125" x2="11.191875" y2="9.604375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="12"/>
+<via x="12.144375" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="19.685" y1="7.699375" x2="17.224375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="17.224375" y1="10.16" x2="12.144375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="7.699375" x2="20.558125" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="20.558125" y1="7.699375" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="9.925" x2="9.29" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="9.29" y1="9.925" x2="9.525" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="10.16" x2="12.144375" y2="10.16" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
-<via x="6.0325" y="7.46125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
-<contactref element="U3" pad="5"/>
-<via x="25.55875" y="7.77875" extent="1-16" drill="0.3048"/>
+<contactref element="IC1" pad="5"/>
+<via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
+<wire x1="21.828125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="8.41375" x2="25.479375" y2="8.175625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="11"/>
-<via x="10.795" y="10.31875" extent="1-16" drill="0.3048"/>
-<wire x1="12.852859375" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
-<wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="20.955" y1="8.09625" x2="25.24125" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="25.24125" y1="8.09625" x2="25.55875" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="25.55875" y1="5.306875" x2="25.55875" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="16"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="7.064375" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="1"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="7.064375" y1="7.41625" x2="9.966875" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="9.966875" y1="10.31875" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="10.43375" x2="10.91" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="10.91" y1="10.43375" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="10.556875" y1="10.080625" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="12.852859375" y1="6.82625" x2="10.556875" y2="9.122234375" width="0.2032" layer="16"/>
-<wire x1="10.556875" y1="9.122234375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
+<via x="11.43" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="19.52625" y1="7.3025" x2="17.30375" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="9.525" x2="11.43" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="7.3025" x2="20.716875" y2="7.3025" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="7.3025" x2="21.828125" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="25.479375" y1="8.175625" x2="25.479375" y2="5.38625" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="5.38625" x2="25.55875" y2="5.306875" width="0.2032" layer="1"/>
+<via x="11.43" y="8.89" extent="1-16" drill="0.3048"/>
+<via x="10.16" y="8.73125" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="8.73125" x2="11.27125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="11.27125" y1="8.73125" x2="11.43" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="10.725" x2="11.36" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="7.575" x2="9.7975" y2="7.575" width="0.2032" layer="16"/>
+<wire x1="9.7975" y1="7.575" x2="10.16" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="7.9375" x2="10.16" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="8.89" x2="11.43" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="9.525" x2="11.43" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="11.36" y1="10.725" x2="11.43" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<via x="5.159375" y="9.36625" extent="1-16" drill="0.3048"/>
-<wire x1="8.335" y1="9.36625" x2="5.159375" y2="9.36625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="8"/>
-<wire x1="12.775625" y1="12.03375" x2="7.27125" y2="12.03375" width="0.2032" layer="1"/>
-<wire x1="7.27125" y1="12.03375" x2="5.159375" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="9.921875" x2="5.159375" y2="9.36625" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="13.625" x2="7.83625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="12.325" x2="8.73125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="8.73125" y1="11.43" x2="11.784809375" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="11.784809375" y1="11.43" x2="12.779375" y2="10.435434375" width="0.2032" layer="1"/>
+<wire x1="12.779375" y1="10.435434375" x2="12.779375" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.525" x2="10.16" y2="9.525" width="0.2032" layer="16"/>
+<via x="10.16" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="9.525" x2="12.54125" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="12.54125" y1="9.525" x2="12.779375" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
-<contactref element="U3" pad="6"/>
-<contactref element="U1" pad="25"/>
-<wire x1="19.52625" y1="7.77875" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
+<contactref element="IC1" pad="6"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
-<wire x1="19.52625" y1="7.77875" x2="18.0975" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="18.0975" y1="7.77875" x2="18.018125" y2="7.858125" width="0.2032" layer="16"/>
-<via x="18.018125" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="7.93375" x2="17.9425" y2="7.93375" width="0.2032" layer="1"/>
-<wire x1="17.9425" y1="7.93375" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="8.89" x2="26.590625" y2="8.89" width="0.2032" layer="16"/>
-<wire x1="26.590625" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
+<via x="19.84375" y="8.334375" extent="1-16" drill="0.3048"/>
+<wire x1="26.273125" y1="9.2075" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="25"/>
+<wire x1="14.73625" y1="6.725" x2="15.615" y2="6.725" width="0.2032" layer="1"/>
+<wire x1="15.615" y1="6.725" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="26.273125" y1="9.2075" x2="20.716875" y2="9.2075" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="9.2075" x2="19.84375" y2="8.334375" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="U1" pad="19"/>
-<wire x1="13.775625" y1="7.33375" x2="13.775625" y2="6.473125" width="0.2032" layer="1"/>
-<wire x1="13.775625" y1="6.473125" x2="13.49375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="13.49375" y1="6.19125" x2="11.58875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="11.58875" y1="6.19125" x2="11.43" y2="6.0325" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P2"/>
-<wire x1="11.43" y1="4.92125" x2="11.43" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
+<wire x1="9.445625" y1="4.365625" x2="9.445625" y2="5.415625" width="0.2032" layer="1"/>
+<wire x1="9.445625" y1="5.415625" x2="9.43625" y2="5.425" width="0.2032" layer="1"/>
+<contactref element="R3" pad="1"/>
+<contactref element="U1" pad="15"/>
+<wire x1="6.53625" y1="7.525" x2="8.588125" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="8.588125" y1="7.525" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<wire x1="9.43625" y1="5.425" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<contactref element="JP5" pad="P2"/>
+<contactref element="C8" pad="1"/>
+<wire x1="14.049375" y1="4.206875" x2="14.9225" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="4.43" x2="12.7" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="12.7" y1="4.43" x2="14.2725" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="14.2725" y1="4.43" x2="14.9225" y2="5.08" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-RX">
 <contactref element="U1" pad="20"/>
-<wire x1="14.275625" y1="7.33375" x2="14.275625" y2="6.338125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="6.338125" x2="13.97" y2="6.0325" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P1"/>
-<wire x1="13.97" y1="6.0325" x2="13.97" y2="4.92125" width="0.2032" layer="1"/>
+<via x="10.795" y="6.6675" extent="1-16" drill="0.3048"/>
+<contactref element="U1" pad="14"/>
+<wire x1="6.53625" y1="8.325" x2="9.7725" y2="8.325" width="0.2032" layer="1"/>
+<contactref element="JP5" pad="P1"/>
+<wire x1="9.7725" y1="8.325" x2="10.239375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="7.858125" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="6.6675" x2="10.239375" y2="5.428125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="5.428125" x2="10.23625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="6.6675" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="6.50875" x2="17.4625" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="17.4625" y1="6.50875" x2="16.748125" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="7.223125" x2="14.366875" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="14.366875" y1="7.223125" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="6.6675" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWCLK">
+<contactref element="U1" pad="24"/>
+<via x="13.414375" y="7.858125" extent="1-16" drill="0.3048"/>
+<wire x1="13.414375" y1="5.446875" x2="13.43625" y2="5.425" width="0.2032" layer="1"/>
 <contactref element="J1" pad="3"/>
-<contactref element="U1" pad="24"/>
-<via x="20.240625" y="5.635625" extent="1-16" drill="0.3048"/>
-<wire x1="20.32" y1="4.7625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="6.111875" width="0.2032" layer="1"/>
-<wire x1="20.240625" y1="6.111875" x2="19.605625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="19.605625" y1="6.746875" x2="16.430625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="6.746875" x2="16.275625" y2="6.901875" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="7.33375" x2="16.275625" y2="6.901875" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="7.858125" x2="13.573125" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="13.573125" y1="8.016875" x2="17.065625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="8.016875" x2="18.89125" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="6.19125" x2="21.11375" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="13.414375" y1="5.446875" x2="13.414375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="21.11375" y1="6.19125" x2="21.9075" y2="5.3975" width="0.2032" layer="16"/>
+<wire x1="21.9075" y1="5.3975" x2="21.9075" y2="4.7625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
+<contactref element="U1" pad="23"/>
 <contactref element="J1" pad="4"/>
-<contactref element="U1" pad="23"/>
-<wire x1="15.775625" y1="7.33375" x2="15.775625" y2="6.449375" width="0.2032" layer="1"/>
-<via x="18.970625" y="5.635625" extent="1-16" drill="0.3048"/>
-<wire x1="19.05" y1="4.7625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="15.775625" y1="6.449375" x2="15.875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="6.35" x2="18.811875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="6.35" x2="18.970625" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="6.19125" x2="18.970625" y2="5.635625" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="5.635625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="4.7625" x2="19.764375" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="4.7625" x2="16.906875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="16.906875" y1="7.62" x2="14.12875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="14.12875" y1="7.62" x2="13.6525" y2="7.14375" width="0.2032" layer="16"/>
+<via x="12.620625" y="7.3025" extent="1-16" drill="0.3048"/>
+<wire x1="12.620625" y1="7.3025" x2="12.620625" y2="5.440625" width="0.2032" layer="1"/>
+<wire x1="12.620625" y1="5.440625" x2="12.63625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="13.6525" y1="7.14375" x2="12.779375" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="12.779375" y1="7.14375" x2="12.620625" y2="7.3025" width="0.2032" layer="16"/>
 </signal>
 </signals>
 </board>