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="no" 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="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"/>
@@ -209,6 +209,7 @@
 <circle x="13.97" y="8.969375" 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"/>
+<text x="17.145" y="24.13" size="1.778" layer="1">TODO: Add pins 8/9 serial port to pads</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -1112,7 +1113,7 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="U$1" library="Ava" package="QFN20+GNDPAD" value="SI4464" x="15.19" y="11.1325" rot="R90"/>
+<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.06115" y="9.146175" smashed="yes">
 <attribute name="NAME" x="20.66115" y="9.346175" size="0.4064" layer="25"/>
 <attribute name="VALUE" x="20.66115" y="8.746175" size="0.4064" layer="27"/>
@@ -1157,7 +1158,7 @@ design rules under a new name.</descript
 <attribute name="NAME" x="17.7851" y="9.049225" size="0.4064" layer="25" rot="R90"/>
 <attribute name="VALUE" x="18.3851" y="9.049225" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="U$2" library="picoAVA-R8" package="CRYSTAL_3.2X2.5-TCXO" value="CRYSTAL_3.2X2.5-TCXO" x="11.155625" y="15.2875" smashed="yes" rot="R270">
+<element name="U2" library="picoAVA-R8" package="CRYSTAL_3.2X2.5-TCXO" value="CRYSTAL_3.2X2.5-TCXO" x="11.155625" y="15.2875" smashed="yes" rot="R270">
 <attribute name="NAME" x="11.805625" y="17.7375" size="1" layer="25" font="vector" ratio="12"/>
 </element>
 <element name="R1" library="SparkFun" package="0402-RES" value="100k" x="11.375" y="9.50635" smashed="yes">
@@ -1165,21 +1166,21 @@ design rules under a new name.</descript
 <attribute name="VALUE" x="8.525" y="9.10635" size="0.4064" layer="27"/>
 </element>
 <element name="R2" library="SparkFun" package="0402-RES" value="100k" x="18.86135" y="12.89255" rot="R180"/>
-<element name="PAD1" library="wirepad" package="SMD1,27-2,54" value="" x="15.090775" y="1.58115"/>
-<element name="PAD2" library="wirepad" package="SMD1,27-2,54" value="" x="16.69415" y="1.56845"/>
-<element name="PAD3" library="wirepad" package="SMD1,27-2,54" value="" x="13.48105" y="1.56845"/>
+<element name="ANT" library="wirepad" package="SMD1,27-2,54" value="" x="15.090775" y="1.58115"/>
+<element name="GND-2" library="wirepad" package="SMD1,27-2,54" value="" x="16.69415" y="1.56845"/>
+<element name="GND-1" library="wirepad" package="SMD1,27-2,54" value="" x="13.48105" y="1.56845"/>
 <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="U$5" library="picoAVA-R9" package="AVA_UBLOX_MAX-6" value="AVA_UBLOX_MAX-6" x="15.0749" y="16.129" rot="MR180"/>
+<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="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="19.243675"/>
 <element name="R5" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="10k" x="19.685" y="6.35"/>
 <element name="C7" library="picoAVA-R9" package="SPARKFUN_0402-CAP" value="0.1uF" x="19.20875" y="14.2875"/>
-<element name="U$6" 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.9225" y="17.618075" rot="R180"/>
 <element name="CM1" library="SparkFun" package="0402-CAP" value="1.8pF" x="14.3002" y="3.565525" rot="R180"/>
 <element name="CM4" library="SparkFun" package="0402-CAP" value="4.7pF" x="12.0777" y="6.34365" rot="R90"/>
 <element name="PAD4" library="wirepad" package="SMD1,27-2,54" value="" x="19.288125" y="3.96875" rot="MR90"/>
 <element name="PAD5" library="wirepad" package="SMD1,27-2,54" value="" x="19.288125" y="6.429375" rot="MR90"/>
-<element name="U$7" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="16.1925" y="1.5875" rot="MR90"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="16.1925" y="1.5875" rot="MR90"/>
 <element name="U4" library="Protofusion" package="TSOT23-6" value="LTC3531-3.3" x="15.875" y="6.905625" rot="MR180"/>
 <element name="C6" library="SparkFun" package="0402-CAP" value="2.2uF" x="14.76375" y="3.96875" rot="MR0"/>
 <element name="L1" library="SparkFun-Passives" package="1210" value="LQH32CN100K33L" x="12.3825" y="6.82625" rot="MR270"/>
@@ -1212,31 +1213,31 @@ design rules under a new name.</descript
 <vertex x="28.57" y="-14.9225"/>
 <vertex x="9.2075" y="-15.24"/>
 </polygon>
-<contactref element="U$1" pad="21"/>
-<contactref element="U$1" pad="18"/>
+<contactref element="U1" pad="21"/>
+<contactref element="U1" pad="18"/>
 <contactref element="C3" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C1" pad="2"/>
 <contactref element="CM2" pad="2"/>
 <contactref element="CM" pad="2"/>
-<contactref element="U$2" pad="2"/>
-<contactref element="U$2" pad="2"/>
-<contactref element="U$2" pad="1"/>
+<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="PAD2" pad="1"/>
-<contactref element="PAD3" pad="1"/>
+<contactref element="GND-2" pad="1"/>
+<contactref element="GND-1" pad="1"/>
 <contactref element="C7" pad="2"/>
-<contactref element="U$5" pad="12_GND"/>
-<contactref element="U$5" pad="10_GND"/>
-<contactref element="U$5" pad="1_GND"/>
+<contactref element="U5" pad="12_GND"/>
+<contactref element="U5" pad="10_GND"/>
+<contactref element="U5" pad="1_GND"/>
 <via x="17.3228" y="7.1374" extent="1-16" drill="0.381"/>
 <via x="11.198225" y="4.08305" extent="1-16" drill="0.381"/>
-<contactref element="U$6" pad="16"/>
+<contactref element="U6" pad="16"/>
 <via x="15.24" y="11.1125" extent="1-16" drill="0.381"/>
 <contactref element="PAD4" pad="1"/>
 <via x="17.145" y="20.6375" extent="1-16" drill="0.381"/>
-<contactref element="U$7" pad="2"/>
+<contactref element="J1" pad="2"/>
 <via x="9.8806" y="10.4521" extent="1-16" drill="0.381"/>
 <contactref element="U4" pad="2"/>
 <contactref element="C6" pad="2"/>
@@ -1288,34 +1289,32 @@ design rules under a new name.</descript
 <contactref element="C1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="C3" pad="1"/>
-<contactref element="U$1" pad="8"/>
-<contactref element="U$1" pad="6"/>
-<contactref element="U$2" pad="4"/>
+<contactref element="U1" pad="8"/>
+<contactref element="U1" pad="6"/>
+<contactref element="U2" pad="4"/>
 <contactref element="R2" pad="1"/>
 <wire x1="17.16" y1="10.1325" x2="18.4175" y2="10.1325" width="0.254" layer="1"/>
 <wire x1="18.4175" y1="10.1325" x2="18.4175" y2="10.320575" width="0.254" layer="1"/>
 <contactref element="Q1" pad="2"/>
 <contactref element="R5" pad="1"/>
-<contactref element="U$6" pad="17"/>
-<contactref element="U$6" pad="5"/>
+<contactref element="U6" pad="17"/>
+<contactref element="U6" pad="5"/>
 <wire x1="17.16" y1="11.1325" x2="18.1454" y2="11.1325" width="0.254" layer="1"/>
 <wire x1="18.1454" y1="11.1325" x2="18.46195" y2="11.44905" width="0.254" layer="1"/>
-<contactref element="U$5" pad="6_V_BCKP"/>
+<contactref element="U5" pad="6_V_BCKP"/>
 <wire x1="17.16" y1="11.1325" x2="18.1175" y2="11.1325" width="0.254" layer="1"/>
 <wire x1="18.1175" y1="11.1325" x2="18.415" y2="11.43" width="0.254" layer="1"/>
 <wire x1="18.415" y1="11.43" x2="18.415" y2="10.4775" width="0.254" layer="1"/>
 <wire x1="18.415" y1="10.4775" x2="18.415" y2="10.1675" width="0.254" layer="1"/>
 <wire x1="18.4175" y1="10.1325" x2="18.4175" y2="9.152525" width="0.254" layer="1"/>
 <wire x1="18.4175" y1="9.152525" x2="18.41115" y2="9.146175" width="0.254" layer="1"/>
-<wire x1="18.573075" y1="5.13385" x2="18.573075" y2="5.888075" width="0.3048" layer="1"/>
-<wire x1="18.573075" y1="5.888075" x2="19.035" y2="6.35" width="0.3048" layer="1"/>
 <via x="20.6375" y="1.5875" extent="1-16" drill="0.381"/>
 <wire x1="17.2725" y1="17.868075" x2="17.691925" y2="17.868075" 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"/>
-<contactref element="U$7" pad="1"/>
+<contactref element="J1" pad="1"/>
 <via x="18.415" y="16.51" extent="1-16" drill="0.381"/>
 <wire x1="17.691925" y1="17.868075" x2="18.415" y2="17.145" width="0.254" layer="1"/>
 <wire x1="18.415" y1="17.145" x2="18.415" y2="16.51" width="0.254" layer="1"/>
@@ -1370,11 +1369,15 @@ design rules under a new name.</descript
 <wire x1="19.3675" y1="12.7487" x2="19.51135" y2="12.89255" width="0.254" layer="1"/>
 <wire x1="18.46195" y1="11.44905" x2="18.46195" y2="11.57435" width="0.254" layer="1"/>
 <wire x1="18.46195" y1="11.57435" x2="18.431275" y2="11.605025" width="0.254" layer="1"/>
+<wire x1="19.035" y1="6.35" x2="19.035" y2="6.255625" width="0.254" layer="1"/>
+<wire x1="19.035" y1="6.255625" x2="18.811875" y2="6.0325" width="0.254" layer="1"/>
+<wire x1="18.811875" y1="6.0325" x2="18.811875" y2="5.37265" width="0.254" layer="1"/>
+<wire x1="18.811875" y1="5.37265" x2="18.573075" y2="5.13385" width="0.254" layer="1"/>
 </signal>
 <signal name="RADIO-GPIO1">
-<contactref element="U$1" pad="10"/>
+<contactref element="U1" pad="10"/>
 <contactref element="R2" pad="2"/>
-<contactref element="U$6" pad="20"/>
+<contactref element="U6" pad="20"/>
 <via x="17.145" y="13.0175" extent="1-16" drill="0.381"/>
 <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"/>
@@ -1395,9 +1398,9 @@ design rules under a new name.</descript
 <wire x1="18.21135" y1="12.968025" x2="18.176875" y2="13.0025" width="0.254" layer="1"/>
 </signal>
 <signal name="RADIO-SHDN">
-<contactref element="U$1" pad="1"/>
+<contactref element="U1" pad="1"/>
 <contactref element="R1" pad="2"/>
-<contactref element="U$6" pad="19"/>
+<contactref element="U6" pad="19"/>
 <wire x1="14.19" y1="9.1625" x2="12.36885" y2="9.1625" width="0.254" layer="1"/>
 <wire x1="12.36885" y1="9.1625" x2="12.025" y2="9.50635" width="0.254" layer="1"/>
 <wire x1="12.025" y1="9.50635" x2="12.025" y2="10.120625" width="0.254" layer="1"/>
@@ -1412,7 +1415,7 @@ design rules under a new name.</descript
 <wire x1="12.3825" y1="15.852775" x2="14.4018" y2="17.872075" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$1">
-<contactref element="U$1" pad="4"/>
+<contactref element="U1" pad="4"/>
 <contactref element="LCHOKE" pad="1"/>
 <contactref element="C0" pad="2"/>
 <wire x1="15.6494" y1="8.13685" x2="15.661775" y2="8.149225" width="0.254" layer="1"/>
@@ -1463,23 +1466,23 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$21">
 <contactref element="C4" pad="1"/>
-<contactref element="U$1" pad="17"/>
+<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"/>
 </signal>
 <signal name="N$22">
-<contactref element="U$2" pad="3"/>
+<contactref element="U2" pad="3"/>
 <contactref element="C4" pad="2"/>
 <wire x1="11.60145" y1="13.538325" x2="11.835625" y2="13.7725" width="0.254" layer="1"/>
 <wire x1="10.76865" y1="11.94365" x2="10.76865" y2="12.705525" width="0.254" layer="1"/>
 <wire x1="10.76865" y1="12.705525" x2="11.835625" y2="13.7725" width="0.254" layer="1"/>
 </signal>
 <signal name="N$4">
-<contactref element="U$5" pad="9_V_RESET"/>
+<contactref element="U5" pad="9_V_RESET"/>
 <contactref element="Q1" pad="3"/>
-<contactref element="U$5" pad="8_VCC"/>
-<contactref element="U$5" pad="7_VCC_IO"/>
+<contactref element="U5" pad="8_VCC"/>
+<contactref element="U5" pad="7_VCC_IO"/>
 <contactref element="C7" pad="1"/>
 <via x="19.523075" y="2.225675" extent="1-16" drill="0.381"/>
 <wire x1="20.875625" y1="3.260725" x2="20.875625" y2="8.969375" width="0.2032" layer="16"/>
@@ -1528,17 +1531,17 @@ design rules under a new name.</descript
 <wire x1="17.4625" y1="17.0307" x2="18.44675" y2="18.01495" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$7">
-<contactref element="U$5" pad="11_RF_IN"/>
+<contactref element="U5" 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="U$5" pad="4_TIMEPULSE"/>
+<contactref element="U5" pad="4_TIMEPULSE"/>
 </signal>
 <signal name="GPS-RX">
-<contactref element="U$5" pad="3_RXD1"/>
-<contactref element="U$6" pad="27"/>
+<contactref element="U5" pad="3_RXD1"/>
+<contactref element="U6" pad="27"/>
 <via x="15.801975" y="17.39265" extent="1-16" drill="0.381"/>
 <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="17.145" y2="18.7325" width="0.2032" layer="16"/>
@@ -1552,8 +1555,8 @@ design rules under a new name.</descript
 <wire x1="15.875" y1="17.319625" x2="15.801975" y2="17.39265" width="0.2032" layer="1"/>
 </signal>
 <signal name="GPS-TX">
-<contactref element="U$5" pad="2_TXD1"/>
-<contactref element="U$6" pad="28"/>
+<contactref element="U5" pad="2_TXD1"/>
+<contactref element="U6" pad="28"/>
 <via x="15.3289" y="18.170525" extent="1-16" drill="0.381"/>
 <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"/>
@@ -1567,13 +1570,13 @@ design rules under a new name.</descript
 </signal>
 <signal name="GPS-EN">
 <contactref element="R4" pad="1"/>
-<contactref element="U$6" pad="7"/>
+<contactref element="U6" pad="7"/>
 <wire x1="17.2725" y1="18.868075" x2="18.332375" y2="18.868075" width="0.2032" layer="1"/>
 <wire x1="18.332375" y1="18.868075" x2="18.707975" y2="19.243675" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-MOSI">
-<contactref element="U$6" pad="26"/>
-<contactref element="U$1" pad="14"/>
+<contactref element="U6" pad="26"/>
+<contactref element="U1" pad="14"/>
 <wire x1="14.69" y1="13.1025" x2="14.69" y2="13.885" width="0.2032" layer="1"/>
 <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.381"/>
@@ -1584,8 +1587,8 @@ design rules under a new name.</descript
 <wire x1="15.401925" y1="13.97" x2="15.875" y2="14.443075" width="0.2032" layer="16"/>
 </signal>
 <signal name="RADIO-MISO">
-<contactref element="U$6" pad="25"/>
-<contactref element="U$1" pad="13"/>
+<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"/>
@@ -1595,8 +1598,8 @@ design rules under a new name.</descript
 <wire x1="15.19" y1="15.250575" x2="15.19" y2="14.3375" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-SCK">
-<contactref element="U$6" pad="24"/>
-<contactref element="U$1" pad="12"/>
+<contactref element="U6" pad="24"/>
+<contactref element="U1" pad="12"/>
 <via x="15.179675" y="16.14805" extent="1-16" drill="0.381"/>
 <via x="16.8275" y="14.131925" extent="1-16" drill="0.381"/>
 <wire x1="15.69" y1="13.1025" x2="15.69" y2="13.70245" width="0.2032" layer="1"/>
@@ -1609,8 +1612,8 @@ design rules under a new name.</descript
 <wire x1="16.51" y1="13.814425" x2="16.8275" y2="14.131925" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-NSS">
-<contactref element="U$6" pad="23"/>
-<contactref element="U$1" pad="15"/>
+<contactref element="U6" pad="23"/>
+<contactref element="U1" pad="15"/>
 <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"/>
@@ -1619,9 +1622,9 @@ design rules under a new name.</descript
 <wire x1="14.19" y1="15.250575" x2="14.1725" y2="15.268075" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWCLK">
-<contactref element="U$6" pad="22"/>
+<contactref element="U6" pad="22"/>
 <via x="13.0175" y="14.9225" extent="1-16" drill="0.381"/>
-<contactref element="U$7" pad="3"/>
+<contactref element="J1" pad="3"/>
 <wire x1="14.131925" y1="0.796925" x2="14.9225" y2="1.5875" width="0.2032" layer="16"/>
 <wire x1="11.985625" y1="9.763125" x2="10.0457" y2="9.763125" width="0.2032" layer="16"/>
 <wire x1="10.0457" y1="9.763125" x2="9.73455" y2="9.451975" width="0.2032" layer="16"/>
@@ -1634,13 +1637,13 @@ design rules under a new name.</descript
 <wire x1="13.363075" y1="15.268075" x2="13.0175" y2="14.9225" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWDIO">
-<contactref element="U$6" pad="21"/>
+<contactref element="U6" pad="21"/>
 <via x="14.246225" y="16.14805" extent="1-16" drill="0.381"/>
 <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"/>
-<contactref element="U$7" pad="4"/>
+<contactref element="J1" pad="4"/>
 <wire x1="10.35685" y1="9.2964" x2="10.201275" y2="9.140825" width="0.2032" layer="16"/>
 <wire x1="13.335" y1="1.27" x2="12.01733125" y2="1.27" width="0.2032" layer="16"/>
 <wire x1="12.01733125" y1="1.27" x2="10.201275" y2="3.08605625" width="0.2032" layer="16"/>
@@ -1652,8 +1655,8 @@ design rules under a new name.</descript
 <wire x1="13.49375" y1="14.44625" x2="14.246225" y2="15.198725" width="0.2032" layer="16"/>
 <wire x1="14.246225" y1="15.198725" x2="14.246225" y2="16.14805" width="0.2032" layer="16"/>
 </signal>
-<signal name="N$2">
-<contactref element="PAD1" pad="1"/>
+<signal name="ANT">
+<contactref element="ANT" pad="1"/>
 <contactref element="LM2" pad="1"/>
 <contactref element="CM1" pad="1"/>
 <wire x1="15.090775" y1="1.58115" x2="14.8319" y2="1.58115" width="0.4064" layer="1"/>
@@ -1702,6 +1705,30 @@ design rules under a new name.</descript
 <vertex x="8.5725" y="11.43"/>
 </polygon>
 </signal>
+<signal name="N$12">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="14.9225" y="12.461875"/>
+<vertex x="15.5575" y="12.461875"/>
+<vertex x="15.5575" y="12.7"/>
+<vertex x="14.9225" y="12.7"/>
+</polygon>
+</signal>
+<signal name="N$13">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="16.51" y="10.795"/>
+<vertex x="16.66875" y="10.795"/>
+<vertex x="16.66875" y="11.43"/>
+<vertex x="16.51" y="11.43"/>
+</polygon>
+</signal>
+<signal name="N$14">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="14.843125" y="9.8425"/>
+<vertex x="15.478125" y="9.8425"/>
+<vertex x="15.478125" y="9.604375"/>
+<vertex x="14.843125" y="9.604375"/>
+</polygon>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/hab.sch b/hab.sch
--- a/hab.sch
+++ b/hab.sch
@@ -1689,10 +1689,10 @@ by exp-lbrs.ulp</description>
 <symbols>
 <symbol name="STM32F031G6U6">
 <wire x1="-38.1" y1="22.86" x2="38.1" y2="22.86" width="0.254" layer="94"/>
-<wire x1="38.1" y1="22.86" x2="38.1" y2="-25.4" width="0.254" layer="94"/>
-<wire x1="38.1" y1="-25.4" x2="-38.1" y2="-25.4" width="0.254" layer="94"/>
+<wire x1="38.1" y1="22.86" x2="38.1" y2="-20.32" width="0.254" layer="94"/>
+<wire x1="38.1" y1="-20.32" x2="-38.1" y2="-20.32" width="0.254" layer="94"/>
 <text x="-38.1" y="25.4" size="2.54" layer="95">&gt;NAME</text>
-<text x="-38.1" y="-30.48" size="2.54" layer="96">&gt;VALUE</text>
+<text x="-38.1" y="-25.4" size="2.54" layer="96">&gt;VALUE</text>
 <pin name="BOOT0" x="-43.18" y="17.78" length="middle"/>
 <pin name="PF0/OSC_IN" x="-43.18" y="15.24" length="middle"/>
 <pin name="PF1/OSC_OUT" x="-43.18" y="12.7" length="middle"/>
@@ -1700,28 +1700,28 @@ by exp-lbrs.ulp</description>
 <pin name="VDDA" x="-43.18" y="7.62" length="middle"/>
 <pin name="PA0" x="-43.18" y="5.08" length="middle"/>
 <pin name="PA1/TIM2_2" x="-43.18" y="2.54" length="middle"/>
-<pin name="PA2/TIM2_3/UART1_TX" x="-43.18" y="0" length="middle"/>
-<pin name="PA3/TIM2_4/USART2_RX" x="-43.18" y="-2.54" length="middle"/>
+<pin name="PA2/TIM2_3/USART1_TX" x="-43.18" y="0" length="middle"/>
+<pin name="PA3/TIM2_4/USART1_RX" x="-43.18" y="-2.54" length="middle"/>
 <pin name="PA4/SPI1_NSS/TIM14_1" x="-43.18" y="-5.08" length="middle"/>
 <pin name="PA5/SPI1_SCK" x="-43.18" y="-7.62" length="middle"/>
 <pin name="PA6/SPI1_MISO/TIM3_1" x="-43.18" y="-10.16" length="middle"/>
 <pin name="PA7/SPI1_MOSI/TIM3_2" x="-43.18" y="-12.7" length="middle"/>
 <pin name="PB0/TIM3_3" x="-43.18" y="-15.24" length="middle"/>
 <pin name="PB1/TIM3_4" x="-43.18" y="-17.78" length="middle"/>
-<pin name="VSS" x="43.18" y="-22.86" length="middle" rot="R180"/>
-<pin name="TIM1_1/MCO/PA8" x="43.18" y="-17.78" length="middle" rot="R180"/>
-<pin name="UART1_TX/TIM1_2/I2C1_SCL/PA9" x="43.18" y="-15.24" length="middle" rot="R180"/>
-<pin name="USART1_TX/TIM1_3/I2C1_SDA/PA10" x="43.18" y="-12.7" length="middle" rot="R180"/>
-<pin name="SWDIO/PA13" x="43.18" y="-5.08" length="middle" rot="R180"/>
-<pin name="USART1_TX/SWCLK/PA14" x="43.18" y="-2.54" length="middle" rot="R180"/>
-<pin name="SPI1_NSS/USART1_RX/PA15" x="43.18" y="0" length="middle" rot="R180"/>
-<pin name="SPI1_SCK/TIM2_2/PB3" x="43.18" y="2.54" length="middle" rot="R180"/>
-<pin name="SPI1_MISO/TIM3_1/PB4" x="43.18" y="5.08" length="middle" rot="R180"/>
-<pin name="SPI1_MOSI/TIM3_2/PB5" x="43.18" y="7.62" length="middle" rot="R180"/>
-<pin name="I2C1_SCL/USART1_TX/PB6" x="43.18" y="10.16" length="middle" rot="R180"/>
-<pin name="I2C1_SDA/USART1_RX/PB7" x="43.18" y="12.7" length="middle" rot="R180"/>
-<wire x1="-38.1" y1="22.86" x2="-38.1" y2="-25.4" width="0.254" layer="94"/>
-<pin name="VDD" x="43.18" y="-20.32" length="middle" rot="R180"/>
+<pin name="VSS" x="43.18" y="-17.78" length="middle" rot="R180"/>
+<pin name="TIM1_1/MCO/PA8" x="43.18" y="-12.7" length="middle" rot="R180"/>
+<pin name="UART1_TX/TIM1_2/I2C1_SCL/PA9" x="43.18" y="-10.16" length="middle" rot="R180"/>
+<pin name="USART1_TX/TIM1_3/I2C1_SDA/PA10" x="43.18" y="-7.62" length="middle" rot="R180"/>
+<pin name="SWDIO/PA13" x="43.18" y="0" length="middle" rot="R180"/>
+<pin name="USART1_TX/SWCLK/PA14" x="43.18" y="2.54" length="middle" rot="R180"/>
+<pin name="SPI1_NSS/USART1_RX/PA15" x="43.18" y="5.08" length="middle" rot="R180"/>
+<pin name="SPI1_SCK/TIM2_2/PB3" x="43.18" y="7.62" length="middle" rot="R180"/>
+<pin name="SPI1_MISO/TIM3_1/PB4" x="43.18" y="10.16" length="middle" rot="R180"/>
+<pin name="SPI1_MOSI/TIM3_2/PB5" x="43.18" y="12.7" length="middle" rot="R180"/>
+<pin name="I2C1_SCL/USART1_TX/PB6" x="43.18" y="15.24" length="middle" rot="R180"/>
+<pin name="I2C1_SDA/USART1_RX/PB7" x="43.18" y="17.78" length="middle" rot="R180"/>
+<wire x1="-38.1" y1="22.86" x2="-38.1" y2="-20.32" width="0.254" layer="94"/>
+<pin name="VDD" x="43.18" y="-15.24" length="middle" rot="R180"/>
 </symbol>
 <symbol name="POGOPROG-CONN-4">
 <pin name="SWDIO" x="-2.54" y="-2.54" length="short"/>
@@ -1748,7 +1748,7 @@ by exp-lbrs.ulp</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="STM32F031G6U6">
+<deviceset name="STM32F031G6U6" prefix="U">
 <gates>
 <gate name="G$1" symbol="STM32F031G6U6" x="0" y="0"/>
 </gates>
@@ -1761,8 +1761,8 @@ by exp-lbrs.ulp</description>
 <connect gate="G$1" pin="NRST" pad="4"/>
 <connect gate="G$1" pin="PA0" pad="6"/>
 <connect gate="G$1" pin="PA1/TIM2_2" pad="7"/>
-<connect gate="G$1" pin="PA2/TIM2_3/UART1_TX" pad="8"/>
-<connect gate="G$1" pin="PA3/TIM2_4/USART2_RX" pad="9"/>
+<connect gate="G$1" pin="PA2/TIM2_3/USART1_TX" pad="8"/>
+<connect gate="G$1" pin="PA3/TIM2_4/USART1_RX" pad="9"/>
 <connect gate="G$1" pin="PA4/SPI1_NSS/TIM14_1" pad="10"/>
 <connect gate="G$1" pin="PA5/SPI1_SCK" pad="11"/>
 <connect gate="G$1" pin="PA6/SPI1_MISO/TIM3_1" pad="12"/>
@@ -3370,7 +3370,7 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 </class>
 </classes>
 <parts>
-<part name="U$1" library="Ava" deviceset="SI4464" device=""/>
+<part name="U1" library="Ava" deviceset="SI4464" device=""/>
 <part name="C1" library="SparkFun" deviceset="CAP" device="0402-CAP" value="100pF"/>
 <part name="C2" library="SparkFun" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C3" library="SparkFun" deviceset="CAP" device="0402-CAP" value="1uF"/>
@@ -3390,7 +3390,7 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <part name="GND7" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND8" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND9" library="SparkFun" deviceset="GND" device=""/>
-<part name="U$2" library="picoAVA-R8" deviceset="CRYSTAL_3.2X2.5-TCXO" device=""/>
+<part name="U2" library="picoAVA-R8" deviceset="CRYSTAL_3.2X2.5-TCXO" device=""/>
 <part name="GND10" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND11" library="SparkFun" deviceset="GND" device=""/>
 <part name="P+2" library="SparkFun" deviceset="VCC" device=""/>
@@ -3398,11 +3398,11 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <part name="P+3" library="SparkFun" deviceset="VCC" device=""/>
 <part name="R2" library="SparkFun" deviceset="RESISTOR" device="0402-RES" value="100k"/>
 <part name="GND12" library="SparkFun" deviceset="GND" device=""/>
-<part name="PAD1" library="wirepad" deviceset="SMD2" device=""/>
-<part name="PAD2" library="wirepad" deviceset="SMD2" device=""/>
-<part name="PAD3" library="wirepad" deviceset="SMD2" device=""/>
+<part name="ANT" library="wirepad" deviceset="SMD2" device=""/>
+<part name="GND-2" library="wirepad" deviceset="SMD2" device=""/>
+<part name="GND-1" library="wirepad" deviceset="SMD2" device=""/>
 <part name="U$4" library="picoAVA-R9" deviceset="AVA_JTI_ANTENNA-1575AT43A40" device=""/>
-<part name="U$5" library="picoAVA-R9" deviceset="AVA_UBLOX_MAX-6" device=""/>
+<part name="U5" library="picoAVA-R9" deviceset="AVA_UBLOX_MAX-6" device=""/>
 <part name="Q1" library="picoAVA-R9" deviceset="SPARKFUN_MOSFET-PCHANNEL" device="SMD"/>
 <part name="R4" library="picoAVA-R9" deviceset="SPARKFUN_RESISTOR" device="0402-RES" value="100R"/>
 <part name="R5" library="picoAVA-R9" deviceset="SPARKFUN_RESISTOR" device="0402-RES" value="10k"/>
@@ -3412,7 +3412,7 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <part name="GND14" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND15" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND16" library="SparkFun" deviceset="GND" device=""/>
-<part name="U$6" library="Protofusion" deviceset="STM32F031G6U6" device=""/>
+<part name="U6" library="Protofusion" deviceset="STM32F031G6U6" device=""/>
 <part name="GND17" library="SparkFun" deviceset="GND" device=""/>
 <part name="P+5" library="SparkFun" deviceset="VCC" device=""/>
 <part name="P+6" library="SparkFun" deviceset="VCC" device=""/>
@@ -3422,7 +3422,7 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <part name="PAD4" library="wirepad" deviceset="SMD2" device=""/>
 <part name="PAD5" library="wirepad" deviceset="SMD2" device=""/>
 <part name="GND5" library="SparkFun" deviceset="GND" device=""/>
-<part name="U$7" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
+<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
 <part name="P+9" library="SparkFun" deviceset="VCC" device=""/>
 <part name="GND18" library="SparkFun" deviceset="GND" device=""/>
 <part name="P+10" library="SparkFun" deviceset="VCC" device=""/>
@@ -3435,238 +3435,265 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <part name="GND6" library="SparkFun" deviceset="GND" device=""/>
 <part name="C8" library="SparkFun" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="GND20" library="SparkFun" deviceset="GND" device=""/>
+<part name="P+8" library="SparkFun" deviceset="VCC" device=""/>
+<part name="GND21" library="SparkFun" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
-<instance part="U$1" gate="G$1" x="165.1" y="160.02"/>
-<instance part="C1" gate="G$1" x="129.54" y="124.46"/>
-<instance part="C2" gate="G$1" x="139.7" y="124.46"/>
-<instance part="C3" gate="G$1" x="149.86" y="124.46"/>
-<instance part="C4" gate="G$1" x="185.42" y="185.42" rot="R90"/>
-<instance part="C0" gate="G$1" x="114.3" y="157.48" rot="R90"/>
-<instance part="CM" gate="G$1" x="86.36" y="147.32"/>
-<instance part="CM2" gate="G$1" x="66.04" y="147.32"/>
-<instance part="L0" gate="G$1" x="96.52" y="157.48" rot="R90"/>
-<instance part="LM" gate="G$1" x="76.2" y="157.48" rot="R90"/>
-<instance part="LM2" gate="G$1" x="55.88" y="157.48" rot="R90"/>
-<instance part="LCHOKE" gate="G$1" x="129.54" y="147.32"/>
-<instance part="P+1" gate="1" x="121.92" y="134.62" rot="R90"/>
-<instance part="GND1" gate="1" x="129.54" y="114.3"/>
-<instance part="GND2" gate="1" x="139.7" y="114.3"/>
-<instance part="GND3" gate="1" x="149.86" y="114.3"/>
-<instance part="GND4" gate="1" x="152.4" y="182.88" rot="R90"/>
-<instance part="GND7" gate="1" x="66.04" y="137.16"/>
-<instance part="GND8" gate="1" x="86.36" y="137.16"/>
-<instance part="GND9" gate="1" x="165.1" y="187.96" rot="R180"/>
-<instance part="U$2" gate="G$1" x="180.34" y="215.9"/>
-<instance part="GND10" gate="1" x="195.58" y="200.66"/>
-<instance part="GND11" gate="1" x="165.1" y="200.66"/>
-<instance part="P+2" gate="1" x="165.1" y="226.06"/>
-<instance part="R1" gate="G$1" x="147.32" y="193.04" rot="R90"/>
+<instance part="U1" gate="G$1" x="165.1" y="160.02"/>
+<instance part="C1" gate="G$1" x="132.08" y="124.46"/>
+<instance part="C2" gate="G$1" x="142.24" y="124.46"/>
+<instance part="C3" gate="G$1" x="152.4" y="124.46"/>
+<instance part="C4" gate="G$1" x="185.42" y="187.96" rot="R90"/>
+<instance part="C0" gate="G$1" x="96.52" y="157.48" rot="R90"/>
+<instance part="CM" gate="G$1" x="68.58" y="147.32"/>
+<instance part="CM2" gate="G$1" x="48.26" y="147.32"/>
+<instance part="L0" gate="G$1" x="78.74" y="157.48" rot="R90"/>
+<instance part="LM" gate="G$1" x="58.42" y="157.48" rot="R90"/>
+<instance part="LM2" gate="G$1" x="38.1" y="157.48" rot="R90"/>
+<instance part="LCHOKE" gate="G$1" x="106.68" y="167.64" smashed="yes" rot="R180">
+<attribute name="NAME" x="109.22" y="170.18" size="1.778" layer="95"/>
+<attribute name="VALUE" x="109.22" y="167.64" size="1.778" layer="96"/>
+</instance>
+<instance part="P+1" gate="1" x="127" y="137.16"/>
+<instance part="GND1" gate="1" x="132.08" y="114.3"/>
+<instance part="GND2" gate="1" x="142.24" y="114.3"/>
+<instance part="GND3" gate="1" x="152.4" y="114.3"/>
+<instance part="GND4" gate="1" x="139.7" y="170.18"/>
+<instance part="GND7" gate="1" x="48.26" y="137.16"/>
+<instance part="GND8" gate="1" x="68.58" y="137.16"/>
+<instance part="GND9" gate="1" x="157.48" y="185.42"/>
+<instance part="U2" gate="G$1" x="226.06" y="187.96" rot="MR0"/>
+<instance part="GND10" gate="1" x="210.82" y="172.72" rot="MR0"/>
+<instance part="GND11" gate="1" x="241.3" y="172.72" rot="MR0"/>
+<instance part="P+2" gate="1" x="241.3" y="198.12" rot="MR0"/>
+<instance part="R1" gate="G$1" x="129.54" y="172.72" rot="R90"/>
 <instance part="P+3" gate="1" x="205.74" y="152.4"/>
 <instance part="R2" gate="G$1" x="205.74" y="144.78" rot="R270"/>
-<instance part="GND12" gate="1" x="25.4" y="139.7"/>
-<instance part="PAD1" gate="1" x="17.78" y="157.48"/>
-<instance part="PAD2" gate="1" x="22.86" y="144.78"/>
-<instance part="PAD3" gate="1" x="22.86" y="165.1"/>
+<instance part="GND12" gate="1" x="17.78" y="144.78"/>
+<instance part="ANT" gate="1" x="10.16" y="157.48"/>
+<instance part="GND-2" gate="1" x="12.7" y="149.86" smashed="yes">
+<attribute name="NAME" x="10.541" y="150.7998" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="11.557" y="146.558" size="1.778" layer="96"/>
+</instance>
+<instance part="GND-1" gate="1" x="12.7" y="165.1" smashed="yes">
+<attribute name="NAME" x="10.795" y="166.0398" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="11.557" y="161.798" size="1.778" layer="96"/>
+</instance>
 <instance part="U$4" gate="G$1" x="259.08" y="189.23" rot="R180"/>
-<instance part="U$5" gate="G$1" x="300.99" y="179.07"/>
+<instance part="U5" gate="G$1" x="300.99" y="179.07"/>
 <instance part="Q1" gate="G$1" x="331.47" y="203.2" rot="R180"/>
 <instance part="R4" gate="G$1" x="347.98" y="203.2" rot="R180"/>
 <instance part="R5" gate="G$1" x="341.63" y="210.82" rot="R270"/>
-<instance part="C7" gate="G$1" x="337.82" y="189.23" rot="R90"/>
+<instance part="C7" gate="G$1" x="361.95" y="181.61"/>
 <instance part="P+4" gate="1" x="331.47" y="220.98"/>
 <instance part="GND13" gate="1" x="330.2" y="148.59"/>
 <instance part="GND14" gate="1" x="273.05" y="180.34"/>
-<instance part="GND15" gate="1" x="273.05" y="198.12" rot="R180"/>
-<instance part="GND16" gate="1" x="356.87" y="189.23" rot="R90"/>
-<instance part="U$6" gate="G$1" x="299.72" y="96.52"/>
-<instance part="GND17" gate="1" x="345.44" y="68.58"/>
-<instance part="P+5" gate="1" x="365.76" y="78.74"/>
-<instance part="P+6" gate="1" x="228.6" y="111.76"/>
+<instance part="GND15" gate="1" x="273.05" y="196.85"/>
+<instance part="GND16" gate="1" x="361.95" y="173.99"/>
+<instance part="U6" gate="G$1" x="299.72" y="96.52"/>
+<instance part="GND17" gate="1" x="345.44" y="73.66"/>
+<instance part="P+5" gate="1" x="365.76" y="83.82"/>
+<instance part="P+6" gate="1" x="236.22" y="106.68"/>
 <instance part="P+7" gate="1" x="346.71" y="180.34"/>
-<instance part="CM1" gate="G$1" x="55.88" y="172.72" rot="R90"/>
-<instance part="CM4" gate="G$1" x="76.2" y="172.72" rot="R90"/>
-<instance part="PAD4" gate="1" x="127" y="30.48"/>
-<instance part="PAD5" gate="1" x="127" y="38.1"/>
-<instance part="GND5" gate="1" x="134.62" y="25.4"/>
-<instance part="U$7" gate="G$1" x="93.98" y="76.2"/>
-<instance part="P+9" gate="1" x="88.9" y="81.28"/>
-<instance part="GND18" gate="1" x="78.74" y="76.2"/>
-<instance part="P+10" gate="1" x="190.5" y="43.18"/>
-<instance part="GND19" gate="1" x="180.34" y="10.16"/>
-<instance part="U4" gate="G$1" x="170.18" y="38.1"/>
-<instance part="C6" gate="G$1" x="147.32" y="30.48"/>
-<instance part="L1" gate="G$1" x="170.18" y="55.88" rot="R90"/>
-<instance part="C9" gate="G$1" x="190.5" y="30.48"/>
-<instance part="C5" gate="G$1" x="365.76" y="68.58"/>
-<instance part="GND6" gate="1" x="365.76" y="60.96"/>
-<instance part="C8" gate="G$1" x="228.6" y="93.98"/>
-<instance part="GND20" gate="1" x="228.6" y="86.36"/>
+<instance part="CM1" gate="G$1" x="38.1" y="172.72" rot="R90"/>
+<instance part="CM4" gate="G$1" x="58.42" y="172.72" rot="R90"/>
+<instance part="PAD4" gate="1" x="137.16" y="71.12"/>
+<instance part="PAD5" gate="1" x="137.16" y="78.74"/>
+<instance part="GND5" gate="1" x="144.78" y="66.04"/>
+<instance part="J1" gate="G$1" x="307.34" y="45.72"/>
+<instance part="P+9" gate="1" x="289.56" y="50.8"/>
+<instance part="GND18" gate="1" x="289.56" y="45.72"/>
+<instance part="P+10" gate="1" x="200.66" y="83.82"/>
+<instance part="GND19" gate="1" x="190.5" y="50.8"/>
+<instance part="U4" gate="G$1" x="180.34" y="78.74" smashed="yes">
+<attribute name="NAME" x="167.64" y="89.662" size="1.778" layer="95"/>
+<attribute name="VALUE" x="169.926" y="65.786" size="1.778" layer="96"/>
+</instance>
+<instance part="C6" gate="G$1" x="157.48" y="71.12"/>
+<instance part="L1" gate="G$1" x="180.34" y="96.52" smashed="yes" rot="R90">
+<attribute name="NAME" x="172.72" y="101.6" size="1.778" layer="95"/>
+<attribute name="VALUE" x="172.72" y="99.06" size="1.778" layer="96"/>
+</instance>
+<instance part="C9" gate="G$1" x="200.66" y="71.12"/>
+<instance part="C5" gate="G$1" x="365.76" y="73.66"/>
+<instance part="GND6" gate="1" x="365.76" y="66.04"/>
+<instance part="C8" gate="G$1" x="236.22" y="93.98"/>
+<instance part="GND20" gate="1" x="236.22" y="86.36"/>
+<instance part="P+8" gate="1" x="106.68" y="177.8"/>
+<instance part="GND21" gate="1" x="129.54" y="162.56"/>
 </instances>
 <busses>
 </busses>
 <nets>
 <net name="GND" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="GND"/>
-<wire x1="144.78" y1="167.64" x2="144.78" y2="182.88" width="0.1524" layer="91"/>
-<wire x1="144.78" y1="182.88" x2="147.32" y2="182.88" width="0.1524" layer="91"/>
+<pinref part="R1" gate="G$1" pin="1"/>
+<pinref part="GND21" gate="1" pin="GND"/>
+<wire x1="129.54" y1="165.1" x2="129.54" y2="167.64" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="U1" gate="G$1" pin="GND"/>
+<wire x1="144.78" y1="167.64" x2="144.78" y2="172.72" width="0.1524" layer="91"/>
 <pinref part="GND4" gate="1" pin="GND"/>
-<pinref part="R1" gate="G$1" pin="1"/>
-<wire x1="147.32" y1="182.88" x2="149.86" y2="182.88" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="187.96" x2="147.32" y2="182.88" width="0.1524" layer="91"/>
-<junction x="147.32" y="182.88"/>
+<wire x1="144.78" y1="172.72" x2="139.7" y2="172.72" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="GND9" gate="1" pin="GND"/>
-<pinref part="U$1" gate="G$1" pin="GND2"/>
-<wire x1="165.1" y1="185.42" x2="165.1" y2="180.34" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="GND2"/>
+<wire x1="157.48" y1="187.96" x2="165.1" y2="187.96" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="187.96" x2="165.1" y2="180.34" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C3" gate="G$1" pin="2"/>
 <pinref part="GND3" gate="1" pin="GND"/>
-<wire x1="149.86" y1="121.92" x2="149.86" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="121.92" x2="152.4" y2="116.84" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
 <pinref part="GND2" gate="1" pin="GND"/>
-<wire x1="139.7" y1="121.92" x2="139.7" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="142.24" y1="121.92" x2="142.24" y2="116.84" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
 <pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="129.54" y1="121.92" x2="129.54" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="121.92" x2="132.08" y2="116.84" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="CM2" gate="G$1" pin="2"/>
 <pinref part="GND7" gate="1" pin="GND"/>
-<wire x1="66.04" y1="144.78" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="144.78" x2="48.26" y2="139.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="CM" gate="G$1" pin="2"/>
 <pinref part="GND8" gate="1" pin="GND"/>
-<wire x1="86.36" y1="144.78" x2="86.36" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="68.58" y1="144.78" x2="68.58" y2="139.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$2" gate="G$1" pin="GND"/>
+<pinref part="U2" gate="G$1" pin="GND"/>
 <pinref part="GND11" gate="1" pin="GND"/>
-<wire x1="167.64" y1="210.82" x2="165.1" y2="210.82" width="0.1524" layer="91"/>
-<wire x1="165.1" y1="210.82" x2="165.1" y2="203.2" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="182.88" x2="241.3" y2="182.88" width="0.1524" layer="91"/>
+<wire x1="241.3" y1="182.88" x2="241.3" y2="175.26" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$2" gate="G$1" pin="TRI"/>
+<pinref part="U2" gate="G$1" pin="TRI"/>
 <pinref part="GND10" gate="1" pin="GND"/>
-<wire x1="193.04" y1="210.82" x2="195.58" y2="210.82" width="0.1524" layer="91"/>
-<wire x1="195.58" y1="210.82" x2="195.58" y2="203.2" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="182.88" x2="210.82" y2="182.88" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="182.88" x2="210.82" y2="175.26" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="GND12" gate="1" pin="GND"/>
-<pinref part="PAD2" gate="1" pin="P"/>
-<wire x1="25.4" y1="142.24" x2="25.4" y2="144.78" width="0.1524" layer="91"/>
-<pinref part="PAD3" gate="1" pin="P"/>
-<wire x1="25.4" y1="144.78" x2="25.4" y2="165.1" width="0.1524" layer="91"/>
-<junction x="25.4" y="144.78"/>
+<pinref part="GND-2" gate="1" pin="P"/>
+<pinref part="GND-1" gate="1" pin="P"/>
+<wire x1="17.78" y1="147.32" x2="17.78" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="149.86" x2="17.78" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="165.1" x2="15.24" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="149.86" x2="15.24" y2="149.86" width="0.1524" layer="91"/>
+<junction x="17.78" y="149.86"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
 <pinref part="GND16" gate="1" pin="GND"/>
-<wire x1="340.36" y1="189.23" x2="354.33" y2="189.23" width="0.1524" layer="91"/>
+<wire x1="361.95" y1="179.07" x2="361.95" y2="176.53" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="GND14" gate="1" pin="GND"/>
 <wire x1="273.05" y1="182.88" x2="273.05" y2="184.15" width="0.1524" layer="91"/>
-<pinref part="U$5" gate="G$1" pin="12_GND"/>
+<pinref part="U5" gate="G$1" pin="12_GND"/>
 <wire x1="273.05" y1="184.15" x2="278.13" y2="184.15" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$5" gate="G$1" pin="10_GND"/>
+<pinref part="U5" gate="G$1" pin="10_GND"/>
 <pinref part="GND15" gate="1" pin="GND"/>
-<wire x1="278.13" y1="194.31" x2="273.05" y2="194.31" width="0.1524" layer="91"/>
-<wire x1="273.05" y1="194.31" x2="273.05" y2="195.58" width="0.1524" layer="91"/>
+<wire x1="278.13" y1="194.31" x2="278.13" y2="199.39" width="0.1524" layer="91"/>
+<wire x1="278.13" y1="199.39" x2="273.05" y2="199.39" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$5" gate="G$1" pin="1_GND"/>
+<pinref part="U5" gate="G$1" pin="1_GND"/>
 <pinref part="GND13" gate="1" pin="GND"/>
 <wire x1="323.85" y1="153.67" x2="330.2" y2="153.67" width="0.1524" layer="91"/>
 <wire x1="330.2" y1="153.67" x2="330.2" y2="151.13" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="VSS"/>
-<wire x1="342.9" y1="73.66" x2="345.44" y2="73.66" width="0.1524" layer="91"/>
-<wire x1="345.44" y1="73.66" x2="345.44" y2="71.12" width="0.1524" layer="91"/>
+<pinref part="U6" gate="G$1" pin="VSS"/>
+<wire x1="342.9" y1="78.74" x2="345.44" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="345.44" y1="78.74" x2="345.44" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="GND17" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="PAD4" gate="1" pin="P"/>
 <pinref part="GND5" gate="1" pin="GND"/>
-<wire x1="129.54" y1="30.48" x2="134.62" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="134.62" y1="30.48" x2="134.62" y2="27.94" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="71.12" x2="144.78" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="144.78" y1="71.12" x2="144.78" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$7" gate="G$1" pin="GND"/>
+<pinref part="J1" gate="G$1" pin="GND"/>
 <pinref part="GND18" gate="1" pin="GND"/>
-<wire x1="91.44" y1="78.74" x2="78.74" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="304.8" y1="48.26" x2="289.56" y2="48.26" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="147.32" y1="27.94" x2="147.32" y2="17.78" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="68.58" x2="157.48" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="U4" gate="G$1" pin="GND"/>
-<wire x1="147.32" y1="17.78" x2="172.72" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="17.78" x2="172.72" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="17.78" x2="180.34" y2="17.78" width="0.1524" layer="91"/>
-<junction x="172.72" y="17.78"/>
-<wire x1="180.34" y1="17.78" x2="190.5" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="190.5" y1="17.78" x2="190.5" y2="27.94" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="58.42" x2="182.88" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="58.42" x2="182.88" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="58.42" x2="190.5" y2="58.42" width="0.1524" layer="91"/>
+<junction x="182.88" y="58.42"/>
+<wire x1="190.5" y1="58.42" x2="200.66" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="200.66" y1="58.42" x2="200.66" y2="68.58" width="0.1524" layer="91"/>
 <pinref part="GND19" gate="1" pin="GND"/>
-<wire x1="180.34" y1="17.78" x2="180.34" y2="12.7" width="0.1524" layer="91"/>
-<junction x="180.34" y="17.78"/>
+<wire x1="190.5" y1="58.42" x2="190.5" y2="53.34" width="0.1524" layer="91"/>
+<junction x="190.5" y="58.42"/>
 <pinref part="C9" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="2"/>
-<wire x1="365.76" y1="66.04" x2="365.76" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="365.76" y1="71.12" x2="365.76" y2="68.58" width="0.1524" layer="91"/>
 <pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C8" gate="G$1" pin="2"/>
-<wire x1="228.6" y1="91.44" x2="228.6" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="236.22" y1="91.44" x2="236.22" y2="88.9" width="0.1524" layer="91"/>
 <pinref part="GND20" gate="1" pin="GND"/>
 </segment>
 </net>
 <net name="VCC" class="0">
 <segment>
+<pinref part="P+8" gate="1" pin="VCC"/>
 <pinref part="LCHOKE" gate="G$1" pin="2"/>
+<wire x1="106.68" y1="175.26" x2="106.68" y2="177.8" width="0.1524" layer="91"/>
+</segment>
+<segment>
 <pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="129.54" y1="139.7" x2="129.54" y2="134.62" width="0.1524" layer="91"/>
 <pinref part="P+1" gate="1" pin="VCC"/>
-<wire x1="129.54" y1="134.62" x2="129.54" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="121.92" y1="134.62" x2="129.54" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="134.62" x2="132.08" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="127" y1="137.16" x2="127" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="127" y1="134.62" x2="132.08" y2="134.62" width="0.1524" layer="91"/>
 <pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="129.54" y1="134.62" x2="139.7" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="134.62" x2="139.7" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="134.62" x2="142.24" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="142.24" y1="134.62" x2="142.24" y2="129.54" width="0.1524" layer="91"/>
 <pinref part="C3" gate="G$1" pin="1"/>
-<wire x1="139.7" y1="134.62" x2="149.86" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="149.86" y1="134.62" x2="149.86" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="VDD2"/>
-<wire x1="149.86" y1="134.62" x2="160.02" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="142.24" y1="134.62" x2="152.4" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="134.62" x2="152.4" y2="129.54" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="VDD2"/>
+<wire x1="152.4" y1="134.62" x2="160.02" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="160.02" y1="134.62" x2="165.1" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="134.62" x2="165.1" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="VDD"/>
+<pinref part="U1" gate="G$1" pin="VDD"/>
 <wire x1="160.02" y1="139.7" x2="160.02" y2="134.62" width="0.1524" layer="91"/>
-<junction x="129.54" y="134.62"/>
-<junction x="139.7" y="134.62"/>
-<junction x="149.86" y="134.62"/>
+<junction x="132.08" y="134.62"/>
+<junction x="142.24" y="134.62"/>
+<junction x="152.4" y="134.62"/>
 <junction x="160.02" y="134.62"/>
 </segment>
 <segment>
 <pinref part="P+2" gate="1" pin="VCC"/>
-<wire x1="165.1" y1="226.06" x2="165.1" y2="220.98" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="VDD"/>
-<wire x1="165.1" y1="220.98" x2="167.64" y2="220.98" width="0.1524" layer="91"/>
+<wire x1="241.3" y1="198.12" x2="241.3" y2="193.04" width="0.1524" layer="91"/>
+<pinref part="U2" gate="G$1" pin="VDD"/>
+<wire x1="241.3" y1="193.04" x2="238.76" y2="193.04" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="R2" gate="G$1" pin="1"/>
@@ -3684,47 +3711,47 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <junction x="331.47" y="217.17"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="VDD"/>
-<wire x1="342.9" y1="76.2" x2="365.76" y2="76.2" width="0.1524" layer="91"/>
-<wire x1="365.76" y1="76.2" x2="365.76" y2="78.74" width="0.1524" layer="91"/>
+<pinref part="U6" gate="G$1" pin="VDD"/>
+<wire x1="342.9" y1="81.28" x2="365.76" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="365.76" y1="81.28" x2="365.76" y2="83.82" width="0.1524" layer="91"/>
 <pinref part="P+5" gate="1" pin="VCC"/>
 <pinref part="C5" gate="G$1" pin="1"/>
-<wire x1="365.76" y1="76.2" x2="365.76" y2="73.66" width="0.1524" layer="91"/>
-<junction x="365.76" y="76.2"/>
+<wire x1="365.76" y1="81.28" x2="365.76" y2="78.74" width="0.1524" layer="91"/>
+<junction x="365.76" y="81.28"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="VDDA"/>
-<wire x1="256.54" y1="104.14" x2="228.6" y2="104.14" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="104.14" x2="228.6" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="U6" gate="G$1" pin="VDDA"/>
+<wire x1="256.54" y1="104.14" x2="236.22" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="236.22" y1="104.14" x2="236.22" y2="106.68" width="0.1524" layer="91"/>
 <pinref part="P+6" gate="1" pin="VCC"/>
 <pinref part="C8" gate="G$1" pin="1"/>
-<wire x1="228.6" y1="104.14" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
-<junction x="228.6" y="104.14"/>
+<wire x1="236.22" y1="104.14" x2="236.22" y2="99.06" width="0.1524" layer="91"/>
+<junction x="236.22" y="104.14"/>
 </segment>
 <segment>
-<pinref part="U$5" gate="G$1" pin="6_V_BCKP"/>
+<pinref part="U5" gate="G$1" pin="6_V_BCKP"/>
 <wire x1="346.71" y1="179.07" x2="323.85" y2="179.07" width="0.1524" layer="91"/>
 <pinref part="P+7" gate="1" pin="VCC"/>
 <wire x1="346.71" y1="180.34" x2="346.71" y2="179.07" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="P+9" gate="1" pin="VCC"/>
-<pinref part="U$7" gate="G$1" pin="VCC"/>
-<wire x1="88.9" y1="81.28" x2="91.44" y2="81.28" width="0.1524" layer="91"/>
+<pinref part="J1" gate="G$1" pin="VCC"/>
+<wire x1="289.56" y1="50.8" x2="304.8" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="190.5" y1="43.18" x2="190.5" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="200.66" y1="83.82" x2="200.66" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="P+10" gate="1" pin="VCC"/>
 <pinref part="U4" gate="G$1" pin="VOUT"/>
-<wire x1="190.5" y1="38.1" x2="190.5" y2="35.56" width="0.1524" layer="91"/>
-<wire x1="185.42" y1="38.1" x2="190.5" y2="38.1" width="0.1524" layer="91"/>
-<junction x="190.5" y="38.1"/>
+<wire x1="200.66" y1="78.74" x2="200.66" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="78.74" x2="200.66" y2="78.74" width="0.1524" layer="91"/>
+<junction x="200.66" y="78.74"/>
 <pinref part="C9" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="RADIO-GPIO1" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="GPIO1"/>
+<pinref part="U1" gate="G$1" pin="GPIO1"/>
 <wire x1="170.18" y1="139.7" x2="170.18" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="170.18" y1="134.62" x2="205.74" y2="134.62" width="0.1524" layer="91"/>
 <pinref part="R2" gate="G$1" pin="2"/>
@@ -3734,109 +3761,108 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <label x="210.82" y="134.62" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="USART1_TX/TIM1_3/I2C1_SDA/PA10"/>
-<wire x1="342.9" y1="83.82" x2="345.44" y2="83.82" width="0.1524" layer="91"/>
-<label x="345.44" y="83.82" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="USART1_TX/TIM1_3/I2C1_SDA/PA10"/>
+<wire x1="342.9" y1="88.9" x2="345.44" y2="88.9" width="0.1524" layer="91"/>
+<label x="345.44" y="88.9" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="RADIO-SHDN" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="SDN"/>
-<wire x1="144.78" y1="165.1" x2="142.24" y2="165.1" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="165.1" x2="142.24" y2="200.66" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="SDN"/>
+<wire x1="144.78" y1="165.1" x2="134.62" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="165.1" x2="134.62" y2="180.34" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="180.34" x2="129.54" y2="180.34" width="0.1524" layer="91"/>
 <pinref part="R1" gate="G$1" pin="2"/>
-<wire x1="147.32" y1="198.12" x2="147.32" y2="200.66" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="200.66" x2="142.24" y2="200.66" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="200.66" x2="139.7" y2="200.66" width="0.1524" layer="91"/>
-<junction x="142.24" y="200.66"/>
-<label x="139.7" y="200.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="129.54" y1="177.8" x2="129.54" y2="180.34" width="0.1524" layer="91"/>
+<wire x1="129.54" y1="180.34" x2="127" y2="180.34" width="0.1524" layer="91"/>
+<junction x="129.54" y="180.34"/>
+<label x="127" y="180.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="UART1_TX/TIM1_2/I2C1_SCL/PA9"/>
-<wire x1="342.9" y1="81.28" x2="345.44" y2="81.28" width="0.1524" layer="91"/>
-<label x="345.44" y="81.28" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="UART1_TX/TIM1_2/I2C1_SCL/PA9"/>
+<wire x1="342.9" y1="86.36" x2="345.44" y2="86.36" width="0.1524" layer="91"/>
+<label x="345.44" y="86.36" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$1" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="TX"/>
+<pinref part="U1" gate="G$1" pin="TX"/>
 <pinref part="LCHOKE" gate="G$1" pin="1"/>
-<wire x1="144.78" y1="157.48" x2="129.54" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="129.54" y1="157.48" x2="129.54" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="144.78" y1="157.48" x2="106.68" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="106.68" y1="157.48" x2="106.68" y2="160.02" width="0.1524" layer="91"/>
 <pinref part="C0" gate="G$1" pin="2"/>
-<wire x1="129.54" y1="157.48" x2="116.84" y2="157.48" width="0.1524" layer="91"/>
-<junction x="129.54" y="157.48"/>
+<wire x1="106.68" y1="157.48" x2="99.06" y2="157.48" width="0.1524" layer="91"/>
+<junction x="106.68" y="157.48"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
 <pinref part="C0" gate="G$1" pin="1"/>
 <pinref part="L0" gate="G$1" pin="2"/>
-<wire x1="109.22" y1="157.48" x2="104.14" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="91.44" y1="157.48" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$10" class="0">
 <segment>
 <pinref part="LM" gate="G$1" pin="2"/>
 <pinref part="L0" gate="G$1" pin="1"/>
-<wire x1="83.82" y1="157.48" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="157.48" x2="68.58" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="CM" gate="G$1" pin="1"/>
-<wire x1="86.36" y1="157.48" x2="88.9" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="152.4" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
-<junction x="86.36" y="157.48"/>
+<wire x1="68.58" y1="157.48" x2="71.12" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="68.58" y1="152.4" x2="68.58" y2="157.48" width="0.1524" layer="91"/>
+<junction x="68.58" y="157.48"/>
 <pinref part="CM4" gate="G$1" pin="2"/>
-<wire x1="78.74" y1="172.72" x2="86.36" y2="172.72" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="172.72" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="60.96" y1="172.72" x2="68.58" y2="172.72" width="0.1524" layer="91"/>
+<wire x1="68.58" y1="172.72" x2="68.58" y2="157.48" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <pinref part="LM2" gate="G$1" pin="2"/>
 <pinref part="LM" gate="G$1" pin="1"/>
-<wire x1="63.5" y1="157.48" x2="66.04" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="157.48" x2="48.26" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="CM2" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="157.48" x2="68.58" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="152.4" x2="66.04" y2="157.48" width="0.1524" layer="91"/>
-<junction x="66.04" y="157.48"/>
+<wire x1="48.26" y1="157.48" x2="50.8" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="152.4" x2="48.26" y2="157.48" width="0.1524" layer="91"/>
+<junction x="48.26" y="157.48"/>
 <pinref part="CM1" gate="G$1" pin="2"/>
-<wire x1="58.42" y1="172.72" x2="66.04" y2="172.72" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="172.72" x2="66.04" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="172.72" x2="48.26" y2="172.72" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="172.72" x2="48.26" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="CM4" gate="G$1" pin="1"/>
-<wire x1="71.12" y1="172.72" x2="66.04" y2="172.72" width="0.1524" layer="91"/>
-<junction x="66.04" y="172.72"/>
+<wire x1="53.34" y1="172.72" x2="48.26" y2="172.72" width="0.1524" layer="91"/>
+<junction x="48.26" y="172.72"/>
 </segment>
 </net>
 <net name="N$21" class="0">
 <segment>
 <pinref part="C4" gate="G$1" pin="1"/>
-<pinref part="U$1" gate="G$1" pin="XIN"/>
-<wire x1="180.34" y1="185.42" x2="167.64" y2="185.42" width="0.1524" layer="91"/>
-<wire x1="167.64" y1="185.42" x2="167.64" y2="180.34" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="XIN"/>
+<wire x1="180.34" y1="187.96" x2="167.64" y2="187.96" width="0.1524" layer="91"/>
+<wire x1="167.64" y1="187.96" x2="167.64" y2="180.34" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$22" class="0">
 <segment>
-<pinref part="U$2" gate="G$1" pin="OUT"/>
-<wire x1="193.04" y1="215.9" x2="203.2" y2="215.9" width="0.1524" layer="91"/>
-<wire x1="203.2" y1="215.9" x2="203.2" y2="185.42" width="0.1524" layer="91"/>
+<pinref part="U2" gate="G$1" pin="OUT"/>
 <pinref part="C4" gate="G$1" pin="2"/>
-<wire x1="203.2" y1="185.42" x2="187.96" y2="185.42" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="187.96" x2="187.96" y2="187.96" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$4" class="0">
 <segment>
-<pinref part="U$5" gate="G$1" pin="9_V_RESET"/>
+<pinref part="U5" gate="G$1" pin="9_V_RESET"/>
 <pinref part="Q1" gate="G$1" pin="D"/>
 <wire x1="323.85" y1="194.31" x2="331.47" y2="194.31" width="0.1524" layer="91"/>
 <wire x1="331.47" y1="194.31" x2="331.47" y2="198.12" width="0.1524" layer="91"/>
-<pinref part="U$5" gate="G$1" pin="8_VCC"/>
+<pinref part="U5" gate="G$1" pin="8_VCC"/>
 <wire x1="323.85" y1="189.23" x2="331.47" y2="189.23" width="0.1524" layer="91"/>
 <wire x1="331.47" y1="189.23" x2="331.47" y2="194.31" width="0.1524" layer="91"/>
-<pinref part="U$5" gate="G$1" pin="7_VCC_IO"/>
+<pinref part="U5" gate="G$1" pin="7_VCC_IO"/>
 <wire x1="323.85" y1="184.15" x2="331.47" y2="184.15" width="0.1524" layer="91"/>
 <wire x1="331.47" y1="184.15" x2="331.47" y2="189.23" width="0.1524" layer="91"/>
 <pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="331.47" y1="189.23" x2="332.74" y2="189.23" width="0.1524" layer="91"/>
+<wire x1="331.47" y1="189.23" x2="361.95" y2="189.23" width="0.1524" layer="91"/>
+<wire x1="361.95" y1="189.23" x2="361.95" y2="186.69" width="0.1524" layer="91"/>
 <junction x="331.47" y="189.23"/>
 <junction x="331.47" y="194.31"/>
 </segment>
@@ -3854,40 +3880,40 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 </net>
 <net name="N$7" class="0">
 <segment>
-<pinref part="U$5" gate="G$1" pin="11_RF_IN"/>
+<pinref part="U5" gate="G$1" pin="11_RF_IN"/>
 <pinref part="U$4" gate="G$1" pin="FEED"/>
 <wire x1="278.13" y1="189.23" x2="266.7" y2="189.23" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="TIMEPULSE" class="0">
 <segment>
-<pinref part="U$5" gate="G$1" pin="4_TIMEPULSE"/>
+<pinref part="U5" gate="G$1" pin="4_TIMEPULSE"/>
 <wire x1="323.85" y1="168.91" x2="328.93" y2="168.91" width="0.1524" layer="91"/>
 <label x="329.184" y="168.91" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="GPS-RX" class="0">
 <segment>
-<pinref part="U$5" gate="G$1" pin="3_RXD1"/>
+<pinref part="U5" gate="G$1" pin="3_RXD1"/>
 <wire x1="323.85" y1="163.83" x2="328.93" y2="163.83" width="0.1524" layer="91"/>
 <label x="328.93" y="163.83" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
-<wire x1="345.44" y1="106.68" x2="342.9" y2="106.68" width="0.1524" layer="91"/>
-<label x="345.44" y="106.68" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<wire x1="345.44" y1="111.76" x2="342.9" y2="111.76" width="0.1524" layer="91"/>
+<label x="345.44" y="111.76" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="GPS-TX" class="0">
 <segment>
-<pinref part="U$5" gate="G$1" pin="2_TXD1"/>
+<pinref part="U5" gate="G$1" pin="2_TXD1"/>
 <wire x1="323.85" y1="158.75" x2="328.93" y2="158.75" width="0.1524" layer="91"/>
 <label x="328.93" y="158.75" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
-<wire x1="345.44" y1="109.22" x2="342.9" y2="109.22" width="0.1524" layer="91"/>
-<label x="345.44" y="109.22" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<wire x1="345.44" y1="114.3" x2="342.9" y2="114.3" width="0.1524" layer="91"/>
+<label x="345.44" y="114.3" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="GPS-EN" class="0">
@@ -3897,100 +3923,99 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <label x="359.41" y="203.2" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="G$1" pin="PA1/TIM2_2"/>
+<pinref part="U6" gate="G$1" pin="PA1/TIM2_2"/>
 <wire x1="254" y1="99.06" x2="256.54" y2="99.06" width="0.1524" layer="91"/>
 <label x="254" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="RADIO-MOSI" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="SPI1_MOSI/TIM3_2/PB5"/>
-<wire x1="345.44" y1="104.14" x2="342.9" y2="104.14" width="0.1524" layer="91"/>
-<label x="345.44" y="104.14" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="SPI1_MOSI/TIM3_2/PB5"/>
+<wire x1="345.44" y1="109.22" x2="342.9" y2="109.22" width="0.1524" layer="91"/>
+<label x="345.44" y="109.22" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$1" gate="G$1" pin="SDI"/>
+<pinref part="U1" gate="G$1" pin="SDI"/>
 <wire x1="185.42" y1="162.56" x2="187.96" y2="162.56" width="0.1524" layer="91"/>
 <label x="187.96" y="162.56" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="RADIO-MISO" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="SPI1_MISO/TIM3_1/PB4"/>
-<wire x1="345.44" y1="101.6" x2="342.9" y2="101.6" width="0.1524" layer="91"/>
-<label x="345.44" y="101.6" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="SPI1_MISO/TIM3_1/PB4"/>
+<wire x1="345.44" y1="106.68" x2="342.9" y2="106.68" width="0.1524" layer="91"/>
+<label x="345.44" y="106.68" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$1" gate="G$1" pin="SDO"/>
+<pinref part="U1" gate="G$1" pin="SDO"/>
 <wire x1="185.42" y1="160.02" x2="187.96" y2="160.02" width="0.1524" layer="91"/>
 <label x="187.96" y="160.02" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="RADIO-SCK" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="SPI1_SCK/TIM2_2/PB3"/>
-<wire x1="345.44" y1="99.06" x2="342.9" y2="99.06" width="0.1524" layer="91"/>
-<label x="345.44" y="99.06" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="SPI1_SCK/TIM2_2/PB3"/>
+<wire x1="345.44" y1="104.14" x2="342.9" y2="104.14" width="0.1524" layer="91"/>
+<label x="345.44" y="104.14" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$1" gate="G$1" pin="SCLK"/>
+<pinref part="U1" gate="G$1" pin="SCLK"/>
 <wire x1="185.42" y1="157.48" x2="187.96" y2="157.48" width="0.1524" layer="91"/>
 <label x="187.96" y="157.48" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="RADIO-NSS" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="SPI1_NSS/USART1_RX/PA15"/>
-<wire x1="345.44" y1="96.52" x2="342.9" y2="96.52" width="0.1524" layer="91"/>
-<label x="345.44" y="96.52" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="SPI1_NSS/USART1_RX/PA15"/>
+<wire x1="345.44" y1="101.6" x2="342.9" y2="101.6" width="0.1524" layer="91"/>
+<label x="345.44" y="101.6" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$1" gate="G$1" pin="NSEL"/>
+<pinref part="U1" gate="G$1" pin="NSEL"/>
 <wire x1="185.42" y1="165.1" x2="187.96" y2="165.1" width="0.1524" layer="91"/>
 <label x="187.96" y="165.1" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="USART1_TX/SWCLK/PA14"/>
-<wire x1="378.46" y1="93.98" x2="342.9" y2="93.98" width="0.1524" layer="91"/>
-<label x="378.46" y="93.98" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="USART1_TX/SWCLK/PA14"/>
+<wire x1="345.44" y1="99.06" x2="342.9" y2="99.06" width="0.1524" layer="91"/>
+<label x="345.44" y="99.06" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$7" gate="G$1" pin="SWCLK"/>
-<wire x1="91.44" y1="76.2" x2="88.9" y2="76.2" width="0.1524" layer="91"/>
-<label x="88.9" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWCLK"/>
+<wire x1="304.8" y1="45.72" x2="302.26" y2="45.72" width="0.1524" layer="91"/>
+<label x="302.26" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="U$6" gate="G$1" pin="SWDIO/PA13"/>
-<wire x1="378.46" y1="91.44" x2="342.9" y2="91.44" width="0.1524" layer="91"/>
-<label x="378.46" y="91.44" size="1.27" layer="95" xref="yes"/>
+<pinref part="U6" gate="G$1" pin="SWDIO/PA13"/>
+<wire x1="345.44" y1="96.52" x2="342.9" y2="96.52" width="0.1524" layer="91"/>
+<label x="345.44" y="96.52" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$7" gate="G$1" pin="SWDIO"/>
-<wire x1="91.44" y1="73.66" x2="88.9" y2="73.66" width="0.1524" layer="91"/>
-<label x="88.9" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWDIO"/>
+<wire x1="304.8" y1="43.18" x2="302.26" y2="43.18" width="0.1524" layer="91"/>
+<label x="302.26" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="N$2" class="0">
+<net name="ANT" class="0">
 <segment>
-<pinref part="PAD1" gate="1" pin="P"/>
-<wire x1="20.32" y1="157.48" x2="45.72" y2="157.48" width="0.1524" layer="91"/>
+<pinref part="ANT" gate="1" pin="P"/>
+<wire x1="12.7" y1="157.48" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="LM2" gate="G$1" pin="1"/>
-<wire x1="48.26" y1="157.48" x2="45.72" y2="157.48" width="0.1524" layer="91"/>
-<junction x="45.72" y="157.48"/>
-<label x="38.1" y="157.48" size="1.778" layer="95"/>
+<wire x1="30.48" y1="157.48" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
+<junction x="27.94" y="157.48"/>
 <pinref part="CM1" gate="G$1" pin="1"/>
-<wire x1="50.8" y1="172.72" x2="45.72" y2="172.72" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="172.72" x2="45.72" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="172.72" x2="27.94" y2="172.72" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="172.72" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$3" class="0">
 <segment>
 <pinref part="U4" gate="G$1" pin="SW2"/>
-<wire x1="162.56" y1="53.34" x2="162.56" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="93.98" x2="172.72" y2="96.52" width="0.1524" layer="91"/>
 <pinref part="L1" gate="G$1" pin="1"/>
 </segment>
 </net>
@@ -3998,23 +4023,23 @@ SDR0403-560KL - 56uH, 10%, 500mA RMS/740
 <segment>
 <pinref part="L1" gate="G$1" pin="2"/>
 <pinref part="U4" gate="G$1" pin="SW1"/>
-<wire x1="177.8" y1="55.88" x2="177.8" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="96.52" x2="187.96" y2="93.98" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$8" class="0">
 <segment>
 <pinref part="U4" gate="G$1" pin="VIN"/>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="154.94" y1="38.1" x2="152.4" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="152.4" y1="38.1" x2="147.32" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="38.1" x2="147.32" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="78.74" x2="162.56" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="78.74" x2="157.48" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="78.74" x2="157.48" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="U4" gate="G$1" pin="!SHDN"/>
-<wire x1="154.94" y1="35.56" x2="152.4" y2="35.56" width="0.1524" layer="91"/>
-<wire x1="152.4" y1="35.56" x2="152.4" y2="38.1" width="0.1524" layer="91"/>
-<junction x="152.4" y="38.1"/>
+<wire x1="165.1" y1="76.2" x2="162.56" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="76.2" x2="162.56" y2="78.74" width="0.1524" layer="91"/>
+<junction x="162.56" y="78.74"/>
 <pinref part="PAD5" gate="1" pin="P"/>
-<wire x1="129.54" y1="38.1" x2="147.32" y2="38.1" width="0.1524" layer="91"/>
-<junction x="147.32" y="38.1"/>
+<wire x1="139.7" y1="78.74" x2="157.48" y2="78.74" width="0.1524" layer="91"/>
+<junction x="157.48" y="78.74"/>
 </segment>
 </net>
 </nets>