diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -1,6 +1,6 @@
 <?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"/>
@@ -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="yes" active="yes"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
@@ -229,10 +231,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"/>
@@ -248,8 +250,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>
 <symbols>
@@ -290,7 +309,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="GND">
+<deviceset name="GND" prefix="SUP">
 <description>&lt;b&gt;GND&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="GND" x="0" y="0"/>
@@ -303,7 +322,7 @@
 </device>
 </devices>
 </deviceset>
-<deviceset name="3.3V">
+<deviceset name="3.3V" prefix="SUP">
 <description>&lt;b&gt;3.3V Supply&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="3.3V" x="0" y="0"/>
@@ -2284,125 +2303,6 @@ 5V - VREG-00823</description>
 </library>
 <library name="Protofusion">
 <packages>
-<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"/>
@@ -2443,204 +2343,121 @@ 5V - VREG-00823</description>
 <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">
-<description>Standard pogo pin programming header with two alignment holes. Small SMD pads.</description>
-<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="3.81" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<hole x="0" y="5.08" drill="0.508"/>
-<hole x="0" y="-3.81" drill="0.508"/>
-<wire x1="-0.635" y1="5.715" x2="0.635" y2="5.715" width="0.127" layer="21"/>
-<wire x1="0.635" y1="5.715" 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="5.715" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="3.175"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="0.635" y="5.715"/>
-<vertex x="-0.635" y="5.715"/>
-</polygon>
-<text x="-1.27" y="6.35" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-<circle x="0" y="5.08" radius="0.635" width="0" layer="29"/>
-<circle x="0" y="-3.81" radius="0.635" width="0" layer="29"/>
-<circle x="0" y="-3.81" radius="0.635" width="0" layer="30"/>
-<circle x="0" y="5.08" radius="0.635" width="0" layer="30"/>
+<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-0H">
-<description>No holes, 2 vias, pogo pin programming header.</description>
-<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<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"/>
+<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="4.445" width="0.127" layer="21"/>
-<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="4.445"/>
-<vertex x="-0.635" y="4.445"/>
-</polygon>
-<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
-<pad name="1" x="0" y="3.81" drill="0.4572"/>
-<pad name="6" x="0" y="-2.54" drill="0.4572"/>
-</package>
-<package name="POGOPROG-CONN-1H">
-<description>Standard pogo pin programming header with ONE alignment hole. Small SMD pads.</description>
-<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"/>
-<hole x="0" y="3.81" drill="0.5"/>
-<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="-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="4.445" 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="4.445"/>
-<vertex x="-0.635" y="4.445"/>
-</polygon>
-<text x="-1.27" y="5.08" 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="POGOPROG-CONN-OH-SMALLERVIAS">
-<description>No holes, 2 vias, pogo pin programming header. With smaller vias.</description>
-<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="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"/>
+<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="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>
-<pad name="1" x="0" y="2.54" drill="0.381"/>
-<pad name="6" x="0" y="-3.81" drill="0.381"/>
-</package>
-<package name="POGOPROG-CONN-W">
-<description>Standard pogo pin programming header with two alignment holes. WIDE smd pads.</description>
-<smd name="3" x="0" y="0" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="1.143" dy="0.8128" layer="1"/>
-<hole x="0" y="3.81" drill="0.5"/>
-<hole x="0" y="-5.08" drill="0.5"/>
-<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="-5.715" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-5.715" x2="-0.635" y2="-5.715" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-5.715" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="1.143" 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="1.905"/>
-<vertex x="0.635" y="4.445"/>
-<vertex x="-0.635" y="4.445"/>
 </polygon>
-<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-7.62" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="POGOPROG-CONN-OH-1V">
-<description>No holes, 1 via, pogo pin programming header.</description>
-<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="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"/>
-<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="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>
-<pad name="1" x="0" y="2.54" drill="0.4572"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-</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>
+<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>
 <symbols>
-<symbol name="STM32F042K">
-<wire x1="-35.56" y1="43.18" x2="40.64" y2="43.18" width="0.254" layer="94"/>
-<wire x1="40.64" y1="43.18" x2="40.64" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="40.64" y1="-5.08" x2="-35.56" y2="-5.08" width="0.254" layer="94"/>
-<text x="-35.56" y="45.72" size="2.54" layer="95">&gt;NAME</text>
-<text x="-35.56" y="-10.16" size="2.54" layer="96">&gt;VALUE</text>
-<pin name="VDD" x="-40.64" y="38.1" length="middle"/>
-<pin name="PF0/I2C1_SDA" x="-40.64" y="35.56" length="middle"/>
-<pin name="PF1/I2C1_SCL" x="-40.64" y="33.02" length="middle"/>
-<pin name="NRST" x="-40.64" y="30.48" length="middle"/>
-<pin name="VDDA" x="-40.64" y="27.94" length="middle"/>
-<pin name="PA0/ADC0" x="-40.64" y="25.4" length="middle"/>
-<pin name="PA1/ADC1" x="-40.64" y="22.86" length="middle"/>
-<pin name="PA2/ADC2/USART2_TX" x="-40.64" y="20.32" length="middle"/>
-<pin name="PA3/ADC3/USART2_RX" x="-40.64" y="17.78" length="middle"/>
-<pin name="PA4/ADC4" x="-40.64" y="15.24" length="middle"/>
-<pin name="PA5/ADC5/SPI1_SCK" x="-40.64" y="12.7" length="middle"/>
-<pin name="PA6/ADC6/SPI1_MISO" x="-40.64" y="10.16" length="middle"/>
-<pin name="PA7/ADC7/SPI1_MOSI" x="-40.64" y="7.62" length="middle"/>
-<pin name="PB0/ADC8" x="-40.64" y="5.08" length="middle"/>
-<pin name="PB1/ADC9" x="-40.64" y="2.54" length="middle"/>
-<pin name="PB2" x="-40.64" y="0" length="middle"/>
-<pin name="VDDIO2" x="45.72" y="0" length="middle" rot="R180"/>
-<pin name="PA8" x="45.72" y="2.54" length="middle" rot="R180"/>
-<pin name="USART1_TX/I2C1_SCL/PA9" x="45.72" y="5.08" length="middle" rot="R180"/>
-<pin name="USART1_RX/I2C1_SDA/PA10" x="45.72" y="7.62" length="middle" rot="R180"/>
-<pin name="CAN_RX/I2C1_SCL/USB_DM/PA11" x="45.72" y="10.16" length="middle" rot="R180"/>
-<pin name="CAN_TX/I2C1_SDA/USB_DP/PA12" x="45.72" y="12.7" length="middle" rot="R180"/>
-<pin name="SWDIO/PA13" x="45.72" y="15.24" length="middle" rot="R180"/>
-<pin name="USART2_TX/SWCLK/PA14" x="45.72" y="17.78" length="middle" rot="R180"/>
-<pin name="USART2_RX/PA15" x="45.72" y="20.32" length="middle" rot="R180"/>
-<pin name="SPI1_SCK/PB3" x="45.72" y="22.86" length="middle" rot="R180"/>
-<pin name="SPI1_MISO/PB4" x="45.72" y="25.4" length="middle" rot="R180"/>
-<pin name="SPI1_MOSI/PB5" x="45.72" y="27.94" length="middle" rot="R180"/>
-<pin name="I2C1_SCL/USART1_TX/PB6" x="45.72" y="30.48" length="middle" rot="R180"/>
-<pin name="I2C1_SDA/USART1_RX/PB7" x="45.72" y="33.02" length="middle" rot="R180"/>
-<pin name="BOOT0-PF11" x="45.72" y="35.56" length="middle" rot="R180"/>
-<pin name="I2C1_SCL/CAN_RX/PB8" x="45.72" y="38.1" length="middle" rot="R180"/>
-<wire x1="-35.56" y1="43.18" x2="-35.56" y2="-5.08" width="0.254" layer="94"/>
-<pin name="GND" x="0" y="-10.16" length="middle" rot="R90"/>
-</symbol>
 <symbol name="C">
 <wire x1="0" y1="0" x2="0" y2="1.016" width="0.1524" layer="94"/>
 <wire x1="0" y1="2.54" x2="0" y2="1.778" width="0.1524" layer="94"/>
@@ -2653,67 +2470,57 @@ 5V - VREG-00823</description>
 <wire x1="-0.762" y1="1.016" x2="0" y2="1.016" width="0.4064" layer="94"/>
 <wire x1="0" y1="1.016" x2="0.762" y2="1.016" width="0.4064" layer="94"/>
 </symbol>
-<symbol name="POGOPROG-CONN">
-<pin name="MOSI" x="-2.54" y="-5.08" length="short"/>
-<pin name="MISO" x="-2.54" y="-2.54" length="short"/>
-<pin name="SCK" x="-2.54" y="0" length="short"/>
-<pin name="\RST" x="-2.54" y="-7.62" length="short"/>
+<symbol name="STM32F042K-T">
+<wire x1="-40.64" y1="22.86" x2="35.56" y2="22.86" width="0.254" layer="94"/>
+<wire x1="35.56" y1="22.86" x2="35.56" y2="-25.4" width="0.254" layer="94"/>
+<wire x1="35.56" y1="-25.4" x2="-40.64" y2="-25.4" width="0.254" layer="94"/>
+<text x="-40.64" y="25.4" size="2.54" layer="95">&gt;NAME</text>
+<text x="-40.64" y="-30.48" size="2.54" layer="96">&gt;VALUE</text>
+<pin name="VDD" x="-45.72" y="17.78" length="middle"/>
+<pin name="PF0/I2C1_SDA" x="-45.72" y="15.24" length="middle"/>
+<pin name="PF1/I2C1_SCL" x="-45.72" y="12.7" length="middle"/>
+<pin name="NRST" x="-45.72" y="10.16" length="middle"/>
+<pin name="VDDA" x="-45.72" y="7.62" length="middle"/>
+<pin name="PA0/ADC0" x="-45.72" y="5.08" length="middle"/>
+<pin name="PA1/ADC1" x="-45.72" y="2.54" length="middle"/>
+<pin name="PA2/ADC2/USART2_TX" x="-45.72" y="0" length="middle"/>
+<pin name="PA3/ADC3/USART2_RX" x="-45.72" y="-2.54" length="middle"/>
+<pin name="PA4/ADC4" x="-45.72" y="-5.08" length="middle"/>
+<pin name="PA5/ADC5/SPI1_SCK" x="-45.72" y="-7.62" length="middle"/>
+<pin name="PA6/ADC6/SPI1_MISO" x="-45.72" y="-10.16" length="middle"/>
+<pin name="PA7/ADC7/SPI1_MOSI" x="-45.72" y="-12.7" length="middle"/>
+<pin name="PB0/ADC8" x="-45.72" y="-15.24" length="middle"/>
+<pin name="PB1/ADC9" x="-45.72" y="-17.78" length="middle"/>
+<pin name="VDDIO2" x="40.64" y="-20.32" length="middle" rot="R180"/>
+<pin name="PA8" x="40.64" y="-17.78" length="middle" rot="R180"/>
+<pin name="USART1_TX/I2C1_SCL/PA9" x="40.64" y="-15.24" length="middle" rot="R180"/>
+<pin name="USART1_RX/I2C1_SDA/PA10" x="40.64" y="-12.7" length="middle" rot="R180"/>
+<pin name="CAN_RX/I2C1_SCL/USB_DM/PA11" x="40.64" y="-10.16" length="middle" rot="R180"/>
+<pin name="CAN_TX/I2C1_SDA/USB_DP/PA12" x="40.64" y="-7.62" length="middle" rot="R180"/>
+<pin name="SWDIO/PA13" x="40.64" y="-5.08" length="middle" rot="R180"/>
+<pin name="USART2_TX/SWCLK/PA14" x="40.64" y="-2.54" length="middle" rot="R180"/>
+<pin name="USART2_RX/PA15" x="40.64" y="0" length="middle" rot="R180"/>
+<pin name="SPI1_SCK/PB3" x="40.64" y="2.54" length="middle" rot="R180"/>
+<pin name="SPI1_MISO/PB4" x="40.64" y="5.08" length="middle" rot="R180"/>
+<pin name="SPI1_MOSI/PB5" x="40.64" y="7.62" length="middle" rot="R180"/>
+<pin name="I2C1_SCL/USART1_TX/PB6" x="40.64" y="10.16" length="middle" rot="R180"/>
+<pin name="I2C1_SDA/USART1_RX/PB7" x="40.64" y="12.7" length="middle" rot="R180"/>
+<pin name="BOOT0/I2C1_SCL/CAN_RX/PB8" x="40.64" y="17.78" length="middle" rot="R180"/>
+<wire x1="-40.64" y1="22.86" x2="-40.64" y2="-25.4" width="0.254" layer="94"/>
+<pin name="GND" x="-5.08" y="-30.48" length="middle" rot="R90"/>
+</symbol>
+<symbol name="POGOPROG-CONN-4">
+<pin name="SWDIO" x="-2.54" y="-2.54" length="short"/>
+<pin name="SWCLK" x="-2.54" y="0" length="short"/>
 <pin name="VCC" x="-2.54" y="5.08" length="short"/>
 <pin name="GND" x="-2.54" y="2.54" length="short"/>
 <text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
-<text x="0" y="-10.16" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
-<rectangle x1="0" y1="-8.89" x2="1.27" y2="6.35" layer="94"/>
+<text x="0" y="-5.08" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
+<rectangle x1="0" y1="-3.81" x2="1.27" y2="6.35" layer="94"/>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="STM32F042K">
-<gates>
-<gate name="G$1" symbol="STM32F042K" x="2.54" y="0"/>
-</gates>
-<devices>
-<device name="" package="UFQFPN32">
-<connects>
-<connect gate="G$1" pin="BOOT0-PF11" pad="31"/>
-<connect gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11" pad="21"/>
-<connect gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12" pad="22"/>
-<connect gate="G$1" pin="GND" pad="EXP"/>
-<connect gate="G$1" pin="I2C1_SCL/CAN_RX/PB8" pad="32"/>
-<connect gate="G$1" pin="I2C1_SCL/USART1_TX/PB6" pad="29"/>
-<connect gate="G$1" pin="I2C1_SDA/USART1_RX/PB7" pad="30"/>
-<connect gate="G$1" pin="NRST" pad="4"/>
-<connect gate="G$1" pin="PA0/ADC0" pad="6"/>
-<connect gate="G$1" pin="PA1/ADC1" pad="7"/>
-<connect gate="G$1" pin="PA2/ADC2/USART2_TX" pad="8"/>
-<connect gate="G$1" pin="PA3/ADC3/USART2_RX" pad="9"/>
-<connect gate="G$1" pin="PA4/ADC4" pad="10"/>
-<connect gate="G$1" pin="PA5/ADC5/SPI1_SCK" pad="11"/>
-<connect gate="G$1" pin="PA6/ADC6/SPI1_MISO" pad="12"/>
-<connect gate="G$1" pin="PA7/ADC7/SPI1_MOSI" pad="13"/>
-<connect gate="G$1" pin="PA8" pad="18"/>
-<connect gate="G$1" pin="PB0/ADC8" pad="14"/>
-<connect gate="G$1" pin="PB1/ADC9" pad="15"/>
-<connect gate="G$1" pin="PB2" pad="16"/>
-<connect gate="G$1" pin="PF0/I2C1_SDA" pad="2"/>
-<connect gate="G$1" pin="PF1/I2C1_SCL" pad="3"/>
-<connect gate="G$1" pin="SPI1_MISO/PB4" pad="27"/>
-<connect gate="G$1" pin="SPI1_MOSI/PB5" pad="28"/>
-<connect gate="G$1" pin="SPI1_SCK/PB3" pad="26"/>
-<connect gate="G$1" pin="SWDIO/PA13" pad="23"/>
-<connect gate="G$1" pin="USART1_RX/I2C1_SDA/PA10" pad="20"/>
-<connect gate="G$1" pin="USART1_TX/I2C1_SCL/PA9" pad="19"/>
-<connect gate="G$1" pin="USART2_RX/PA15" pad="25"/>
-<connect gate="G$1" pin="USART2_TX/SWCLK/PA14" pad="24"/>
-<connect gate="G$1" pin="VDD" pad="1"/>
-<connect gate="G$1" pin="VDDA" pad="5"/>
-<connect gate="G$1" pin="VDDIO2" pad="17"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="CAP-ARRAY">
+<deviceset name="CAP-ARRAY" prefix="CA">
 <gates>
 <gate name="1" symbol="C" x="-12.7" y="0"/>
 <gate name="2" symbol="C" x="-2.54" y="0"/>
@@ -2738,98 +2545,62 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="POGOPIN-CONN">
-<description>Protofusion custom pogo pin programming header</description>
+<deviceset name="STM32F042K-T" prefix="U">
 <gates>
-<gate name="J" symbol="POGOPROG-CONN" x="0" y="0"/>
+<gate name="G$1" symbol="STM32F042K-T" x="5.08" y="0"/>
 </gates>
 <devices>
-<device name="STANDARD" package="POGOPROG-CONN">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WITHVIAS" package="POGOPROG-CONN-0H">
+<device name="" package="LQFP32">
 <connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="ONEHOLE" package="POGOPROG-CONN-1H">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
+<connect gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8" pad="31"/>
+<connect gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11" pad="21"/>
+<connect gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12" pad="22"/>
+<connect gate="G$1" pin="GND" pad="16 32"/>
+<connect gate="G$1" pin="I2C1_SCL/USART1_TX/PB6" pad="29"/>
+<connect gate="G$1" pin="I2C1_SDA/USART1_RX/PB7" pad="30"/>
+<connect gate="G$1" pin="NRST" pad="4"/>
+<connect gate="G$1" pin="PA0/ADC0" pad="6"/>
+<connect gate="G$1" pin="PA1/ADC1" pad="7"/>
+<connect gate="G$1" pin="PA2/ADC2/USART2_TX" pad="8"/>
+<connect gate="G$1" pin="PA3/ADC3/USART2_RX" pad="9"/>
+<connect gate="G$1" pin="PA4/ADC4" pad="10"/>
+<connect gate="G$1" pin="PA5/ADC5/SPI1_SCK" pad="11"/>
+<connect gate="G$1" pin="PA6/ADC6/SPI1_MISO" pad="12"/>
+<connect gate="G$1" pin="PA7/ADC7/SPI1_MOSI" pad="13"/>
+<connect gate="G$1" pin="PA8" pad="18"/>
+<connect gate="G$1" pin="PB0/ADC8" pad="14"/>
+<connect gate="G$1" pin="PB1/ADC9" pad="15"/>
+<connect gate="G$1" pin="PF0/I2C1_SDA" pad="2"/>
+<connect gate="G$1" pin="PF1/I2C1_SCL" pad="3"/>
+<connect gate="G$1" pin="SPI1_MISO/PB4" pad="27"/>
+<connect gate="G$1" pin="SPI1_MOSI/PB5" pad="28"/>
+<connect gate="G$1" pin="SPI1_SCK/PB3" pad="26"/>
+<connect gate="G$1" pin="SWDIO/PA13" pad="23"/>
+<connect gate="G$1" pin="USART1_RX/I2C1_SDA/PA10" pad="20"/>
+<connect gate="G$1" pin="USART1_TX/I2C1_SCL/PA9" pad="19"/>
+<connect gate="G$1" pin="USART2_RX/PA15" pad="25"/>
+<connect gate="G$1" pin="USART2_TX/SWCLK/PA14" pad="24"/>
+<connect gate="G$1" pin="VDD" pad="1"/>
+<connect gate="G$1" pin="VDDA" pad="5"/>
+<connect gate="G$1" pin="VDDIO2" pad="17"/>
 </connects>
 <technologies>
 <technology name=""/>
 </technologies>
 </device>
-<device name="WITHVIAS-SMV" package="POGOPROG-CONN-OH-SMALLERVIAS">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WIDE" package="POGOPROG-CONN-W">
+</devices>
+</deviceset>
+<deviceset name="POGOPIN-CONN-4" prefix="J">
+<gates>
+<gate name="G$1" symbol="POGOPROG-CONN-4" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="POGOPROG-CONN-4-ALLSMT">
 <connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WITHVIAS-1V" package="POGOPROG-CONN-OH-1V">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="ALLSMT" package="POGOPROG-CONN-ALLSMT">
-<connects>
-<connect gate="J" pin="GND" pad="2"/>
-<connect gate="J" pin="MISO" pad="4"/>
-<connect gate="J" pin="MOSI" pad="5"/>
-<connect gate="J" pin="SCK" pad="3"/>
-<connect gate="J" pin="VCC" pad="1"/>
-<connect gate="J" pin="\RST" pad="6"/>
+<connect gate="G$1" pin="GND" pad="2"/>
+<connect gate="G$1" pin="SWCLK" pad="3"/>
+<connect gate="G$1" pin="SWDIO" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
 </connects>
 <technologies>
 <technology name=""/>
@@ -4060,58 +3831,62 @@ Standard 0603 ceramic capacitor, and 0.1
 </class>
 </classes>
 <parts>
-<part name="U$2" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$17" library="microbuilder" deviceset="3.3V" device=""/>
+<part name="SUP3" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP4" library="microbuilder" deviceset="3.3V" device=""/>
 <part name="SW1" library="dp_devices" deviceset="JOYSTICK_SF303GJ26-3" device=""/>
-<part name="J2" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
-<part name="U3" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
-<part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
+<part name="IC1" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
+<part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2210K-3.3"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
 <part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
-<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="GND5" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$4" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$5" library="microbuilder" deviceset="GND" device=""/>
+<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUP8" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP11" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
-<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
+<part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
 <part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
 <part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
-<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND6" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUP12" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY10" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="U$10" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="GND7" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
 <part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
-<part name="U1" library="Protofusion" deviceset="STM32F042K" device=""/>
 <part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="U$14" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$15" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$16" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$18" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY11" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
-<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
-<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
-<part name="U$7" library="microbuilder" deviceset="GND" device=""/>
-<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
+<part name="SUP1" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP2" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP7" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP5" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
+<part name="SUP6" library="microbuilder" deviceset="GND" device=""/>
+<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
+<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
 <part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="U$1" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
+<part name="SUP9" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY8" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
+<part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
+<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
+<part name="SUPPLY6" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
+<part name="SUP10" library="microbuilder" deviceset="GND" device=""/>
+<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="JP5" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 </parts>
 <sheets>
 <sheet>
@@ -4122,65 +3897,75 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="58.42" y="83.82" size="2.54" layer="113">OLED Display</text>
 <text x="15.24" y="83.82" size="2.54" layer="113">Indication</text>
 <text x="139.7" y="43.18" size="2.54" layer="113">Buttons</text>
-<text x="228.6" y="175.26" size="2.54" layer="113">TC Amp</text>
+<text x="215.9" y="177.8" size="2.54" layer="113">TC Amp</text>
 <text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
-<instance part="U$2" gate="G$1" x="48.26" y="30.48"/>
-<instance part="U$17" gate="G$1" x="99.06" y="66.04"/>
+<instance part="SUP3" gate="G$1" x="48.26" y="30.48"/>
+<instance part="SUP4" gate="G$1" x="99.06" y="66.04"/>
 <instance part="SW1" gate="SW" x="147.32" y="30.48"/>
-<instance part="J2" gate="G$1" x="256.54" y="35.56"/>
-<instance part="U3" gate="G$1" x="205.74" y="160.02" rot="R180"/>
+<instance part="JP1" gate="G$1" x="256.54" y="35.56"/>
+<instance part="IC1" gate="G$1" x="205.74" y="160.02" rot="R180"/>
 <instance part="U2" gate="G$1" x="149.86" y="66.04"/>
 <instance part="LED1" gate="G$1" x="27.94" y="48.26"/>
 <instance part="JP2" gate="G$1" x="261.62" y="129.54" rot="R180"/>
 <instance part="JP3" gate="G$1" x="261.62" y="114.3" rot="R180"/>
 <instance part="JP4" gate="G$1" x="261.62" y="99.06" rot="R180"/>
-<instance part="SUPPLY1" gate="G$1" x="228.6" y="132.08"/>
-<instance part="GND1" gate="1" x="228.6" y="121.92"/>
+<instance part="SUPPLY9" gate="G$1" x="246.38" y="132.08"/>
+<instance part="GND5" gate="1" x="246.38" y="121.92"/>
 <instance part="SUPPLY3" gate="G$1" x="134.62" y="73.66"/>
-<instance part="GND2" gate="1" x="134.62" y="55.88"/>
-<instance part="SUPPLY4" gate="G$1" x="177.8" y="73.66"/>
-<instance part="U$4" gate="G$1" x="170.18" y="25.4"/>
-<instance part="U$5" gate="G$1" x="251.46" y="33.02"/>
+<instance part="GND3" gate="1" x="134.62" y="55.88"/>
+<instance part="SUPPLY5" gate="G$1" x="177.8" y="73.66"/>
+<instance part="SUP8" gate="G$1" x="170.18" y="25.4"/>
+<instance part="SUP11" gate="G$1" x="251.46" y="33.02"/>
 <instance part="D1" gate="G$1" x="231.14" y="38.1" rot="R180"/>
-<instance part="SUPPLY5" gate="G$1" x="218.44" y="40.64"/>
+<instance part="SUPPLY7" gate="G$1" x="218.44" y="40.64"/>
 <instance part="C5" gate="G$1" x="121.92" y="68.58" rot="R180"/>
 <instance part="C7" gate="G$1" x="182.88" y="63.5"/>
 <instance part="R1" gate="G$1" x="27.94" y="58.42" rot="R270"/>
-<instance part="GND3" gate="1" x="228.6" y="106.68"/>
-<instance part="GND4" gate="1" x="27.94" y="38.1"/>
-<instance part="U$10" gate="G$1" x="269.24" y="152.4"/>
-<instance part="SUPPLY9" gate="G$1" x="269.24" y="167.64"/>
-<instance part="C8" gate="G$1" x="269.24" y="162.56" rot="R180"/>
-<instance part="GND7" gate="1" x="121.92" y="58.42"/>
-<instance part="GND8" gate="1" x="182.88" y="55.88"/>
+<instance part="GND6" gate="1" x="246.38" y="106.68"/>
+<instance part="GND1" gate="1" x="27.94" y="38.1"/>
+<instance part="SUP12" gate="G$1" x="269.24" y="152.4"/>
+<instance part="SUPPLY10" gate="G$1" x="269.24" y="167.64"/>
+<instance part="C10" gate="G$1" x="269.24" y="162.56" rot="R180"/>
+<instance part="GND2" gate="1" x="121.92" y="58.42"/>
+<instance part="GND4" gate="1" x="182.88" y="55.88"/>
 <instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
 <instance part="LCD1" gate="G$1" x="86.36" y="53.34"/>
-<instance part="U1" gate="G$1" x="106.68" y="124.46"/>
-<instance part="C2" gate="G$1" x="33.02" y="144.78"/>
-<instance part="C1" gate="G$1" x="20.32" y="152.4"/>
-<instance part="C6" gate="G$1" x="160.02" y="116.84"/>
-<instance part="U$14" gate="G$1" x="20.32" y="137.16"/>
-<instance part="U$15" gate="G$1" x="33.02" y="137.16"/>
-<instance part="U$16" gate="G$1" x="160.02" y="109.22"/>
-<instance part="U$18" gate="G$1" x="106.68" y="109.22"/>
-<instance part="SUPPLY11" gate="G$1" x="20.32" y="165.1"/>
-<instance part="SUPPLY12" gate="G$1" x="33.02" y="154.94"/>
-<instance part="SUPPLY13" gate="G$1" x="160.02" y="124.46"/>
-<instance part="RA1" gate="1" x="68.58" y="60.96" rot="R90"/>
-<instance part="RA1" gate="2" x="63.5" y="55.88" rot="R90"/>
-<instance part="RA1" gate="3" x="68.58" y="38.1" rot="R90"/>
-<instance part="RA1" gate="4" x="63.5" y="35.56" rot="R90"/>
-<instance part="JP1" gate="G$1" x="261.62" y="83.82" rot="R180"/>
-<instance part="J1" gate="J" x="261.62" y="63.5"/>
-<instance part="U$7" gate="G$1" x="175.26" y="154.94"/>
-<instance part="C9" gate="G$1" x="71.12" y="71.12" rot="R90"/>
-<instance part="R3" gate="G$1" x="55.88" y="40.64"/>
+<instance part="C2" gate="G$1" x="40.64" y="144.78"/>
+<instance part="C1" gate="G$1" x="27.94" y="152.4"/>
+<instance part="C6" gate="G$1" x="170.18" y="116.84"/>
+<instance part="SUP1" gate="G$1" x="27.94" y="137.16"/>
+<instance part="SUP2" gate="G$1" x="40.64" y="137.16"/>
+<instance part="SUP7" gate="G$1" x="170.18" y="109.22"/>
+<instance part="SUP5" gate="G$1" x="106.68" y="109.22"/>
+<instance part="SUPPLY1" gate="G$1" x="27.94" y="165.1"/>
+<instance part="SUPPLY2" gate="G$1" x="40.64" y="154.94"/>
+<instance part="SUPPLY4" gate="G$1" x="170.18" y="127"/>
+<instance part="CA1" gate="1" x="68.58" y="60.96" rot="R90"/>
+<instance part="CA1" gate="2" x="63.5" y="55.88" rot="R90"/>
+<instance part="CA1" gate="3" x="68.58" y="38.1" rot="R90"/>
+<instance part="CA1" gate="4" x="63.5" y="35.56" rot="R90"/>
+<instance part="SUP6" gate="G$1" x="165.1" y="157.48"/>
+<instance part="C4" gate="G$1" x="71.12" y="71.12" rot="R90"/>
+<instance part="R2" gate="G$1" x="55.88" y="40.64"/>
 <instance part="C3" gate="G$1" x="60.96" y="66.04" rot="R270"/>
-<instance part="U$1" gate="G$1" x="223.52" y="152.4"/>
-<instance part="SUPPLY2" gate="G$1" x="223.52" y="167.64"/>
-<instance part="C4" gate="G$1" x="251.46" y="162.56" rot="R180"/>
+<instance part="SUP9" gate="G$1" x="223.52" y="152.4"/>
+<instance part="SUPPLY8" gate="G$1" x="223.52" y="167.64"/>
+<instance part="C9" gate="G$1" x="251.46" y="162.56" rot="R180"/>
+<instance part="U1" gate="G$1" x="111.76" y="144.78"/>
+<instance part="J1" gate="G$1" x="223.52" y="60.96"/>
+<instance part="SUPPLY6" gate="G$1" x="215.9" y="68.58"/>
+<instance part="R3" gate="G$1" x="246.38" y="76.2" smashed="yes" rot="R270">
+<attribute name="NAME" x="248.412" y="76.9366" size="1.778" layer="95"/>
+<attribute name="VALUE" x="243.078" y="80.01" size="1.778" layer="96" rot="R270"/>
+</instance>
+<instance part="SUP10" gate="G$1" x="246.38" y="60.96"/>
+<instance part="C8" gate="G$1" x="241.3" y="73.66" smashed="yes">
+<attribute name="NAME" x="240.284" y="78.359" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="240.538" y="73.279" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="JP5" gate="G$1" x="261.62" y="86.36" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -4191,14 +3976,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="55.88" y1="68.58" x2="55.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="55.88" y1="71.12" x2="66.04" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2-"/>
-<pinref part="C9" gate="G$1" pin="1"/>
+<pinref part="C4" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <wire x1="73.66" y1="71.12" x2="76.2" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2+"/>
-<pinref part="C9" gate="G$1" pin="2"/>
+<pinref part="C4" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -4236,120 +4021,130 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="48.26" y="40.64"/>
 <junction x="48.26" y="35.56"/>
 <junction x="48.26" y="38.1"/>
-<pinref part="U$2" gate="G$1" pin="GND"/>
+<pinref part="SUP3" gate="G$1" pin="GND"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
-<pinref part="RA1" gate="1" pin="1"/>
-<pinref part="RA1" gate="2" pin="1"/>
-<pinref part="RA1" gate="3" pin="1"/>
-<pinref part="RA1" gate="4" pin="1"/>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="CA1" gate="1" pin="1"/>
+<pinref part="CA1" gate="2" pin="1"/>
+<pinref part="CA1" gate="3" pin="1"/>
+<pinref part="CA1" gate="4" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
-<pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="254" y1="127" x2="228.6" y2="127" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="127" x2="228.6" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="GND5" gate="1" pin="GND"/>
+<wire x1="254" y1="127" x2="246.38" y2="127" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="127" x2="246.38" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="139.7" y1="66.04" x2="134.62" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="134.62" y1="66.04" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
-<pinref part="GND2" gate="1" pin="GND"/>
+<pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
-<pinref part="U$4" gate="G$1" pin="GND"/>
+<pinref part="SUP8" gate="G$1" pin="GND"/>
 <wire x1="154.94" y1="30.48" x2="170.18" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="170.18" y1="30.48" x2="170.18" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="GND"/>
-<pinref part="U$5" gate="G$1" pin="GND"/>
+<pinref part="JP1" gate="G$1" pin="GND"/>
+<pinref part="SUP11" gate="G$1" pin="GND"/>
 <wire x1="251.46" y1="35.56" x2="254" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
-<wire x1="254" y1="111.76" x2="228.6" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="111.76" x2="228.6" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="GND3" gate="1" pin="GND"/>
+<wire x1="254" y1="111.76" x2="246.38" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="111.76" x2="246.38" y2="109.22" width="0.1524" layer="91"/>
+<pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
-<pinref part="GND4" gate="1" pin="GND"/>
+<pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="27.94" y1="43.18" x2="27.94" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="1"/>
-<pinref part="U$10" gate="G$1" pin="GND"/>
+<pinref part="C10" gate="G$1" pin="1"/>
+<pinref part="SUP12" gate="G$1" pin="GND"/>
 <wire x1="269.24" y1="157.48" x2="269.24" y2="154.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
-<pinref part="GND7" gate="1" pin="GND"/>
+<pinref part="GND2" gate="1" pin="GND"/>
 <wire x1="121.92" y1="60.96" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
-<pinref part="GND8" gate="1" pin="GND"/>
+<pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="182.88" y1="58.42" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
-<wire x1="20.32" y1="149.86" x2="20.32" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$14" gate="G$1" pin="GND"/>
+<wire x1="27.94" y1="149.86" x2="27.94" y2="139.7" width="0.1524" layer="91"/>
+<pinref part="SUP1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
-<wire x1="33.02" y1="142.24" x2="33.02" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$15" gate="G$1" pin="GND"/>
+<wire x1="40.64" y1="142.24" x2="40.64" y2="139.7" width="0.1524" layer="91"/>
+<pinref part="SUP2" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="160.02" y1="114.3" x2="160.02" y2="111.76" width="0.1524" layer="91"/>
-<pinref part="U$16" gate="G$1" pin="GND"/>
+<wire x1="170.18" y1="114.3" x2="170.18" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="SUP7" gate="G$1" pin="GND"/>
 </segment>
 <segment>
+<pinref part="SUP5" gate="G$1" pin="GND"/>
+<wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="GND"/>
-<pinref part="U$18" gate="G$1" pin="GND"/>
-<wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<wire x1="152.4" y1="162.56" x2="165.1" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="162.56" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
+<pinref part="SUP6" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 <segment>
-<pinref part="J1" gate="J" pin="GND"/>
-<wire x1="254" y1="66.04" x2="259.08" y2="66.04" width="0.1524" layer="91"/>
-<label x="254" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="IC1" gate="G$1" pin="GND"/>
+<wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
+<pinref part="SUP9" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="BOOT0-PF11"/>
-<wire x1="152.4" y1="160.02" x2="175.26" y2="160.02" width="0.1524" layer="91"/>
-<wire x1="175.26" y1="160.02" x2="175.26" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="U$7" gate="G$1" pin="GND"/>
+<wire x1="215.9" y1="63.5" x2="220.98" y2="63.5" width="0.1524" layer="91"/>
+<label x="215.9" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="GND"/>
-<wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="GND"/>
+<pinref part="R3" gate="G$1" pin="2"/>
+<wire x1="246.38" y1="71.12" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="SUP10" gate="G$1" pin="GND"/>
+<wire x1="246.38" y1="68.58" x2="246.38" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="68.58" x2="241.3" y2="68.58" width="0.1524" layer="91"/>
+<junction x="246.38" y="68.58"/>
+<pinref part="C8" gate="G$1" pin="2"/>
+<wire x1="241.3" y1="68.58" x2="241.3" y2="71.12" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$8" class="0">
 <segment>
 <wire x1="76.2" y1="40.64" x2="60.96" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="IREF"/>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
 <wire x1="76.2" y1="38.1" x2="71.12" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCOMH"/>
-<pinref part="RA1" gate="3" pin="2"/>
+<pinref part="CA1" gate="3" pin="2"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <wire x1="76.2" y1="35.56" x2="66.04" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCC"/>
-<pinref part="RA1" gate="4" pin="2"/>
+<pinref part="CA1" gate="4" pin="2"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
@@ -4361,68 +4156,75 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="76.2" y1="55.88" x2="99.06" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="55.88" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
 <junction x="99.06" y="60.96"/>
-<pinref part="U$17" gate="G$1" pin="3.3V"/>
+<pinref part="SUP4" gate="G$1" pin="3.3V"/>
 <pinref part="LCD1" gate="G$1" pin="VBAT"/>
 <junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
 <junction x="76.2" y="55.88"/>
-<pinref part="RA1" gate="1" pin="2"/>
-<pinref part="RA1" gate="2" pin="2"/>
+<pinref part="CA1" gate="1" pin="2"/>
+<pinref part="CA1" gate="2" pin="2"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
 <wire x1="157.48" y1="71.12" x2="177.8" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="177.8" y1="71.12" x2="177.8" y2="73.66" width="0.1524" layer="91"/>
-<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY5" gate="G$1" pin="3.3V"/>
 <pinref part="C7" gate="G$1" pin="1"/>
 <wire x1="177.8" y1="71.12" x2="182.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="182.88" y1="71.12" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
 <junction x="177.8" y="71.12"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="2"/>
-<pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
+<pinref part="C10" gate="G$1" pin="2"/>
+<pinref part="SUPPLY10" gate="G$1" pin="3.3V"/>
 <wire x1="269.24" y1="165.1" x2="269.24" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
+<pinref part="C1" gate="G$1" pin="1"/>
+<wire x1="66.04" y1="162.56" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="162.56" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
+<pinref part="SUPPLY1" gate="G$1" pin="3.3V"/>
+<wire x1="27.94" y1="165.1" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<junction x="27.94" y="162.56"/>
 <pinref part="U1" gate="G$1" pin="VDD"/>
-<pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="162.56" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="20.32" y1="162.56" x2="20.32" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
-<wire x1="20.32" y1="165.1" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<junction x="20.32" y="162.56"/>
+</segment>
+<segment>
+<pinref part="C2" gate="G$1" pin="1"/>
+<wire x1="66.04" y1="152.4" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="152.4" x2="40.64" y2="149.86" width="0.1524" layer="91"/>
+<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<wire x1="40.64" y1="154.94" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<junction x="40.64" y="152.4"/>
+<pinref part="U1" gate="G$1" pin="VDDA"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="VDDA"/>
-<pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="152.4" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<wire x1="33.02" y1="152.4" x2="33.02" y2="149.86" width="0.1524" layer="91"/>
-<pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
-<wire x1="33.02" y1="154.94" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<junction x="33.02" y="152.4"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<wire x1="170.18" y1="127" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
+<pinref part="U1" gate="G$1" pin="VDDIO2"/>
+<wire x1="170.18" y1="124.46" x2="170.18" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="124.46" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
+<junction x="170.18" y="124.46"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="VDDIO2"/>
-<pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="152.4" y1="124.46" x2="160.02" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="160.02" y1="124.46" x2="160.02" y2="121.92" width="0.1524" layer="91"/>
-<pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<junction x="160.02" y="124.46"/>
+<pinref part="IC1" gate="G$1" pin="VCC"/>
+<wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
+<pinref part="SUPPLY8" gate="G$1" pin="3.3V"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="VCC"/>
-<wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
-<wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
-<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<pinref part="J1" gate="G$1" pin="VCC"/>
+<pinref part="SUPPLY6" gate="G$1" pin="3.3V"/>
+<wire x1="220.98" y1="66.04" x2="215.9" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="66.04" x2="215.9" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="V_BATT" class="0">
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
-<pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
-<wire x1="254" y1="129.54" x2="228.6" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="129.54" x2="228.6" y2="132.08" width="0.1524" layer="91"/>
+<pinref part="SUPPLY9" gate="G$1" pin="V_BATT"/>
+<wire x1="254" y1="129.54" x2="246.38" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="129.54" x2="246.38" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
@@ -4442,18 +4244,18 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="D1" gate="G$1" pin="C"/>
 <wire x1="228.6" y1="38.1" x2="218.44" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="218.44" y1="38.1" x2="218.44" y2="40.64" width="0.1524" layer="91"/>
-<pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
+<pinref part="SUPPLY7" gate="G$1" pin="V_BATT"/>
 </segment>
 </net>
 <net name="SW-A" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="A"/>
 <wire x1="129.54" y1="33.02" x2="139.7" y2="33.02" width="0.1524" layer="91"/>
-<label x="129.54" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
-<label x="154.94" y="152.4" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="152.4" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
@@ -4461,11 +4263,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="C"/>
 <wire x1="129.54" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
-<label x="129.54" y="27.94" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="27.94" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="147.32" x2="152.4" y2="147.32" width="0.1524" layer="91"/>
-<label x="154.94" y="147.32" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="147.32" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
@@ -4473,11 +4275,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="B"/>
 <wire x1="162.56" y1="33.02" x2="154.94" y2="33.02" width="0.1524" layer="91"/>
-<label x="162.56" y="33.02" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="33.02" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="157.48" x2="152.4" y2="157.48" width="0.1524" layer="91"/>
-<label x="154.94" y="157.48" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="157.48" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
@@ -4485,51 +4287,41 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="D"/>
 <wire x1="162.56" y1="27.94" x2="154.94" y2="27.94" width="0.1524" layer="91"/>
-<label x="162.56" y="27.94" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="154.94" x2="152.4" y2="154.94" width="0.1524" layer="91"/>
-<label x="154.94" y="154.94" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="154.94" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D+"/>
+<pinref part="JP1" gate="G$1" pin="D+"/>
 <wire x1="248.92" y1="43.18" x2="254" y2="43.18" width="0.1524" layer="91"/>
-<label x="248.92" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="137.16" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="137.16" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="137.16" x2="154.94" y2="137.16" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
-<wire x1="152.4" y1="137.16" x2="182.88" y2="137.16" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="J1" gate="J" pin="MOSI"/>
-<wire x1="254" y1="58.42" x2="259.08" y2="58.42" width="0.1524" layer="91"/>
-<label x="254" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D-"/>
+<pinref part="JP1" gate="G$1" pin="D-"/>
 <wire x1="248.92" y1="40.64" x2="254" y2="40.64" width="0.1524" layer="91"/>
-<label x="248.92" y="40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="134.62" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="134.62" x2="154.94" y2="134.62" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
-<wire x1="152.4" y1="134.62" x2="182.88" y2="134.62" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="J1" gate="J" pin="\RST"/>
-<wire x1="254" y1="55.88" x2="259.08" y2="55.88" width="0.1524" layer="91"/>
-<label x="254" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="VBUS"/>
+<pinref part="JP1" gate="G$1" pin="VBUS"/>
 <pinref part="D1" gate="G$1" pin="A"/>
 <wire x1="233.68" y1="38.1" x2="238.76" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="238.76" y1="38.1" x2="254" y2="38.1" width="0.1524" layer="91"/>
@@ -4538,21 +4330,16 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="238.76" y1="43.18" x2="236.22" y2="43.18" width="0.1524" layer="91"/>
 <label x="236.22" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
-<segment>
-<pinref part="J1" gate="J" pin="VCC"/>
-<wire x1="259.08" y1="68.58" x2="254" y2="68.58" width="0.1524" layer="91"/>
-<label x="254" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
 <pinref part="JP3" gate="G$1" pin="1"/>
-<wire x1="254" y1="114.3" x2="228.6" y2="114.3" width="0.1524" layer="91"/>
-<label x="228.6" y="114.3" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="114.3" x2="246.38" y2="114.3" width="0.1524" layer="91"/>
+<label x="246.38" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="60.96" y="147.32" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="60.96" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
+<label x="63.5" y="147.32" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
@@ -4570,48 +4357,48 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="27.94" y="66.04" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="154.94" y1="162.56" x2="152.4" y2="162.56" width="0.1524" layer="91"/>
-<label x="154.94" y="162.56" size="1.016" layer="95" xref="yes"/>
-<pinref part="U1" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
+<wire x1="63.5" y1="160.02" x2="66.04" y2="160.02" width="0.1524" layer="91"/>
+<label x="63.5" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PF0/I2C1_SDA"/>
 </segment>
 </net>
 <net name="!RES" class="0">
 <segment>
 <wire x1="73.66" y1="50.8" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
-<label x="73.66" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="58.42" y="142.24" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
+<label x="63.5" y="142.24" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
 <segment>
 <wire x1="73.66" y1="48.26" x2="76.2" y2="48.26" width="0.1524" layer="91"/>
-<label x="73.66" y="48.26" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="58.42" y="139.7" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
+<label x="63.5" y="139.7" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="2"/>
-<wire x1="254" y1="96.52" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
-<label x="228.6" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="96.52" x2="246.38" y2="96.52" width="0.1524" layer="91"/>
+<label x="246.38" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="1"/>
+<pinref part="C9" gate="G$1" pin="1"/>
 <wire x1="251.46" y1="152.4" x2="251.46" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="152.4" x2="254" y2="152.4" width="0.1524" layer="91"/>
 <junction x="251.46" y="152.4"/>
 <label x="254" y="152.4" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T-"/>
+<pinref part="IC1" gate="G$1" pin="T-"/>
 <wire x1="220.98" y1="160.02" x2="231.14" y2="160.02" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="160.02" x2="231.14" y2="152.4" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="152.4" x2="251.46" y2="152.4" width="0.1524" layer="91"/>
@@ -4620,16 +4407,16 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="T+" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
-<wire x1="254" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
-<label x="228.6" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="99.06" x2="246.38" y2="99.06" width="0.1524" layer="91"/>
+<label x="246.38" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="2"/>
+<pinref part="C9" gate="G$1" pin="2"/>
 <wire x1="251.46" y1="167.64" x2="251.46" y2="165.1" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="167.64" x2="254" y2="167.64" width="0.1524" layer="91"/>
 <junction x="251.46" y="167.64"/>
 <label x="254" y="167.64" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T+"/>
+<pinref part="IC1" gate="G$1" pin="T+"/>
 <wire x1="220.98" y1="162.56" x2="231.14" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="162.56" x2="231.14" y2="167.64" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="167.64" x2="251.46" y2="167.64" width="0.1524" layer="91"/>
@@ -4639,125 +4426,143 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="CENTER"/>
 <wire x1="139.7" y1="30.48" x2="129.54" y2="30.48" width="0.1524" layer="91"/>
-<label x="129.54" y="30.48" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="152.4" y1="149.86" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
-<label x="154.94" y="149.86" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="149.86" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
 <segment>
 <wire x1="73.66" y1="43.18" x2="76.2" y2="43.18" width="0.1524" layer="91"/>
-<label x="73.66" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="132.08" x2="55.88" y2="132.08" width="0.1524" layer="91"/>
-<label x="55.88" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="132.08" x2="63.5" y2="132.08" width="0.1524" layer="91"/>
+<label x="63.5" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="SO"/>
+<pinref part="IC1" gate="G$1" pin="SO"/>
 <wire x1="187.96" y1="160.02" x2="190.5" y2="160.02" width="0.1524" layer="91"/>
-<label x="187.96" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="134.62" x2="55.88" y2="134.62" width="0.1524" layer="91"/>
-<label x="55.88" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="134.62" x2="63.5" y2="134.62" width="0.1524" layer="91"/>
+<label x="63.5" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
 <segment>
 <wire x1="73.66" y1="45.72" x2="76.2" y2="45.72" width="0.1524" layer="91"/>
-<label x="73.66" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="SCK"/>
+<pinref part="IC1" gate="G$1" pin="SCK"/>
 <wire x1="187.96" y1="165.1" x2="190.5" y2="165.1" width="0.1524" layer="91"/>
-<label x="187.96" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="165.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="137.16" x2="55.88" y2="137.16" width="0.1524" layer="91"/>
-<label x="55.88" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="137.16" x2="63.5" y2="137.16" width="0.1524" layer="91"/>
+<label x="63.5" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
 <segment>
 <wire x1="73.66" y1="53.34" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
-<label x="73.66" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="144.78" x2="55.88" y2="144.78" width="0.1524" layer="91"/>
-<label x="55.88" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="144.78" x2="63.5" y2="144.78" width="0.1524" layer="91"/>
+<label x="63.5" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="!CS"/>
+<pinref part="IC1" gate="G$1" pin="!CS"/>
 <wire x1="187.96" y1="162.56" x2="190.5" y2="162.56" width="0.1524" layer="91"/>
-<label x="187.96" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="162.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="152.4" y1="144.78" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
-<label x="162.56" y="144.78" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="144.78" x2="154.94" y2="144.78" width="0.1524" layer="91"/>
+<label x="154.94" y="144.78" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="AUX-TX" class="0">
 <segment>
+<wire x1="152.4" y1="129.54" x2="154.94" y2="129.54" width="0.1524" layer="91"/>
+<label x="154.94" y="129.54" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
-<wire x1="152.4" y1="129.54" x2="190.5" y2="129.54" width="0.1524" layer="91"/>
-<label x="190.5" y="129.54" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="2"/>
-<wire x1="248.92" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
-<label x="248.92" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="236.22" y1="83.82" x2="241.3" y2="83.82" width="0.1524" layer="91"/>
+<label x="236.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="R3" gate="G$1" pin="1"/>
+<wire x1="241.3" y1="83.82" x2="246.38" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="83.82" x2="246.38" y2="81.28" width="0.1524" layer="91"/>
+<junction x="246.38" y="83.82"/>
+<pinref part="JP5" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="1"/>
+<wire x1="241.3" y1="83.82" x2="241.3" y2="78.74" width="0.1524" layer="91"/>
+<junction x="241.3" y="83.82"/>
+</segment>
+<segment>
+<pinref part="U1" gate="G$1" pin="PB1/ADC9"/>
+<wire x1="63.5" y1="127" x2="66.04" y2="127" width="0.1524" layer="91"/>
+<label x="63.5" y="127" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="AUX-RX" class="0">
 <segment>
+<wire x1="152.4" y1="132.08" x2="154.94" y2="132.08" width="0.1524" layer="91"/>
+<label x="154.94" y="132.08" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
-<wire x1="152.4" y1="132.08" x2="190.5" y2="132.08" width="0.1524" layer="91"/>
-<label x="190.5" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="1"/>
-<wire x1="248.92" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
-<label x="248.92" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="236.22" y1="86.36" x2="254" y2="86.36" width="0.1524" layer="91"/>
+<label x="236.22" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="JP5" gate="G$1" pin="1"/>
+</segment>
+<segment>
+<pinref part="U1" gate="G$1" pin="PB0/ADC8"/>
+<wire x1="63.5" y1="129.54" x2="66.04" y2="129.54" width="0.1524" layer="91"/>
+<label x="63.5" y="129.54" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<pinref part="J1" gate="J" pin="SCK"/>
-<wire x1="254" y1="63.5" x2="259.08" y2="63.5" width="0.1524" layer="91"/>
-<label x="254" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="154.94" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
+<label x="154.94" y="142.24" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
-<wire x1="172.72" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
-<label x="172.72" y="142.24" size="1.27" layer="95" xref="yes"/>
+<wire x1="215.9" y1="60.96" x2="220.98" y2="60.96" width="0.1524" layer="91"/>
+<label x="215.9" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWCLK"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="J1" gate="J" pin="MISO"/>
-<wire x1="254" y1="60.96" x2="259.08" y2="60.96" width="0.1524" layer="91"/>
-<label x="254" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="154.94" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
+<label x="154.94" y="139.7" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
-<wire x1="172.72" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
-<label x="172.72" y="139.7" size="1.27" layer="95" xref="yes"/>
+<wire x1="215.9" y1="58.42" x2="220.98" y2="58.42" width="0.1524" layer="91"/>
+<label x="215.9" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWDIO"/>
 </segment>
 </net>
 </nets>