diff --git a/hab.brd b/hab.brd
--- a/hab.brd
+++ b/hab.brd
@@ -23,20 +23,20 @@
 <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="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
@@ -58,7 +58,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="yes"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="1" visible="no" active="yes"/>
 <layer number="54" name="bGND_GNDA" color="7" fill="1" visible="no" active="yes"/>
@@ -207,9 +207,9 @@
 <text x="11.43" y="5.000625" size="0.8128" layer="22" font="vector" ratio="16" rot="MR0">vin</text>
 <text x="20.240625" y="1.27" size="0.8128" layer="22" ratio="16" rot="MR90">protofusion.org</text>
 <circle x="16.906875" y="7.3025" radius="0.079375" width="0.4064" layer="22"/>
-<circle x="12.620625" y="8.810625" radius="0.079375" width="0.4064" layer="21"/>
-<circle x="17.62125" y="14.9225" radius="0.079375" width="0.4064" layer="21"/>
-<circle x="10.080625" y="15.954375" radius="0.079375" width="0.4064" layer="21"/>
+<circle x="12.461875" y="9.128125" radius="0.079375" width="0.4064" layer="21"/>
+<circle x="17.541875" y="14.9225" radius="0.079375" width="0.4064" layer="21"/>
+<circle x="10.080625" y="15.478125" radius="0.079375" width="0.4064" layer="21"/>
 <text x="9.525" y="9.604375" size="0.762" layer="29" font="vector" ratio="16" rot="SR270">feather2</text>
 </plain>
 <libraries>
@@ -1182,21 +1182,21 @@ Please make sure your boards conform to 
 </autorouter>
 <elements>
 <element name="U1" library="Ava" package="QFN20+GNDPAD" value="SI4464" x="15.19" y="11.1325" rot="R90"/>
-<element name="C1" library="SparkFun" package="0402-CAP" value="100pF" x="19.140525" y="9.304925" smashed="yes">
-<attribute name="NAME" x="20.740525" y="9.504925" size="0.4064" layer="25"/>
-<attribute name="VALUE" x="20.740525" y="8.904925" size="0.4064" layer="27"/>
+<element name="C1" library="SparkFun" package="0402-CAP" value="100pF" x="19.37865" y="9.304925" smashed="yes">
+<attribute name="NAME" x="20.97865" y="9.504925" size="0.4064" layer="25"/>
+<attribute name="VALUE" x="20.97865" y="8.904925" size="0.4064" layer="27"/>
 </element>
-<element name="C2" library="SparkFun" package="0402-CAP" value="0.1uF" x="19.146875" y="10.5587" smashed="yes">
-<attribute name="NAME" x="20.746875" y="10.7587" size="0.4064" layer="25"/>
-<attribute name="VALUE" x="20.746875" y="10.1587" size="0.4064" layer="27"/>
+<element name="C2" library="SparkFun" package="0402-CAP" value="0.1uF" x="19.385" y="10.5587" smashed="yes">
+<attribute name="NAME" x="20.985" y="10.7587" size="0.4064" layer="25"/>
+<attribute name="VALUE" x="20.985" y="10.1587" size="0.4064" layer="27"/>
 </element>
-<element name="C3" library="SparkFun" package="0402-CAP" value="1uF" x="19.11195" y="11.845925" smashed="yes">
-<attribute name="NAME" x="20.71195" y="12.045925" size="0.4064" layer="25"/>
-<attribute name="VALUE" x="20.71195" y="11.445925" size="0.4064" layer="27"/>
+<element name="C3" library="SparkFun" package="0402-CAP" value="1uF" x="19.42945" y="11.845925" smashed="yes">
+<attribute name="NAME" x="21.02945" y="12.045925" size="0.4064" layer="25"/>
+<attribute name="VALUE" x="21.02945" y="11.445925" size="0.4064" layer="27"/>
 </element>
-<element name="C4" library="SparkFun" package="0402-CAP" value="15pF" x="11.41865" y="11.94365" smashed="yes" rot="R180">
-<attribute name="NAME" x="9.21865" y="11.54365" size="0.4064" layer="25" rot="R90"/>
-<attribute name="VALUE" x="9.81865" y="11.54365" size="0.4064" layer="27" rot="R90"/>
+<element name="C4" library="SparkFun" package="0402-CAP" value="15pF" x="11.41865" y="11.62615" smashed="yes" rot="R180">
+<attribute name="NAME" x="9.21865" y="11.22615" size="0.4064" layer="25" rot="R90"/>
+<attribute name="VALUE" x="9.81865" y="11.22615" size="0.4064" layer="27" rot="R90"/>
 </element>
 <element name="C0" library="SparkFun" package="0402-CAP" value="470pF" x="14.9994" y="8.057475" smashed="yes">
 <attribute name="NAME" x="13.6994" y="6.007475" size="0.4064" layer="25" rot="R270"/>
@@ -1226,8 +1226,8 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="17.7851" y="8.96985" size="0.4064" layer="25" rot="R90"/>
 <attribute name="VALUE" x="18.3851" y="8.96985" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="U2" library="picoAVA-R8" package="CRYSTAL_3.2X2.5-TCXO" value="CRYSTAL_3.2X2.5-TCXO" x="10.75875" y="15.2875" smashed="yes" rot="R270">
-<attribute name="NAME" x="11.40875" y="17.7375" size="1" layer="25" font="vector" ratio="12"/>
+<element name="U2" library="picoAVA-R8" package="CRYSTAL_3.2X2.5-TCXO" value="CRYSTAL_3.2X2.5-TCXO" x="10.75875" y="14.81125" smashed="yes" rot="R270">
+<attribute name="NAME" x="11.40875" y="17.26125" size="1" layer="25" font="vector" ratio="12"/>
 </element>
 <element name="R1" library="SparkFun" package="0402-RES" value="100k" x="11.375" y="10.14135" smashed="yes">
 <attribute name="NAME" x="8.525" y="10.34135" size="0.4064" layer="25"/>
@@ -1235,12 +1235,12 @@ Please make sure your boards conform to 
 </element>
 <element name="R2" library="SparkFun" package="0402-RES" value="100k" x="18.86135" y="13.0513" rot="R180"/>
 <element name="U$4" library="picoAVA-R9" package="AVA_JTI_ANTENNA-1575AT43A40" value="AVA_JTI_ANTENNA-1575AT43A40" x="4.7625" y="12.855575" rot="MR0"/>
-<element name="U5" library="picoAVA-R9" package="AVA_UBLOX_MAX-6" value="AVA_UBLOX_MAX-6" x="15.0749" y="16.129" rot="MR180"/>
+<element name="U7" library="picoAVA-R9" package="AVA_UBLOX_MAX-6" value="AVA_UBLOX_MAX-6" x="15.0749" y="16.129" rot="MR180"/>
 <element name="Q1" library="picoAVA-R9" package="SPARKFUN_SOT23-3" value="SPARKFUN_MOSFET-PCHANNELSMD" x="19.523075" y="4.13385" rot="R180"/>
 <element name="R4" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="100R" x="19.357975" y="18.926175"/>
 <element name="R5" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="10k" x="19.52625" y="6.50875"/>
 <element name="C7" library="picoAVA-R9" package="SPARKFUN_0402-CAP" value="0.1uF" x="19.20875" y="14.44625"/>
-<element name="U6" library="Protofusion" package="UFQFPN28" value="STM32F031G6U6" x="14.9225" y="17.618075" rot="R180"/>
+<element name="U6" library="Protofusion" package="UFQFPN28" value="STM32F031G6U6" x="14.843125" y="17.618075" rot="R180"/>
 <element name="CM1" library="SparkFun" package="0402-CAP" value="1.8pF" x="14.3002" y="3.16865" rot="R180"/>
 <element name="CM4" library="SparkFun" package="0402-CAP" value="4.7pF" x="12.0777" y="6.1849" rot="R90"/>
 <element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="16.51" y="1.27" rot="MR270"/>
@@ -1248,12 +1248,12 @@ Please make sure your boards conform to 
 <element name="C6" library="SparkFun" package="0805" value="47uF" x="14.843125" y="3.81" rot="MR180"/>
 <element name="L1" library="SparkFun-Passives" package="1210" value="LQH32CN100K33L" x="14.525625" y="9.445625" rot="MR0"/>
 <element name="C9" library="SparkFun" package="0805" value="47uF" x="18.176875" y="4.365625" rot="MR270"/>
-<element name="C5" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.556875" y="19.288125" rot="R180"/>
+<element name="C5" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.63625" y="18.89125" rot="R180"/>
 <element name="C8" library="SparkFun" package="0402-CAP" value="0.1uF" x="19.446875" y="16.66875" rot="R90"/>
 <element name="U$3" library="Protofusion" package="FEATHERHAB-ALPHA" value="" x="0.3175" y="12.22375"/>
-<element name="C10" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.556875" y="18.0975" rot="R180"/>
-<element name="LED1" library="adafruit" package="CHIPLED_0603" value="" x="10.715625" y="20.47875" rot="R90"/>
-<element name="R6" library="SLAT-RCL" package="R0402" value="" x="13.255625" y="20.47875"/>
+<element name="C10" library="SparkFun" package="0402-CAP" value="0.01uF" x="10.63625" y="17.541875" rot="R180"/>
+<element name="LED1" library="adafruit" package="CHIPLED_0603" value="" x="10.715625" y="20.558125" rot="R90"/>
+<element name="R6" library="SLAT-RCL" package="R0402" value="" x="13.255625" y="20.558125"/>
 <element name="TP1" library="testpad" package="TP08SQ" value="TPTP08SQ" x="18.7325" y="20.081875">
 <attribute name="TP_SIGNAL_NAME" value="" x="18.7325" y="20.081875" size="1.778" layer="27" display="off"/>
 </element>
@@ -1304,13 +1304,12 @@ Please make sure your boards conform to 
 <contactref element="CM" pad="2"/>
 <contactref element="U2" pad="2"/>
 <contactref element="U2" pad="2"/>
-<contactref element="U2" pad="1"/>
 <contactref element="R1" pad="1"/>
 <wire x1="14.69" y1="11.6325" x2="15.19" y2="11.1325" width="0.4064" layer="1"/>
 <contactref element="C7" pad="2"/>
-<contactref element="U5" pad="12_GND"/>
-<contactref element="U5" pad="10_GND"/>
-<contactref element="U5" pad="1_GND"/>
+<contactref element="U7" pad="12_GND"/>
+<contactref element="U7" pad="10_GND"/>
+<contactref element="U7" pad="1_GND"/>
 <via x="17.0053" y="6.740525" extent="1-16" drill="0.3302"/>
 <contactref element="U6" pad="16"/>
 <via x="14.208125" y="10.16" extent="1-16" drill="0.3302"/>
@@ -1335,12 +1334,7 @@ Please make sure your boards conform to 
 <via x="12.461875" y="19.52625" extent="1-16" drill="0.3302"/>
 <contactref element="TP3" pad="TP"/>
 <via x="15.71625" y="20.47875" extent="1-16" drill="0.3302"/>
-<wire x1="13.0725" y1="18.368075" x2="12.429425" y2="18.368075" width="0.254" layer="1"/>
-<wire x1="12.429425" y1="18.368075" x2="12.3825" y2="18.415" width="0.254" layer="1"/>
-<wire x1="12.3825" y1="18.415" x2="12.3825" y2="19.446875" width="0.254" layer="1"/>
 <wire x1="12.3825" y1="19.446875" x2="12.461875" y2="19.52625" width="0.254" layer="1"/>
-<wire x1="9.906875" y1="18.0975" x2="9.906875" y2="16.974375" width="0.4064" layer="1"/>
-<wire x1="9.906875" y1="16.974375" x2="10.07875" y2="16.8025" width="0.4064" layer="1"/>
 <contactref element="GND-1" pad="1"/>
 <contactref element="GND-2" pad="1"/>
 <contactref element="J3" pad="2"/>
@@ -1360,7 +1354,6 @@ Please make sure your boards conform to 
 <via x="12.468225" y="4.321175" extent="1-16" drill="0.3302"/>
 <via x="9.928225" y="4.5593" extent="1-16" drill="0.3302"/>
 <via x="16.83385" y="4.473575" extent="1-16" drill="0.3302"/>
-<via x="12.065" y="15.875" extent="1-16" drill="0.3302"/>
 <via x="12.065" y="14.76375" extent="1-16" drill="0.3302"/>
 <via x="10.9601" y="4.5593" extent="1-16" drill="0.3302"/>
 </signal>
@@ -1376,15 +1369,13 @@ Please make sure your boards conform to 
 <contactref element="R5" pad="1"/>
 <contactref element="U6" pad="17"/>
 <contactref element="U6" pad="5"/>
-<contactref element="U5" pad="6_V_BCKP"/>
+<contactref element="U7" pad="6_V_BCKP"/>
 <via x="20.16125" y="1.11125" extent="1-16" drill="0.3302"/>
-<wire x1="17.2725" y1="17.868075" x2="17.616" y2="17.868075" width="0.254" layer="1"/>
-<wire x1="17.616" y1="17.868075" x2="18.415" y2="17.069075" width="0.254" layer="1"/>
+<wire x1="17.193125" y1="17.868075" x2="17.616" y2="17.868075" width="0.254" layer="1"/>
 <wire x1="18.415" y1="17.069075" x2="18.415" y2="16.51" width="0.254" layer="1"/>
-<wire x1="15.95755" y1="18.792825" x2="14.4126" y2="18.792825" width="0.254" layer="1"/>
-<wire x1="13.0812" y1="17.859375" x2="13.0725" y2="17.868075" width="0.254" layer="1"/>
-<wire x1="17.2725" y1="17.868075" x2="16.8823" y2="17.868075" width="0.254" layer="1"/>
-<wire x1="16.8823" y1="17.868075" x2="15.95755" y2="18.792825" width="0.254" layer="1"/>
+<wire x1="15.878175" y1="18.792825" x2="14.333225" y2="18.792825" width="0.254" layer="1"/>
+<wire x1="13.001825" y1="17.859375" x2="12.993125" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="16.802925" y1="17.868075" x2="15.878175" y2="18.792825" width="0.254" layer="1"/>
 <contactref element="J1" pad="1"/>
 <via x="18.415" y="16.51" extent="1-16" drill="0.3302"/>
 <wire x1="20.0249" y1="15.079" x2="19.607875" y2="15.079" width="0.2032" layer="16"/>
@@ -1393,21 +1384,15 @@ Please make sure your boards conform to 
 <wire x1="18.970625" y1="15.319375" x2="18.811875" y2="15.478125" width="0.2032" layer="16"/>
 <wire x1="18.811875" y1="15.478125" x2="18.811875" y2="16.113125" width="0.2032" layer="16"/>
 <wire x1="18.811875" y1="16.113125" x2="18.415" y2="16.51" width="0.2032" layer="16"/>
-<wire x1="18.4175" y1="10.475" x2="18.415" y2="10.4775" width="0.2032" layer="1"/>
 <contactref element="U4" pad="3"/>
 <contactref element="C9" pad="1"/>
 <contactref element="C5" pad="1"/>
-<wire x1="14.4126" y1="18.792825" x2="13.48785" y2="17.868075" width="0.254" layer="1"/>
-<wire x1="13.48785" y1="17.868075" x2="13.0725" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="14.333225" y1="18.792825" x2="13.408475" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="13.408475" y1="17.868075" x2="12.993125" y2="17.868075" width="0.254" layer="1"/>
 <contactref element="C8" pad="1"/>
 <wire x1="19.446875" y1="16.01875" x2="18.90625" y2="16.01875" width="0.254" layer="1"/>
 <wire x1="18.90625" y1="16.01875" x2="18.415" y2="16.51" width="0.254" layer="1"/>
 <wire x1="18.573075" y1="5.13385" x2="18.573075" y2="1.588175" width="0.254" layer="1"/>
-<wire x1="13.0725" y1="17.868075" x2="12.297965625" y2="17.868075" width="0.254" layer="1"/>
-<wire x1="12.297965625" y1="17.868075" x2="11.90625" y2="18.259790625" width="0.254" layer="1"/>
-<wire x1="11.90625" y1="18.259790625" x2="11.90625" y2="19.129375" width="0.254" layer="1"/>
-<wire x1="11.90625" y1="19.129375" x2="11.7475" y2="19.288125" width="0.254" layer="1"/>
-<wire x1="11.7475" y1="19.288125" x2="11.206875" y2="19.288125" width="0.254" layer="1"/>
 <wire x1="18.573075" y1="5.13385" x2="18.6276" y2="5.13385" width="0.254" layer="1"/>
 <wire x1="18.6276" y1="5.13385" x2="18.811875" y2="5.318125" width="0.254" layer="1"/>
 <wire x1="18.811875" y1="5.318125" x2="18.811875" y2="6.444375" width="0.254" layer="1"/>
@@ -1420,27 +1405,10 @@ Please make sure your boards conform to 
 <wire x1="19.20875" y1="13.890625" x2="19.446875" y2="13.6525" width="0.254" layer="1"/>
 <wire x1="19.446875" y1="13.6525" x2="19.446875" y2="13.115775" width="0.254" layer="1"/>
 <wire x1="19.446875" y1="13.115775" x2="19.51135" y2="13.0513" width="0.254" layer="1"/>
-<wire x1="17.16" y1="11.1325" x2="17.561875" y2="11.1325" width="0.254" layer="1"/>
-<wire x1="17.561875" y1="11.1325" x2="17.93875" y2="11.509375" width="0.254" layer="1"/>
-<wire x1="17.93875" y1="11.509375" x2="18.1254" y2="11.509375" width="0.254" layer="1"/>
-<wire x1="18.1254" y1="11.509375" x2="18.46195" y2="11.845925" width="0.254" layer="1"/>
-<wire x1="18.46195" y1="11.845925" x2="18.46195" y2="10.593625" width="0.254" layer="1"/>
-<wire x1="18.46195" y1="10.593625" x2="18.496875" y2="10.5587" width="0.254" layer="1"/>
-<wire x1="17.16" y1="10.1325" x2="17.59375" y2="10.1325" width="0.254" layer="1"/>
-<wire x1="17.59375" y1="10.1325" x2="17.93875" y2="10.4775" width="0.254" layer="1"/>
-<wire x1="17.93875" y1="10.4775" x2="18.415" y2="10.4775" width="0.254" layer="1"/>
-<wire x1="18.415" y1="10.4775" x2="18.415675" y2="10.4775" width="0.254" layer="1"/>
 <wire x1="19.51135" y1="13.0513" x2="19.51135" y2="12.895325" width="0.254" layer="1"/>
-<wire x1="19.51135" y1="12.895325" x2="18.46195" y2="11.845925" width="0.254" layer="1"/>
-<wire x1="18.496875" y1="10.5587" x2="18.496875" y2="9.311275" width="0.3048" layer="1"/>
-<wire x1="18.496875" y1="9.311275" x2="18.490525" y2="9.304925" width="0.3048" layer="1"/>
 <wire x1="17.9351" y1="8.06985" x2="17.9351" y2="8.171975" width="0.3048" layer="1"/>
-<wire x1="17.9351" y1="8.171975" x2="18.0975" y2="8.334375" width="0.3048" layer="1"/>
-<wire x1="18.490525" y1="9.304925" x2="18.490525" y2="8.625275" width="0.3048" layer="1"/>
-<wire x1="18.490525" y1="8.625275" x2="17.9351" y2="8.06985" width="0.3048" layer="1"/>
-<wire x1="18.472475" y1="9.286875" x2="18.490525" y2="9.304925" width="0.3048" layer="1"/>
-<wire x1="15.24" y1="1.27" x2="15.24" y2="0.714375" width="0.2032" layer="16"/>
-<wire x1="15.24" y1="0.714375" x2="15.478125" y2="0.47625" width="0.2032" layer="16"/>
+<wire x1="15.24" y1="1.27" x2="15.24" y2="0.714375" width="0.254" layer="16"/>
+<wire x1="15.24" y1="0.714375" x2="15.478125" y2="0.47625" width="0.254" layer="16"/>
 <wire x1="15.795625" y1="5.4025" x2="16.02875" y2="5.4025" width="0.254" layer="16"/>
 <wire x1="16.02875" y1="5.4025" x2="16.1925" y2="5.23875" width="0.254" layer="16"/>
 <wire x1="16.1925" y1="5.23875" x2="18.15" y2="5.23875" width="0.254" layer="16"/>
@@ -1448,14 +1416,45 @@ Please make sure your boards conform to 
 <wire x1="18.176875" y1="5.265625" x2="17.93875" y2="5.50375" width="0.254" layer="16"/>
 <wire x1="17.93875" y1="5.50375" x2="17.93875" y2="6.746875" width="0.254" layer="16"/>
 <via x="17.93875" y="6.746875" extent="1-16" drill="0.381"/>
-<wire x1="18.46195" y1="10.593625" x2="18.415" y2="10.546675" width="0.254" layer="1"/>
-<wire x1="18.415" y1="10.546675" x2="18.415" y2="10.4775" width="0.254" layer="1"/>
 <wire x1="19.20875" y1="15.780625" x2="19.446875" y2="16.01875" width="0.254" layer="1"/>
 <wire x1="18.573075" y1="1.588175" x2="19.05" y2="1.11125" width="0.254" layer="1"/>
 <wire x1="19.05" y1="1.11125" x2="20.16125" y2="1.11125" width="0.254" layer="1"/>
 <wire x1="15.478125" y1="0.47625" x2="19.93674375" y2="0.47625" width="0.254" layer="16"/>
 <wire x1="19.93674375" y1="0.47625" x2="20.16125" y2="0.70075625" width="0.254" layer="16"/>
 <wire x1="20.16125" y1="0.70075625" x2="20.16125" y2="1.11125" width="0.254" layer="16"/>
+<contactref element="U2" pad="4"/>
+<contactref element="C10" pad="1"/>
+<wire x1="11.28625" y1="18.89125" x2="11.28625" y2="17.541875" width="0.254" layer="1"/>
+<wire x1="11.28625" y1="17.541875" x2="11.28625" y2="16.47875" width="0.254" layer="1"/>
+<wire x1="11.28625" y1="16.47875" x2="11.43875" y2="16.32625" width="0.254" layer="1"/>
+<wire x1="12.993125" y1="17.868075" x2="12.23245" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="12.23245" y1="17.868075" x2="11.90625" y2="17.541875" width="0.254" layer="1"/>
+<wire x1="11.90625" y1="17.541875" x2="11.28625" y2="17.541875" width="0.254" layer="1"/>
+<wire x1="17.193125" y1="17.868075" x2="16.802925" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="17.616" y1="17.868075" x2="18.415" y2="17.069075" width="0.254" layer="1"/>
+<wire x1="17.16" y1="11.1325" x2="17.720625" y2="11.1325" width="0.254" layer="1"/>
+<wire x1="17.720625" y1="11.1325" x2="18.176875" y2="11.58875" width="0.254" layer="1"/>
+<wire x1="18.176875" y1="11.58875" x2="18.522275" y2="11.58875" width="0.254" layer="1"/>
+<wire x1="18.522275" y1="11.58875" x2="18.77945" y2="11.845925" width="0.254" layer="1"/>
+<wire x1="17.16" y1="10.1325" x2="17.7525" y2="10.1325" width="0.254" layer="1"/>
+<wire x1="17.7525" y1="10.1325" x2="18.0975" y2="10.4775" width="0.254" layer="1"/>
+<wire x1="18.0975" y1="10.4775" x2="18.733175" y2="10.4775" width="0.254" layer="1"/>
+<wire x1="18.77945" y1="11.845925" x2="18.77945" y2="10.593625" width="0.254" layer="1"/>
+<wire x1="18.733175" y1="10.4775" x2="18.733175" y2="9.30945" width="0.254" layer="1"/>
+<wire x1="17.9351" y1="8.171975" x2="18.5701" y2="8.171975" width="0.254" layer="1"/>
+<wire x1="18.5701" y1="8.171975" x2="18.811875" y2="8.41375" width="0.254" layer="1"/>
+<wire x1="18.811875" y1="8.41375" x2="18.811875" y2="9.301075" width="0.254" layer="1"/>
+<wire x1="19.51135" y1="12.895325" x2="19.05" y2="12.433975" width="0.254" layer="1"/>
+<wire x1="19.05" y1="12.433975" x2="19.05" y2="12.303125" width="0.254" layer="1"/>
+<wire x1="19.05" y1="12.303125" x2="18.77945" y2="12.032575" width="0.254" layer="1"/>
+<wire x1="18.77945" y1="12.032575" x2="18.77945" y2="11.845925" width="0.254" layer="1"/>
+<wire x1="18.733175" y1="10.4775" x2="18.735" y2="10.479325" width="0.254" layer="1"/>
+<wire x1="18.735" y1="10.479325" x2="18.735" y2="10.5587" width="0.254" layer="1"/>
+<wire x1="18.77945" y1="10.593625" x2="18.744525" y2="10.5587" width="0.254" layer="1"/>
+<wire x1="18.744525" y1="10.5587" x2="18.735" y2="10.5587" width="0.254" layer="1"/>
+<wire x1="18.811875" y1="9.301075" x2="18.808025" y2="9.304925" width="0.254" layer="1"/>
+<wire x1="18.808025" y1="9.304925" x2="18.72865" y2="9.304925" width="0.254" layer="1"/>
+<wire x1="18.72865" y1="9.304925" x2="18.733175" y2="9.30945" width="0.254" layer="1"/>
 </signal>
 <signal name="RADIO-GPIO1">
 <contactref element="U1" pad="10"/>
@@ -1465,16 +1464,16 @@ Please make sure your boards conform to 
 <wire x1="17.16" y1="12.1325" x2="17.16" y2="13.0025" width="0.2032" layer="1"/>
 <wire x1="17.16" y1="13.0025" x2="17.145" y2="13.0175" width="0.2032" layer="1"/>
 <wire x1="17.16" y1="13.0025" x2="18.176875" y2="13.0025" width="0.2032" layer="1"/>
-<via x="14.868525" y="17.0815" extent="1-16" drill="0.3302"/>
+<via x="14.78915" y="17.0815" extent="1-16" drill="0.3302"/>
 <wire x1="18.176875" y1="13.0025" x2="18.4189" y2="13.0025" width="0.2032" layer="1"/>
-<wire x1="13.0725" y1="16.368075" x2="13.5328" y2="16.368075" width="0.2032" layer="1"/>
-<wire x1="13.5328" y1="16.368075" x2="14.246225" y2="17.0815" width="0.2032" layer="1"/>
-<wire x1="14.868525" y1="17.0815" x2="15.179675" y2="17.0815" width="0.2032" layer="16"/>
-<wire x1="15.179675" y1="17.0815" x2="17.5133" y2="14.747875" width="0.2032" layer="16"/>
-<wire x1="14.246225" y1="17.0815" x2="14.868525" y2="17.0815" width="0.2032" layer="1"/>
+<wire x1="12.993125" y1="16.368075" x2="13.453425" y2="16.368075" width="0.2032" layer="1"/>
+<wire x1="13.453425" y1="16.368075" x2="14.16685" y2="17.0815" width="0.2032" layer="1"/>
+<wire x1="14.78915" y1="17.0815" x2="15.105934375" y2="17.0815" width="0.2032" layer="16"/>
+<wire x1="15.105934375" y1="17.0815" x2="17.5133" y2="14.674134375" width="0.2032" layer="16"/>
+<wire x1="17.5133" y1="14.674134375" x2="17.5133" y2="13.3858" width="0.2032" layer="16"/>
+<wire x1="14.16685" y1="17.0815" x2="14.78915" y2="17.0815" width="0.2032" layer="1"/>
 <wire x1="18.21135" y1="13.0513" x2="18.21135" y2="12.968025" width="0.254" layer="1"/>
 <wire x1="18.21135" y1="12.968025" x2="18.176875" y2="13.0025" width="0.254" layer="1"/>
-<wire x1="17.5133" y1="14.747875" x2="17.5133" y2="13.3858" width="0.2032" layer="16"/>
 <wire x1="17.5133" y1="13.3858" x2="17.145" y2="13.0175" width="0.2032" layer="16"/>
 </signal>
 <signal name="RADIO-SHDN">
@@ -1484,16 +1483,16 @@ Please make sure your boards conform to 
 <wire x1="14.19" y1="9.1625" x2="11.7925" y2="9.1625" width="0.254" layer="1"/>
 <wire x1="12.025" y1="10.14135" x2="12.025" y2="10.04125" width="0.254" layer="1"/>
 <via x="11.7602" y="9.1948" extent="1-16" drill="0.3302"/>
-<via x="14.4018" y="17.872075" extent="1-16" drill="0.3302"/>
-<wire x1="13.0725" y1="16.868075" x2="13.3978" y2="16.868075" width="0.2032" layer="1"/>
-<wire x1="13.3978" y1="16.868075" x2="14.4018" y2="17.872075" width="0.2032" layer="1"/>
+<via x="14.322425" y="17.872075" extent="1-16" drill="0.3302"/>
+<wire x1="12.993125" y1="16.868075" x2="13.318425" y2="16.868075" width="0.2032" layer="1"/>
+<wire x1="13.318425" y1="16.868075" x2="14.322425" y2="17.872075" width="0.2032" layer="1"/>
 <wire x1="12.85875" y1="11.4046" x2="11.7602" y2="10.30605" width="0.2032" layer="16"/>
 <wire x1="11.7602" y1="10.30605" x2="11.7602" y2="9.1948" width="0.2032" layer="16"/>
 <wire x1="11.7925" y1="9.1625" x2="11.7602" y2="9.1948" width="0.254" layer="1"/>
 <wire x1="12.025" y1="10.14135" x2="11.7602" y2="9.87655" width="0.254" layer="1"/>
 <wire x1="11.7602" y1="9.87655" x2="11.7602" y2="9.1948" width="0.254" layer="1"/>
-<wire x1="14.4018" y1="17.872075" x2="13.335" y2="16.805275" width="0.2032" layer="16"/>
-<wire x1="13.335" y1="16.805275" x2="13.335" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="14.322425" y1="17.872075" x2="13.335" y2="16.88465" width="0.2032" layer="16"/>
+<wire x1="13.335" y1="16.88465" x2="13.335" y2="13.97" width="0.2032" layer="16"/>
 <wire x1="13.335" y1="13.97" x2="12.85875" y2="13.49375" width="0.2032" layer="16"/>
 <wire x1="12.85875" y1="13.49375" x2="12.85875" y2="11.4046" width="0.2032" layer="16"/>
 </signal>
@@ -1543,23 +1542,22 @@ Please make sure your boards conform to 
 <signal name="N$21">
 <contactref element="C4" pad="1"/>
 <contactref element="U1" pad="17"/>
-<wire x1="13.22" y1="11.6325" x2="12.37345" y2="11.6325" width="0.2032" layer="1"/>
-<wire x1="12.37345" y1="11.6325" x2="12.37345" y2="11.63885" width="0.2032" layer="1"/>
-<wire x1="12.37345" y1="11.63885" x2="12.06865" y2="11.94365" width="0.2032" layer="1"/>
+<wire x1="12.06865" y1="11.62615" x2="13.21365" y2="11.62615" width="0.254" layer="1"/>
+<wire x1="13.21365" y1="11.62615" x2="13.22" y2="11.6325" width="0.254" layer="1"/>
 </signal>
 <signal name="N$22">
 <contactref element="U2" pad="3"/>
 <contactref element="C4" pad="2"/>
-<wire x1="10.76865" y1="11.94365" x2="10.76865" y2="12.5149" width="0.254" layer="1"/>
-<wire x1="10.76865" y1="12.5149" x2="11.43" y2="13.17625" width="0.254" layer="1"/>
-<wire x1="11.43" y1="13.17625" x2="11.43" y2="13.76375" width="0.254" layer="1"/>
-<wire x1="11.43" y1="13.76375" x2="11.43875" y2="13.7725" width="0.254" layer="1"/>
+<wire x1="10.76865" y1="11.62615" x2="10.76865" y2="12.1974" width="0.254" layer="1"/>
+<wire x1="10.76865" y1="12.1974" x2="11.191875" y2="12.620625" width="0.254" layer="1"/>
+<wire x1="11.191875" y1="12.620625" x2="11.191875" y2="13.049375" width="0.254" layer="1"/>
+<wire x1="11.191875" y1="13.049375" x2="11.43875" y2="13.29625" width="0.254" layer="1"/>
 </signal>
 <signal name="N$4">
-<contactref element="U5" pad="9_V_RESET"/>
+<contactref element="U7" pad="9_V_RESET"/>
 <contactref element="Q1" pad="3"/>
-<contactref element="U5" pad="8_VCC"/>
-<contactref element="U5" pad="7_VCC_IO"/>
+<contactref element="U7" pad="8_VCC"/>
+<contactref element="U7" pad="7_VCC_IO"/>
 <contactref element="C7" pad="1"/>
 <via x="20.158075" y="2.066925" extent="1-16" drill="0.3302"/>
 <wire x1="20.716875" y1="2.625725" x2="20.716875" y2="9.36625" width="0.2032" layer="16"/>
@@ -1598,59 +1596,59 @@ Please make sure your boards conform to 
 <wire x1="18.44675" y1="17.935575" x2="19.674446875" y2="17.935575" width="0.2032" layer="1"/>
 <wire x1="19.674446875" y1="17.935575" x2="20.0025" y2="18.263628125" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="18.263628125" x2="20.0025" y2="18.93165" width="0.2032" layer="1"/>
-<wire x1="17.93875" y1="14.843125" x2="17.4625" y2="15.319375" width="0.2032" layer="16"/>
+<wire x1="17.93875" y1="14.843125" x2="17.383125" y2="15.39875" width="0.2032" layer="16"/>
 <wire x1="20.473075" y1="5.13385" x2="20.473075" y2="5.16505" width="0.254" layer="1"/>
 <wire x1="20.473075" y1="5.16505" x2="20.240625" y2="5.3975" width="0.254" layer="1"/>
 <wire x1="20.240625" y1="5.3975" x2="20.240625" y2="6.444375" width="0.254" layer="1"/>
 <wire x1="20.240625" y1="6.444375" x2="20.17625" y2="6.50875" width="0.254" layer="1"/>
 <wire x1="20.17625" y1="6.50875" x2="20.17625" y2="7.44625" width="0.254" layer="1"/>
 <wire x1="20.17625" y1="7.44625" x2="20.0025" y2="7.62" width="0.254" layer="1"/>
-<wire x1="17.4625" y1="15.319375" x2="17.4625" y2="16.951325" width="0.2032" layer="16"/>
-<wire x1="17.4625" y1="16.951325" x2="18.44675" y2="17.935575" width="0.2032" layer="16"/>
+<wire x1="17.383125" y1="15.39875" x2="17.383125" y2="16.87195" width="0.2032" layer="16"/>
+<wire x1="17.383125" y1="16.87195" x2="18.44675" y2="17.935575" width="0.2032" layer="16"/>
 <wire x1="20.0025" y1="19.000075" x2="20.0025" y2="18.93165" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="18.93165" x2="20.007975" y2="18.926175" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$7">
-<contactref element="U5" pad="11_RF_IN"/>
+<contactref element="U7" pad="11_RF_IN"/>
 <contactref element="U$4" pad="FEED"/>
 <wire x1="7.9375" y1="12.855575" x2="10.501475" y2="12.855575" width="0.254" layer="16"/>
 <wire x1="10.501475" y1="12.855575" x2="10.5249" y2="12.879" width="0.2032" layer="16"/>
 </signal>
 <signal name="TIMEPULSE">
-<contactref element="U5" pad="4_TIMEPULSE"/>
+<contactref element="U7" pad="4_TIMEPULSE"/>
 </signal>
 <signal name="GPS-RX">
-<contactref element="U5" pad="3_RXD1"/>
+<contactref element="U7" pad="3_RXD1"/>
 <contactref element="U6" pad="27"/>
-<via x="15.801975" y="17.39265" extent="1-16" drill="0.3302"/>
-<wire x1="15.801975" y1="17.39265" x2="15.80515" y2="17.39265" width="0.2032" layer="16"/>
-<wire x1="15.80515" y1="17.39265" x2="16.98625" y2="18.57375" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="18.57375" x2="19.20875" y2="18.57375" width="0.2032" layer="16"/>
+<via x="15.7226" y="17.39265" extent="1-16" drill="0.3302"/>
+<wire x1="15.7226" y1="17.39265" x2="15.725775" y2="17.39265" width="0.2032" layer="16"/>
+<wire x1="15.725775" y1="17.39265" x2="16.906875" y2="18.57375" width="0.2032" layer="16"/>
+<wire x1="16.906875" y1="18.57375" x2="19.20875" y2="18.57375" width="0.2032" layer="16"/>
 <wire x1="19.20875" y1="18.57375" x2="19.3675" y2="18.415" width="0.2032" layer="16"/>
 <wire x1="19.3675" y1="18.415" x2="19.9889" y2="18.415" width="0.2032" layer="16"/>
 <wire x1="19.9889" y1="18.415" x2="20.0249" y2="18.379" width="0.2032" layer="16"/>
-<wire x1="16.1725" y1="15.268075" x2="16.1725" y2="15.656875" width="0.2032" layer="1"/>
-<wire x1="16.1725" y1="15.656875" x2="15.875" y2="15.954375" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="15.954375" x2="15.875" y2="17.319625" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="17.319625" x2="15.801975" y2="17.39265" width="0.2032" layer="1"/>
+<wire x1="16.093125" y1="15.268075" x2="16.093125" y2="15.656875" width="0.2032" layer="1"/>
+<wire x1="16.093125" y1="15.656875" x2="15.795625" y2="15.954375" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="15.954375" x2="15.795625" y2="17.319625" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="17.319625" x2="15.7226" y2="17.39265" width="0.2032" layer="1"/>
 </signal>
 <signal name="GPS-TX">
-<contactref element="U5" pad="2_TXD1"/>
+<contactref element="U7" pad="2_TXD1"/>
 <contactref element="U6" pad="28"/>
-<via x="15.3289" y="18.170525" extent="1-16" drill="0.3302"/>
-<wire x1="16.6725" y1="15.268075" x2="16.6725" y2="15.5093" width="0.2032" layer="1"/>
-<wire x1="16.6725" y1="15.5093" x2="16.57985" y2="15.60195" width="0.2032" layer="1"/>
-<wire x1="16.57985" y1="15.60195" x2="16.57985" y2="17.548225" width="0.2032" layer="1"/>
-<wire x1="16.57985" y1="17.548225" x2="15.95755" y2="18.170525" width="0.2032" layer="1"/>
-<wire x1="15.95755" y1="18.170525" x2="15.3289" y2="18.170525" width="0.2032" layer="1"/>
-<wire x1="15.3289" y1="18.170525" x2="15.313025" y2="18.170525" width="0.2032" layer="16"/>
-<wire x1="15.313025" y1="18.170525" x2="16.6215" y2="19.479" width="0.2032" layer="16"/>
-<wire x1="20.0249" y1="19.479" x2="16.6215" y2="19.479" width="0.2032" layer="16"/>
+<via x="15.249525" y="18.170525" extent="1-16" drill="0.3302"/>
+<wire x1="16.593125" y1="15.268075" x2="16.593125" y2="15.5093" width="0.2032" layer="1"/>
+<wire x1="16.593125" y1="15.5093" x2="16.500475" y2="15.60195" width="0.2032" layer="1"/>
+<wire x1="16.500475" y1="15.60195" x2="16.500475" y2="17.548225" width="0.2032" layer="1"/>
+<wire x1="16.500475" y1="17.548225" x2="15.878175" y2="18.170525" width="0.2032" layer="1"/>
+<wire x1="15.878175" y1="18.170525" x2="15.249525" y2="18.170525" width="0.2032" layer="1"/>
+<wire x1="15.249525" y1="18.170525" x2="15.23365" y2="18.170525" width="0.2032" layer="16"/>
+<wire x1="15.23365" y1="18.170525" x2="16.542125" y2="19.479" width="0.2032" layer="16"/>
+<wire x1="20.0249" y1="19.479" x2="16.542125" y2="19.479" width="0.2032" layer="16"/>
 </signal>
 <signal name="GPS-EN">
 <contactref element="R4" pad="1"/>
 <contactref element="U6" pad="7"/>
-<wire x1="17.2725" y1="18.868075" x2="18.5705" y2="18.868075" width="0.2032" layer="1"/>
+<wire x1="17.193125" y1="18.868075" x2="18.5705" y2="18.868075" width="0.2032" layer="1"/>
 <wire x1="18.707975" y1="18.926175" x2="18.6286" y2="18.926175" width="0.2032" layer="1"/>
 <wire x1="18.6286" y1="18.926175" x2="18.5705" y2="18.868075" width="0.2032" layer="1"/>
 </signal>
@@ -1661,34 +1659,34 @@ Please make sure your boards conform to 
 <wire x1="14.69" y1="13.885" x2="14.605" y2="13.97" width="0.2032" layer="1"/>
 <via x="14.605" y="13.97" extent="1-16" drill="0.3302"/>
 <via x="15.875" y="14.443075" extent="1-16" drill="0.3302"/>
-<wire x1="15.6725" y1="15.268075" x2="15.6725" y2="14.645575" width="0.2032" layer="1"/>
-<wire x1="15.6725" y1="14.645575" x2="15.875" y2="14.443075" width="0.2032" layer="1"/>
+<wire x1="15.593125" y1="14.72495" x2="15.875" y2="14.443075" width="0.2032" layer="1"/>
 <wire x1="14.605" y1="13.97" x2="15.401925" y2="13.97" width="0.2032" layer="16"/>
 <wire x1="15.401925" y1="13.97" x2="15.875" y2="14.443075" width="0.2032" layer="16"/>
+<wire x1="15.593125" y1="14.72495" x2="15.593125" y2="15.268075" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-MISO">
 <contactref element="U6" pad="25"/>
 <contactref element="U1" pad="13"/>
 <wire x1="15.179675" y1="13.65885" x2="15.24" y2="13.719175" width="0.2032" layer="1"/>
 <wire x1="15.24" y1="13.719175" x2="15.24" y2="14.2875" width="0.2032" layer="1"/>
-<wire x1="15.24" y1="14.2875" x2="15.19" y2="14.3375" width="0.2032" layer="1"/>
 <wire x1="15.19" y1="13.1025" x2="15.179675" y2="13.112825" width="0.2032" layer="1"/>
 <wire x1="15.179675" y1="13.112825" x2="15.179675" y2="13.65885" width="0.2032" layer="1"/>
-<wire x1="15.1725" y1="15.268075" x2="15.19" y2="15.250575" width="0.2032" layer="1"/>
-<wire x1="15.19" y1="15.250575" x2="15.19" y2="14.3375" width="0.2032" layer="1"/>
+<wire x1="15.093125" y1="15.268075" x2="15.110625" y2="15.250575" width="0.2032" layer="1"/>
+<wire x1="15.24" y1="14.2875" x2="15.093125" y2="14.434375" width="0.2032" layer="1"/>
+<wire x1="15.093125" y1="14.434375" x2="15.093125" y2="15.268075" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-SCK">
 <contactref element="U6" pad="24"/>
 <contactref element="U1" pad="12"/>
-<via x="15.179675" y="16.14805" extent="1-16" drill="0.3302"/>
+<via x="15.1003" y="16.14805" extent="1-16" drill="0.3302"/>
 <via x="16.8275" y="14.131925" extent="1-16" drill="0.3302"/>
 <wire x1="15.69" y1="13.1025" x2="15.69" y2="13.70245" width="0.2032" layer="1"/>
 <wire x1="15.69" y1="13.70245" x2="15.801975" y2="13.814425" width="0.2032" layer="1"/>
 <wire x1="15.801975" y1="13.814425" x2="16.51" y2="13.814425" width="0.2032" layer="1"/>
-<wire x1="16.8275" y1="14.131925" x2="16.8275" y2="14.500225" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="14.500225" x2="15.179675" y2="16.14805" width="0.2032" layer="16"/>
-<wire x1="14.6725" y1="15.268075" x2="14.6725" y2="15.640875" width="0.2032" layer="1"/>
-<wire x1="14.6725" y1="15.640875" x2="15.179675" y2="16.14805" width="0.2032" layer="1"/>
+<wire x1="16.8275" y1="14.131925" x2="16.8275" y2="14.42085" width="0.2032" layer="16"/>
+<wire x1="16.8275" y1="14.42085" x2="15.1003" y2="16.14805" width="0.2032" layer="16"/>
+<wire x1="14.593125" y1="15.268075" x2="14.593125" y2="15.640875" width="0.2032" layer="1"/>
+<wire x1="14.593125" y1="15.640875" x2="15.1003" y2="16.14805" width="0.2032" layer="1"/>
 <wire x1="16.51" y1="13.814425" x2="16.8275" y2="14.131925" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-NSS">
@@ -1697,17 +1695,16 @@ Please make sure your boards conform to 
 <wire x1="14.19" y1="13.1025" x2="14.19" y2="13.4325" width="0.2032" layer="1"/>
 <wire x1="14.19" y1="13.4325" x2="13.97" y2="13.6525" width="0.2032" layer="1"/>
 <wire x1="13.97" y1="13.6525" x2="13.97" y2="14.2875" width="0.2032" layer="1"/>
-<wire x1="13.97" y1="14.2875" x2="14.19" y2="14.5075" width="0.2032" layer="1"/>
-<wire x1="14.19" y1="14.5075" x2="14.19" y2="15.250575" width="0.2032" layer="1"/>
-<wire x1="14.19" y1="15.250575" x2="14.1725" y2="15.268075" width="0.2032" layer="1"/>
+<wire x1="14.110625" y1="15.250575" x2="14.093125" y2="15.268075" width="0.2032" layer="1"/>
+<wire x1="13.97" y1="14.2875" x2="14.093125" y2="14.410625" width="0.2032" layer="1"/>
+<wire x1="14.093125" y1="14.410625" x2="14.093125" y2="15.268075" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWCLK">
 <contactref element="U6" pad="22"/>
 <via x="13.49375" y="13.096875" extent="1-16" drill="0.3302"/>
 <contactref element="J1" pad="3"/>
 <wire x1="13.731875" y1="12.85875" x2="15.319375" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="15.319375" y1="12.85875" x2="16.906875" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="16.906875" y1="11.27125" x2="18.89125" y2="9.286875" width="0.2032" layer="16"/>
+<wire x1="15.319375" y1="12.85875" x2="18.89125" y2="9.286875" width="0.2032" layer="16"/>
 <wire x1="18.89125" y1="9.286875" x2="18.89125" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="18.89125" y1="7.14375" x2="19.923125" y2="6.111875" width="0.2032" layer="16"/>
 <wire x1="19.923125" y1="6.111875" x2="19.923125" y2="3.413125" width="0.2032" layer="16"/>
@@ -1715,26 +1712,25 @@ Please make sure your boards conform to 
 <wire x1="17.78" y1="1.905" x2="17.78" y2="1.27" width="0.2032" layer="16"/>
 <wire x1="19.923125" y1="3.413125" x2="18.653125" y2="2.143125" width="0.2032" layer="16"/>
 <wire x1="18.018125" y1="2.143125" x2="18.653125" y2="2.143125" width="0.2032" layer="16"/>
-<wire x1="13.6725" y1="15.268075" x2="13.6725" y2="14.625" width="0.2032" layer="1"/>
-<wire x1="13.6725" y1="14.625" x2="13.49375" y2="14.44625" width="0.2032" layer="1"/>
 <wire x1="13.49375" y1="14.44625" x2="13.49375" y2="13.096875" width="0.2032" layer="1"/>
 <wire x1="13.731875" y1="12.85875" x2="13.49375" y2="13.096875" width="0.2032" layer="16"/>
+<wire x1="13.49375" y1="14.44625" x2="13.593125" y2="14.545625" width="0.2032" layer="1"/>
+<wire x1="13.593125" y1="14.545625" x2="13.593125" y2="15.268075" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U6" pad="21"/>
-<via x="14.246225" y="16.14805" extent="1-16" drill="0.3302"/>
-<wire x1="13.0725" y1="15.868075" x2="13.499525" y2="15.868075" width="0.2032" layer="1"/>
-<wire x1="13.499525" y1="15.868075" x2="13.623925" y2="15.992475" width="0.2032" layer="1"/>
-<wire x1="13.623925" y1="15.992475" x2="14.09065" y2="15.992475" width="0.2032" layer="1"/>
-<wire x1="14.09065" y1="15.992475" x2="14.246225" y2="16.14805" width="0.2032" layer="1"/>
+<via x="14.16685" y="16.14805" extent="1-16" drill="0.3302"/>
+<wire x1="12.993125" y1="15.868075" x2="13.42015" y2="15.868075" width="0.2032" layer="1"/>
+<wire x1="13.42015" y1="15.868075" x2="13.54455" y2="15.992475" width="0.2032" layer="1"/>
+<wire x1="13.54455" y1="15.992475" x2="14.011275" y2="15.992475" width="0.2032" layer="1"/>
+<wire x1="14.011275" y1="15.992475" x2="14.16685" y2="16.14805" width="0.2032" layer="1"/>
 <contactref element="J1" pad="4"/>
 <wire x1="14.319496875" y1="13.255625" x2="15.5575" y2="13.255625" width="0.2032" layer="16"/>
-<wire x1="15.5575" y1="13.255625" x2="17.30375" y2="11.509375" width="0.2032" layer="16"/>
-<wire x1="14.319496875" y1="13.255625" x2="13.81125" y2="13.763871875" width="0.2032" layer="16"/>
-<wire x1="13.81125" y1="13.763871875" x2="13.81125" y2="15.71625" width="0.2032" layer="16"/>
-<wire x1="13.81125" y1="15.71625" x2="14.246225" y2="16.151225" width="0.2032" layer="16"/>
-<wire x1="14.246225" y1="16.151225" x2="14.246225" y2="16.14805" width="0.2032" layer="16"/>
-<wire x1="17.30375" y1="11.509375" x2="19.288125" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="14.319496875" y1="13.255625" x2="13.731875" y2="13.843246875" width="0.2032" layer="16"/>
+<wire x1="13.731875" y1="13.843246875" x2="13.731875" y2="15.71625" width="0.2032" layer="16"/>
+<wire x1="13.731875" y1="15.71625" x2="14.16685" y2="16.151225" width="0.2032" layer="16"/>
+<wire x1="14.16685" y1="16.151225" x2="14.16685" y2="16.14805" width="0.2032" layer="16"/>
+<wire x1="15.5575" y1="13.255625" x2="19.288125" y2="9.525" width="0.2032" layer="16"/>
 <wire x1="19.288125" y1="9.525" x2="19.288125" y2="7.3025" width="0.2032" layer="16"/>
 <wire x1="19.288125" y1="7.3025" x2="20.32" y2="6.270625" width="0.2032" layer="16"/>
 <wire x1="20.32" y1="6.270625" x2="20.32" y2="3.254375" width="0.2032" layer="16"/>
@@ -1801,64 +1797,53 @@ Please make sure your boards conform to 
 <vertex x="14.843125" y="9.604375"/>
 </polygon>
 </signal>
-<signal name="TCXO-POWER">
-<contactref element="U6" pad="18"/>
-<contactref element="U2" pad="4"/>
-<contactref element="C10" pad="1"/>
-<wire x1="11.206875" y1="18.0975" x2="11.206875" y2="17.034375" width="0.254" layer="1"/>
-<wire x1="11.206875" y1="17.034375" x2="11.43875" y2="16.8025" width="0.254" layer="1"/>
-<wire x1="13.0725" y1="17.368075" x2="12.446825" y2="17.368075" width="0.254" layer="1"/>
-<wire x1="12.446825" y1="17.368075" x2="12.065" y2="16.98625" width="0.254" layer="1"/>
-<wire x1="12.065" y1="16.98625" x2="11.6225" y2="16.98625" width="0.254" layer="1"/>
-<wire x1="11.6225" y1="16.98625" x2="11.43875" y2="16.8025" width="0.254" layer="1"/>
-</signal>
 <signal name="N$2">
 <contactref element="LED1" pad="A"/>
 <contactref element="R6" pad="1"/>
-<wire x1="12.655625" y1="20.47875" x2="11.465625" y2="20.47875" width="0.254" layer="1"/>
+<wire x1="12.655625" y1="20.558125" x2="11.465625" y2="20.558125" width="0.254" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="U6" pad="14"/>
 <contactref element="R6" pad="2"/>
-<wire x1="13.6725" y1="19.468075" x2="13.6725" y2="20.295625" width="0.254" layer="1"/>
-<wire x1="13.6725" y1="20.295625" x2="13.855625" y2="20.47875" width="0.254" layer="1"/>
+<wire x1="13.593125" y1="19.468075" x2="13.593125" y2="20.295625" width="0.254" layer="1"/>
+<wire x1="13.593125" y1="20.295625" x2="13.855625" y2="20.558125" width="0.254" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="U6" pad="8"/>
 <contactref element="TP1" pad="TP"/>
-<wire x1="16.6725" y1="19.468075" x2="16.66875" y2="19.464325" width="0.2032" layer="1"/>
-<wire x1="16.66875" y1="19.464325" x2="16.66875" y2="19.288125" width="0.2032" layer="1"/>
-<wire x1="16.66875" y1="19.288125" x2="17.859375" y2="19.288125" width="0.2032" layer="1"/>
+<wire x1="16.593125" y1="19.468075" x2="16.589375" y2="19.464325" width="0.2032" layer="1"/>
+<wire x1="16.589375" y1="19.464325" x2="16.589375" y2="19.288125" width="0.2032" layer="1"/>
+<wire x1="16.589375" y1="19.288125" x2="17.859375" y2="19.288125" width="0.2032" layer="1"/>
 <wire x1="18.7325" y1="20.081875" x2="18.653125" y2="20.081875" width="0.2032" layer="1"/>
 <wire x1="18.653125" y1="20.081875" x2="17.859375" y2="19.288125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="U6" pad="9"/>
 <contactref element="TP2" pad="TP"/>
-<wire x1="16.1725" y1="19.468075" x2="16.1725" y2="20.061875" width="0.2032" layer="1"/>
-<wire x1="16.1725" y1="20.061875" x2="16.35125" y2="20.240625" width="0.2032" layer="1"/>
-<wire x1="16.35125" y1="20.240625" x2="17.30375" y2="20.240625" width="0.2032" layer="1"/>
-<wire x1="17.30375" y1="20.240625" x2="17.4625" y2="20.081875" width="0.2032" layer="1"/>
+<wire x1="16.093125" y1="19.468075" x2="16.093125" y2="19.9825" width="0.2032" layer="1"/>
+<wire x1="16.093125" y1="19.9825" x2="16.271875" y2="20.16125" width="0.2032" layer="1"/>
+<wire x1="16.271875" y1="20.16125" x2="17.383125" y2="20.16125" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="20.16125" x2="17.4625" y2="20.081875" width="0.2032" layer="1"/>
 </signal>
 <signal name="VBATT_SENSE">
 <contactref element="R3" pad="1"/>
 <contactref element="R7" pad="2"/>
 <contactref element="CM3" pad="1"/>
 <contactref element="U6" pad="12"/>
-<wire x1="14.6725" y1="19.468075" x2="14.6725" y2="20.308125" width="0.2032" layer="1"/>
-<wire x1="14.6725" y1="20.308125" x2="14.843125" y2="20.47875" width="0.2032" layer="1"/>
 <via x="14.843125" y="20.47875" extent="1-16" drill="0.3302"/>
 <wire x1="14.843125" y1="20.47875" x2="12.85875" y2="18.494375" width="0.2032" layer="16"/>
-<wire x1="12.461875" y1="11.58875" x2="11.1125" y2="10.239375" width="0.2032" layer="16"/>
-<wire x1="11.1125" y1="10.239375" x2="11.1125" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="12.461875" y1="11.58875" x2="10.065625" y2="9.1925" width="0.2032" layer="16"/>
 <wire x1="10.195" y1="5.55625" x2="10.195" y2="6.6675" width="0.2032" layer="16"/>
 <wire x1="10.195" y1="6.6675" x2="10.195" y2="7.72875" width="0.2032" layer="16"/>
 <wire x1="10.195" y1="7.72875" x2="10.065625" y2="7.858125" width="0.2032" layer="16"/>
-<wire x1="10.065625" y1="7.858125" x2="10.065625" y2="8.954375" width="0.2032" layer="16"/>
-<wire x1="10.065625" y1="8.954375" x2="11.1125" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="10.065625" y1="7.858125" x2="10.065625" y2="9.1925" width="0.2032" layer="16"/>
 <wire x1="12.85875" y1="18.494375" x2="12.85875" y2="14.208125" width="0.2032" layer="16"/>
 <wire x1="12.85875" y1="14.208125" x2="12.461875" y2="13.81125" width="0.2032" layer="16"/>
 <wire x1="12.461875" y1="13.81125" x2="12.461875" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="14.843125" y1="20.47875" x2="14.843125" y2="20.240625" width="0.254" layer="1"/>
+<wire x1="14.843125" y1="20.240625" x2="14.605" y2="20.0025" width="0.254" layer="1"/>
+<wire x1="14.605" y1="20.0025" x2="14.605" y2="19.47995" width="0.254" layer="1"/>
+<wire x1="14.605" y1="19.47995" x2="14.593125" y2="19.468075" width="0.254" layer="1"/>
 </signal>
 <signal name="VBATT">
 <contactref element="R3" pad="2"/>
@@ -1898,8 +1883,8 @@ Please make sure your boards conform to 
 <polygon width="0" layer="1" pour="cutout">
 <vertex x="10.4775" y="13.17625"/>
 <vertex x="10.95375" y="13.17625"/>
-<vertex x="10.95375" y="14.12875"/>
-<vertex x="10.4775" y="14.12875"/>
+<vertex x="10.95375" y="13.890625"/>
+<vertex x="10.4775" y="13.890625"/>
 </polygon>
 </signal>
 <signal name="N$23">
@@ -1926,6 +1911,18 @@ Please make sure your boards conform to 
 <vertex x="13.335" y="21.9075"/>
 </polygon>
 </signal>
+<signal name="TCXO-EN">
+<contactref element="U2" pad="1"/>
+<contactref element="U6" pad="18"/>
+<wire x1="12.993125" y1="17.368075" x2="12.446825" y2="17.368075" width="0.254" layer="1"/>
+<wire x1="12.446825" y1="17.368075" x2="12.303125" y2="17.224375" width="0.254" layer="1"/>
+<wire x1="12.303125" y1="17.224375" x2="12.303125" y2="15.71625" width="0.254" layer="1"/>
+<wire x1="12.303125" y1="15.71625" x2="12.065" y2="15.478125" width="0.254" layer="1"/>
+<wire x1="12.065" y1="15.478125" x2="10.31875" y2="15.478125" width="0.254" layer="1"/>
+<wire x1="10.31875" y1="15.478125" x2="10.080625" y2="15.71625" width="0.254" layer="1"/>
+<wire x1="10.080625" y1="15.71625" x2="10.080625" y2="16.324375" width="0.254" layer="1"/>
+<wire x1="10.080625" y1="16.324375" x2="10.07875" y2="16.32625" width="0.254" layer="1"/>
+</signal>
 </signals>
 <errors>
 <approved hash="19,1,3a880b1c173c26a8"/>