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>