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"/>
@@ -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="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="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="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="yes" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="yes" 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="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,19 @@
 <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="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="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="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>
@@ -2324,164 +2343,6 @@ 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>
-<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"/>
-<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"/>
-<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="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="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>
-<wire x1="0" y1="5.08" x2="0" y2="3.81" width="0.127" layer="21"/>
-<wire x1="0.3175" y1="4.1275" x2="0" y2="3.81" width="0.127" layer="21"/>
-<wire x1="0" y1="3.81" x2="-0.3175" y2="4.1275" width="0.127" layer="21"/>
-</package>
 <package name="LQFP32">
 <wire x1="-3.5" y1="3.15" x2="-3.5" y2="-3.15" width="0.1524" layer="51"/>
 <wire x1="-3.5" y1="-3.15" x2="-3.15" y2="-3.5" width="0.1524" layer="51"/>
@@ -2574,6 +2435,27 @@ 5V - VREG-00823</description>
 <rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
 <rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
 </package>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="-0.635" y="1.905"/>
+</polygon>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
+</package>
 </packages>
 <symbols>
 <symbol name="C">
@@ -2588,17 +2470,6 @@ 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"/>
-<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"/>
-</symbol>
 <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"/>
@@ -2638,6 +2509,15 @@ 5V - VREG-00823</description>
 <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="-3.81" x2="1.27" y2="6.35" layer="94"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="CAP-ARRAY">
@@ -2665,106 +2545,7 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="POGOPIN-CONN">
-<description>Protofusion custom pogo pin programming header</description>
-<gates>
-<gate name="J" symbol="POGOPROG-CONN" x="0" 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">
-<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"/>
-</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">
-<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"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="STM32F042K-T">
+<deviceset name="STM32F042K-T" prefix="U">
 <gates>
 <gate name="G$1" symbol="STM32F042K-T" x="5.08" y="0"/>
 </gates>
@@ -2809,6 +2590,24 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="POGOPIN-CONN-4">
+<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="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=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="SparkFun-Aesthetics">
@@ -4074,8 +3873,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="CA1" 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"/>
@@ -4084,6 +3881,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="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="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
+<part name="U$8" library="microbuilder" deviceset="GND" device=""/>
+<part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 </parts>
 <sheets>
 <sheet>
@@ -4143,8 +3946,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="JP1" gate="G$1" x="261.62" y="83.82" rot="R180"/>
-<instance part="J1" gate="J" x="259.08" y="63.5"/>
 <instance part="U$7" gate="G$1" x="165.1" y="157.48"/>
 <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"/>
@@ -4153,6 +3954,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="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="R2" gate="G$1" x="246.38" y="76.2" rot="R270"/>
+<instance part="U$8" gate="G$1" x="246.38" y="60.96"/>
+<instance part="C10" gate="G$1" x="241.3" y="73.66"/>
+<instance part="JP1" gate="G$1" x="261.62" y="86.36" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -4286,11 +4093,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="J1" gate="J" pin="GND"/>
-<wire x1="246.38" y1="66.04" x2="256.54" y2="66.04" width="0.1524" layer="91"/>
-<label x="246.38" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
-</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="U$7" gate="G$1" pin="GND"/>
@@ -4302,6 +4104,21 @@ Standard 0603 ceramic capacitor, and 0.1
 <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"/>
 </segment>
+<segment>
+<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="R2" 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="U$8" 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="C10" 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>
@@ -4389,6 +4206,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <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"/>
 </segment>
+<segment>
+<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>
@@ -4477,11 +4300,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <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"/>
 </segment>
-<segment>
-<pinref part="J1" gate="J" pin="MOSI"/>
-<wire x1="246.38" y1="58.42" x2="256.54" y2="58.42" width="0.1524" layer="91"/>
-<label x="246.38" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
 </net>
 <net name="D-" class="0">
 <segment>
@@ -4494,11 +4312,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <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"/>
 </segment>
-<segment>
-<pinref part="J1" gate="J" pin="\RST"/>
-<wire x1="246.38" y1="55.88" x2="256.54" y2="55.88" width="0.1524" layer="91"/>
-<label x="246.38" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
 </net>
 <net name="VUSB" class="0">
 <segment>
@@ -4511,11 +4324,6 @@ 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="256.54" y1="68.58" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
-<label x="246.38" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
@@ -4692,9 +4500,22 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
 </segment>
 <segment>
+<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="R2" 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="JP1" gate="G$1" pin="2"/>
-<wire x1="246.38" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
-<label x="246.38" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="C10" 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">
@@ -4704,34 +4525,39 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
 </segment>
 <segment>
+<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="JP1" gate="G$1" pin="1"/>
-<wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
-<label x="246.38" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+</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="246.38" y1="63.5" x2="256.54" y2="63.5" width="0.1524" layer="91"/>
-<label x="246.38" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-<segment>
 <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>
+<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="246.38" y1="60.96" x2="256.54" y2="60.96" width="0.1524" layer="91"/>
-<label x="246.38" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-<segment>
 <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>
+<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>
 </sheet>