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="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
-<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
-<layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
-<layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
-<layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
-<layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
-<layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
-<layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
-<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
+<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
+<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
+<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
+<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,17 +53,17 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
-<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
-<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="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="yes" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="yes" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
+<layer number="57" name="tCAD" color="7" fill="1" visible="yes" active="no"/>
 <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"/>
@@ -5343,14 +5343,15 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <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="TP1" library="testpad" deviceset="TP" device="TP09R"/>
-<part name="TP2" library="testpad" deviceset="TP" device="TP09R"/>
+<part name="TP1" library="testpad" deviceset="TP" device="TP06R" value="TPTP06R"/>
+<part name="TP2" library="testpad" deviceset="TP" device="TP06R" value="TPTP06R"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 <text x="170.18" y="5.08" size="1.778" layer="91">Replace with ceramicone</text>
-<text x="66.04" y="-78.74" size="6.4516" layer="113">BOOT pins@?</text>
+<text x="66.04" y="-78.74" size="6.4516" layer="113">BOOT pins@? Does USB DFU start on boot?</text>
 <text x="266.7" y="81.28" size="2.54" layer="113">Connectors</text>
 <text x="187.96" y="15.24" size="2.54" layer="113">Power Supply</text>
 <text x="109.22" y="12.7" size="2.54" layer="113">OLED Display</text>
@@ -5359,7 +5360,7 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <text x="266.7" y="111.76" size="2.54" layer="113">TC Amp</text>
 <text x="116.84" y="-50.8" size="1.778" layer="94">DOWNSIZE ALL CAPS TO 1UF AND TEST
 REPLACE WITH 1UF 6v ARR</text>
-<text x="208.28" y="25.4" size="3.81" layer="91">CONSIDER ADDING POGO PADS FOR USB</text>
+<text x="25.4" y="35.56" size="3.81" layer="91">CONSIDER ADDING POGO PADS FOR USB</text>
 </plain>
 <instances>
 <instance part="C106" gate="G$1" x="121.92" y="0" rot="R90"/>
@@ -5396,25 +5397,26 @@ REPLACE WITH 1UF 6v ARR</text>
 <instance part="GND8" gate="1" x="243.84" y="-12.7"/>
 <instance part="FRAME1" gate="G$1" x="58.42" y="-58.42"/>
 <instance part="LCD1" gate="G$1" x="137.16" y="-17.78"/>
-<instance part="RN1" gate="A" x="-60.96" y="66.04"/>
-<instance part="RN1" gate="B" x="-53.34" y="63.5"/>
-<instance part="U$13" gate="G$1" x="-121.92" y="53.34"/>
-<instance part="C5" gate="G$1" x="-228.6" y="73.66"/>
-<instance part="C6" gate="G$1" x="-241.3" y="81.28"/>
-<instance part="C7" gate="G$1" x="-68.58" y="45.72"/>
-<instance part="U$14" gate="G$1" x="-241.3" y="66.04"/>
-<instance part="U$15" gate="G$1" x="-228.6" y="66.04"/>
-<instance part="U$16" gate="G$1" x="-68.58" y="38.1"/>
-<instance part="U$18" gate="G$1" x="-121.92" y="38.1"/>
-<instance part="SUPPLY11" gate="G$1" x="-241.3" y="93.98"/>
-<instance part="SUPPLY12" gate="G$1" x="-228.6" y="83.82"/>
-<instance part="SUPPLY13" gate="G$1" x="-68.58" y="55.88"/>
+<instance part="RN1" gate="A" x="220.98" y="76.2"/>
+<instance part="RN1" gate="B" x="228.6" y="73.66"/>
+<instance part="U$13" gate="G$1" x="160.02" y="63.5"/>
+<instance part="C5" gate="G$1" x="86.36" y="83.82"/>
+<instance part="C6" gate="G$1" x="73.66" y="91.44"/>
+<instance part="C7" gate="G$1" x="213.36" y="55.88"/>
+<instance part="U$14" gate="G$1" x="73.66" y="76.2"/>
+<instance part="U$15" gate="G$1" x="86.36" y="76.2"/>
+<instance part="U$16" gate="G$1" x="213.36" y="48.26"/>
+<instance part="U$18" gate="G$1" x="160.02" y="48.26"/>
+<instance part="SUPPLY11" gate="G$1" x="73.66" y="104.14"/>
+<instance part="SUPPLY12" gate="G$1" x="86.36" y="93.98"/>
+<instance part="SUPPLY13" gate="G$1" x="213.36" y="66.04"/>
 <instance part="RA1" gate="1" x="119.38" y="-10.16" rot="R90"/>
 <instance part="RA1" gate="2" x="114.3" y="-15.24" rot="R90"/>
 <instance part="RA1" gate="3" x="119.38" y="-33.02" rot="R90"/>
 <instance part="RA1" gate="4" x="114.3" y="-35.56" rot="R90"/>
-<instance part="TP1" gate="G$1" x="-30.48" y="71.12" rot="R270"/>
-<instance part="TP2" gate="G$1" x="-33.02" y="68.58" rot="R270"/>
+<instance part="TP1" gate="G$1" x="228.6" y="81.28" rot="R270"/>
+<instance part="TP2" gate="G$1" x="233.68" y="78.74" rot="R270"/>
+<instance part="JP1" gate="G$1" x="198.12" y="33.02" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -5535,23 +5537,23 @@ REPLACE WITH 1UF 6v ARR</text>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="-241.3" y1="78.74" x2="-241.3" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="73.66" y1="88.9" x2="73.66" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="U$14" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="2"/>
-<wire x1="-228.6" y1="71.12" x2="-228.6" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="81.28" x2="86.36" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="U$15" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
-<wire x1="-68.58" y1="43.18" x2="-68.58" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="53.34" x2="213.36" y2="50.8" width="0.1524" layer="91"/>
 <pinref part="U$16" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U$13" gate="G$1" pin="GND"/>
 <pinref part="U$18" gate="G$1" pin="GND"/>
-<wire x1="-121.92" y1="40.64" x2="-121.92" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="50.8" x2="160.02" y2="53.34" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$8" class="0">
@@ -5616,29 +5618,29 @@ REPLACE WITH 1UF 6v ARR</text>
 <segment>
 <pinref part="U$13" gate="G$1" pin="VDD"/>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="-162.56" y1="91.44" x2="-241.3" y2="91.44" width="0.1524" layer="91"/>
-<wire x1="-241.3" y1="91.44" x2="-241.3" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="101.6" x2="73.66" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="73.66" y1="101.6" x2="73.66" y2="96.52" width="0.1524" layer="91"/>
 <pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
-<wire x1="-241.3" y1="93.98" x2="-241.3" y2="91.44" width="0.1524" layer="91"/>
-<junction x="-241.3" y="91.44"/>
+<wire x1="73.66" y1="104.14" x2="73.66" y2="101.6" width="0.1524" layer="91"/>
+<junction x="73.66" y="101.6"/>
 </segment>
 <segment>
 <pinref part="U$13" gate="G$1" pin="VDDA"/>
 <pinref part="C5" gate="G$1" pin="1"/>
-<wire x1="-162.56" y1="81.28" x2="-228.6" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="-228.6" y1="81.28" x2="-228.6" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="91.44" x2="86.36" y2="91.44" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="91.44" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
 <pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
-<wire x1="-228.6" y1="83.82" x2="-228.6" y2="81.28" width="0.1524" layer="91"/>
-<junction x="-228.6" y="81.28"/>
+<wire x1="86.36" y1="93.98" x2="86.36" y2="91.44" width="0.1524" layer="91"/>
+<junction x="86.36" y="91.44"/>
 </segment>
 <segment>
 <pinref part="U$13" gate="G$1" pin="VDDIO2"/>
 <pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="-76.2" y1="53.34" x2="-68.58" y2="53.34" width="0.1524" layer="91"/>
-<wire x1="-68.58" y1="53.34" x2="-68.58" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="63.5" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="63.5" x2="213.36" y2="60.96" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<wire x1="-68.58" y1="55.88" x2="-68.58" y2="53.34" width="0.1524" layer="91"/>
-<junction x="-68.58" y="53.34"/>
+<wire x1="213.36" y1="66.04" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
+<junction x="213.36" y="63.5"/>
 </segment>
 </net>
 <net name="V_BATT" class="0">
@@ -5676,8 +5678,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-187.96" y1="60.96" x2="-185.42" y2="60.96" width="0.1524" layer="91"/>
-<label x="-187.96" y="60.96" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="93.98" x2="205.74" y2="93.98" width="0.1524" layer="91"/>
+<label x="208.28" y="93.98" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
@@ -5687,8 +5690,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-187.96" y1="58.42" x2="-185.42" y2="58.42" width="0.1524" layer="91"/>
-<label x="-187.96" y="58.42" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="88.9" x2="205.74" y2="88.9" width="0.1524" layer="91"/>
+<label x="208.28" y="88.9" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
@@ -5698,8 +5702,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="223.52" y="-35.56" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-187.96" y1="53.34" x2="-185.42" y2="53.34" width="0.1524" layer="91"/>
-<label x="-187.96" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="99.06" x2="205.74" y2="99.06" width="0.1524" layer="91"/>
+<label x="208.28" y="99.06" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="BOOT0-PF11"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
@@ -5709,8 +5714,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="223.52" y="-40.64" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-187.96" y1="55.88" x2="-185.42" y2="55.88" width="0.1524" layer="91"/>
-<label x="-187.96" y="55.88" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
+<label x="208.28" y="96.52" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
 <net name="D+" class="0">
@@ -5720,8 +5726,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="276.86" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-55.88" y1="66.04" x2="-45.72" y2="66.04" width="0.1524" layer="91"/>
-<label x="-45.72" y="66.04" size="1.016" layer="95" xref="yes"/>
+<wire x1="226.06" y1="76.2" x2="236.22" y2="76.2" width="0.1524" layer="91"/>
+<label x="236.22" y="76.2" size="1.016" layer="95" xref="yes"/>
 <pinref part="RN1" gate="A" pin="2"/>
 </segment>
 </net>
@@ -5732,8 +5738,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="276.86" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-45.72" y1="63.5" x2="-48.26" y2="63.5" width="0.1524" layer="91"/>
-<label x="-45.72" y="63.5" size="1.016" layer="95" xref="yes"/>
+<wire x1="236.22" y1="73.66" x2="233.68" y2="73.66" width="0.1524" layer="91"/>
+<label x="236.22" y="73.66" size="1.016" layer="95" xref="yes"/>
 <pinref part="RN1" gate="B" pin="2"/>
 </segment>
 </net>
@@ -5751,20 +5757,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="281.94" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="-187.96" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="-187.96" y1="50.8" x2="-182.88" y2="50.8" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="SWCLK" class="0">
-<segment>
-<wire x1="-187.96" y1="68.58" x2="-185.42" y2="68.58" width="0.1524" layer="91"/>
-<label x="-187.96" y="68.58" size="1.016" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SWDIO" class="0">
-<segment>
-<wire x1="-187.96" y1="76.2" x2="-185.42" y2="76.2" width="0.1524" layer="91"/>
-<label x="-187.96" y="76.2" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="114.3" y="86.36" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="114.3" y1="86.36" x2="119.38" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="U$13" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
 <net name="N$23" class="0">
@@ -5781,8 +5776,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="78.74" y="-5.08" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-187.96" y1="45.72" x2="-185.42" y2="45.72" width="0.1524" layer="91"/>
-<label x="-187.96" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="101.6" x2="205.74" y2="101.6" width="0.1524" layer="91"/>
+<label x="208.28" y="101.6" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 </net>
 <net name="!RES" class="0">
@@ -5792,8 +5788,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="-170.18" y="71.12" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="-170.18" y1="71.12" x2="-162.56" y2="71.12" width="0.1524" layer="91"/>
+<label x="111.76" y="81.28" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="111.76" y1="81.28" x2="119.38" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="U$13" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
@@ -5804,8 +5800,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="-170.18" y="68.58" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="-170.18" y1="68.58" x2="-162.56" y2="68.58" width="0.1524" layer="91"/>
+<label x="111.76" y="78.74" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="111.76" y1="78.74" x2="119.38" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="U$13" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
@@ -5840,21 +5836,22 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-38.1" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-185.42" y1="63.5" x2="-187.96" y2="63.5" width="0.1524" layer="91"/>
-<label x="-187.96" y="63.5" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="205.74" y1="91.44" x2="208.28" y2="91.44" width="0.1524" layer="91"/>
+<label x="208.28" y="91.44" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
 <net name="N$17" class="0">
 <segment>
 <pinref part="U$13" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
-<wire x1="-76.2" y1="66.04" x2="-66.04" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="76.2" x2="215.9" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="RN1" gate="A" pin="1"/>
 </segment>
 </net>
 <net name="N$18" class="0">
 <segment>
 <pinref part="U$13" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
-<wire x1="-76.2" y1="63.5" x2="-58.42" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="73.66" x2="223.52" y2="73.66" width="0.1524" layer="91"/>
 <pinref part="RN1" gate="B" pin="1"/>
 </segment>
 </net>
@@ -5865,8 +5862,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="-162.56" y1="60.96" x2="-172.72" y2="60.96" width="0.1524" layer="91"/>
-<label x="-172.72" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="71.12" x2="109.22" y2="71.12" width="0.1524" layer="91"/>
+<label x="109.22" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U$13" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
@@ -5877,8 +5874,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-162.56" y1="63.5" x2="-172.72" y2="63.5" width="0.1524" layer="91"/>
-<label x="-172.72" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="73.66" x2="109.22" y2="73.66" width="0.1524" layer="91"/>
+<label x="109.22" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U$13" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
@@ -5894,8 +5891,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="101.6" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-162.56" y1="66.04" x2="-172.72" y2="66.04" width="0.1524" layer="91"/>
-<label x="-172.72" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="76.2" x2="109.22" y2="76.2" width="0.1524" layer="91"/>
+<label x="109.22" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U$13" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
@@ -5906,8 +5903,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="-162.56" y1="73.66" x2="-172.72" y2="73.66" width="0.1524" layer="91"/>
-<label x="-172.72" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="119.38" y1="83.82" x2="109.22" y2="83.82" width="0.1524" layer="91"/>
+<label x="109.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U$13" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
@@ -5918,23 +5915,47 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-76.2" y1="78.74" x2="-66.04" y2="78.74" width="0.1524" layer="91"/>
-<label x="-66.04" y="78.74" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
+<wire x1="205.74" y1="83.82" x2="215.9" y2="83.82" width="0.1524" layer="91"/>
+<label x="215.9" y="83.82" size="1.27" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="N$5" class="0">
 <segment>
 <pinref part="U$13" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 <pinref part="TP1" gate="G$1" pin="TP"/>
-<wire x1="-33.02" y1="71.12" x2="-76.2" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="81.28" x2="205.74" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$6" class="0">
 <segment>
 <pinref part="U$13" gate="G$1" pin="SWDIO/PA13"/>
 <pinref part="TP2" gate="G$1" pin="TP"/>
-<wire x1="-35.56" y1="68.58" x2="-76.2" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="231.14" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="AUX-TX" class="0">
+<segment>
+<pinref part="JP1" gate="G$1" pin="1"/>
+<wire x1="185.42" y1="33.02" x2="190.5" y2="33.02" width="0.1524" layer="91"/>
+<label x="185.42" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$13" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
+<wire x1="205.74" y1="68.58" x2="243.84" y2="68.58" width="0.1524" layer="91"/>
+<label x="243.84" y="68.58" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
+<net name="AUX-RX" class="0">
+<segment>
+<pinref part="JP1" gate="G$1" pin="2"/>
+<wire x1="185.42" y1="30.48" x2="190.5" y2="30.48" width="0.1524" layer="91"/>
+<label x="185.42" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$13" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
+<wire x1="205.74" y1="71.12" x2="243.84" y2="71.12" width="0.1524" layer="91"/>
+<label x="243.84" y="71.12" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 </nets>