diff --git a/hab.brd b/hab.brd
--- a/hab.brd
+++ b/hab.brd
@@ -169,13 +169,17 @@
 <board>
 <plain>
 <wire x1="4.7625" y1="1.5875" x2="16.8225" y2="1.5875" width="0" layer="20"/>
-<wire x1="16.8225" y1="1.5875" x2="16.8225" y2="22.855" width="0" layer="20"/>
+<wire x1="16.8225" y1="1.5875" x2="16.8275" y2="18.7325" width="0" layer="20"/>
+<wire x1="16.8275" y1="18.7325" x2="16.8275" y2="19.37385" width="0" layer="20"/>
+<wire x1="16.8275" y1="19.37385" x2="26.184225" y2="19.37385" width="0" layer="20"/>
+<wire x1="26.184225" y1="19.37385" x2="26.184225" y2="22.86" width="0" layer="20"/>
+<wire x1="26.184225" y1="22.86" x2="16.8275" y2="22.86" width="0" layer="20"/>
+<wire x1="16.8275" y1="22.86" x2="16.8275" y2="22.855" width="0" layer="20"/>
 <wire x1="4.7625" y1="22.855" x2="4.7625" y2="1.5875" width="0" layer="20"/>
 <wire x1="4.7625" y1="22.855" x2="12.220575" y2="22.86" width="0" layer="20"/>
-<wire x1="12.220575" y1="22.86" x2="12.220575" y2="31.75" width="0" layer="20"/>
-<wire x1="12.220575" y1="31.75" x2="15.713075" y2="31.75" width="0" layer="20"/>
-<wire x1="15.713075" y1="31.75" x2="15.713075" y2="22.855" width="0" layer="20"/>
-<wire x1="15.713075" y1="22.855" x2="16.8225" y2="22.855" width="0" layer="20"/>
+<wire x1="12.220575" y1="22.86" x2="15.713075" y2="22.86" width="0" layer="20"/>
+<wire x1="15.713075" y1="22.86" x2="15.713075" y2="22.855" width="0" layer="20"/>
+<wire x1="15.713075" y1="22.855" x2="16.8275" y2="22.855" width="0" layer="20"/>
 <dimension x1="17.145" y1="1.5875" x2="17.4625" y2="22.86" x3="-7.3025" y3="12.22375" textsize="1.778" layer="108" dtype="vertical" unit="inch"/>
 <dimension x1="4.7625" y1="23.495" x2="16.8275" y2="23.495" x3="10.795" y3="-5.08" textsize="1.778" layer="108" dtype="horizontal" unit="inch"/>
 </plain>
@@ -402,6 +406,27 @@ by exp-lbrs.ulp</description>
 <rectangle x1="-2.45" y1="2" x2="-2" y2="2.45" layer="21"/>
 <rectangle x1="-2.45" y1="0" x2="0" y2="2.45" layer="51"/>
 </package>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="-0.635" y="1.905"/>
+</polygon>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
+</package>
 </packages>
 </library>
 <library name="picoAVA-R9">
@@ -760,7 +785,7 @@ design rules under a new name.</descript
 <element name="PAD1" library="wirepad" package="SMD1,27-2,54" value="" x="11.280775" y="3.16865"/>
 <element name="PAD2" library="wirepad" package="SMD1,27-2,54" value="" x="12.7254" y="3.15595"/>
 <element name="PAD3" library="wirepad" package="SMD1,27-2,54" value="" x="9.8298" y="3.15595"/>
-<element name="U$4" library="picoAVA-R9" package="AVA_JTI_ANTENNA-1575AT43A40" value="AVA_JTI_ANTENNA-1575AT43A40" x="13.97" y="26.9875" rot="MR90"/>
+<element name="U$4" library="picoAVA-R9" package="AVA_JTI_ANTENNA-1575AT43A40" value="AVA_JTI_ANTENNA-1575AT43A40" x="20.955" y="21.116925" rot="MR180"/>
 <element name="U$5" library="picoAVA-R9" package="AVA_UBLOX_MAX-6" value="AVA_UBLOX_MAX-6" x="10.9601" y="17.8435" rot="MR0"/>
 <element name="Q1" library="picoAVA-R9" package="SPARKFUN_SOT23-3" value="SPARKFUN_MOSFET-PCHANNELSMD" x="14.9225" y="5.72135" rot="R180"/>
 <element name="R4" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="100R" x="14.912975" y="20.831175"/>
@@ -773,6 +798,7 @@ design rules under a new name.</descript
 <element name="CM5" library="SparkFun" package="0402-CAP" value="470pF" x="10.645775" y="5.0673" rot="R180"/>
 <element name="PAD4" library="wirepad" package="SMD1,27-2,54" value="" x="5.715" y="3.175" rot="MR0"/>
 <element name="PAD5" library="wirepad" package="SMD1,27-2,54" value="" x="15.875" y="3.175" rot="MR180"/>
+<element name="U$7" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="10.4775" y="3.175" rot="MR270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -818,12 +844,12 @@ design rules under a new name.</descript
 <via x="10.795" y="12.7" extent="1-16" drill="0.381"/>
 <contactref element="PAD4" pad="1"/>
 <via x="13.0175" y="21.9075" extent="1-16" drill="0.381"/>
-<polygon width="0.2032" layer="16" thermals="no">
-<vertex x="14.449425" y="22.86"/>
-<vertex x="14.449425" y="21.9075"/>
-<vertex x="14.9225" y="21.9075"/>
-<vertex x="14.9225" y="22.86"/>
-</polygon>
+<via x="20.955" y="20.955" extent="1-16" drill="0.381"/>
+<wire x1="14.157325" y1="20.22475" x2="14.9352" y2="20.22475" width="0.2032" layer="16"/>
+<contactref element="U$7" pad="2"/>
+<wire x1="9.8298" y1="3.15595" x2="10.4775" y2="3.175" width="0" layer="19" extent="1-16"/>
+<wire x1="12.7254" y1="3.15595" x2="10.4775" y2="3.175" width="0" layer="19" extent="1-16"/>
+<wire x1="10.745" y1="12.72" x2="9.8275" y2="11.43" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="VCC">
 <contactref element="LCHOKE" pad="2"/>
@@ -849,11 +875,6 @@ design rules under a new name.</descript
 <wire x1="13.97" y1="11.755" x2="13.9725" y2="11.908075" width="0.254" layer="1"/>
 <wire x1="14.01695" y1="13.03655" x2="14.01695" y2="13.11315" width="0.254" layer="1"/>
 <wire x1="14.01695" y1="13.11315" x2="15.38385" y2="14.48005" width="0.254" layer="1"/>
-<wire x1="8.6275" y1="19.455575" x2="9.33685" y2="19.455575" width="0.254" layer="1"/>
-<wire x1="9.33685" y1="19.455575" x2="9.794875" y2="19.9136" width="0.254" layer="1"/>
-<wire x1="9.794875" y1="19.9136" x2="11.680825" y2="19.9136" width="0.254" layer="1"/>
-<wire x1="11.680825" y1="19.9136" x2="12.13885" y2="19.455575" width="0.254" layer="1"/>
-<wire x1="12.8275" y1="19.455575" x2="12.13885" y2="19.455575" width="0.254" layer="1"/>
 <wire x1="15.38385" y1="14.48005" x2="15.38385" y2="15.41365" width="0.254" layer="1"/>
 <wire x1="15.38385" y1="15.41365" x2="13.535025" y2="17.262475" width="0.254" layer="1"/>
 <wire x1="13.9725" y1="11.72" x2="13.9725" y2="10.740025" width="0.254" layer="1"/>
@@ -891,26 +912,40 @@ design rules under a new name.</descript
 <wire x1="12.8275" y1="19.455575" x2="13.215175" y2="19.455575" width="0.254" layer="1"/>
 <wire x1="13.215175" y1="19.455575" x2="13.535025" y2="19.135725" width="0.254" layer="1"/>
 <wire x1="13.535025" y1="19.135725" x2="13.535025" y2="17.262475" width="0.254" layer="1"/>
+<wire x1="9.490075" y1="20.380325" x2="9.3345" y2="20.22475" width="0.254" layer="1"/>
+<wire x1="9.3345" y1="20.22475" x2="9.3345" y2="19.60245" width="0.254" layer="1"/>
+<wire x1="9.3345" y1="19.60245" x2="9.178925" y2="19.446875" width="0.254" layer="1"/>
+<wire x1="9.178925" y1="19.446875" x2="8.6362" y2="19.446875" width="0.254" layer="1"/>
+<wire x1="8.6362" y1="19.446875" x2="8.6275" y2="19.455575" width="0.254" layer="1"/>
+<wire x1="12.8275" y1="19.455575" x2="12.4373" y2="19.455575" width="0.254" layer="1"/>
+<wire x1="12.4373" y1="19.455575" x2="11.51255" y2="20.380325" width="0.254" layer="1"/>
+<wire x1="11.51255" y1="20.380325" x2="9.490075" y2="20.380325" width="0.254" layer="1"/>
+<contactref element="U$7" pad="1"/>
+<wire x1="9.2075" y1="3.175" x2="9.2075" y2="2.6162" width="0.254" layer="16"/>
+<wire x1="9.2075" y1="2.6162" x2="9.490075" y2="2.333625" width="0.254" layer="16"/>
+<wire x1="9.490075" y1="2.333625" x2="15.033625" y2="2.333625" width="0.254" layer="16"/>
+<wire x1="15.033625" y1="2.333625" x2="15.875" y2="3.175" width="0.254" layer="16"/>
 </signal>
 <signal name="RADIO-GPIO1">
 <contactref element="U$1" pad="10"/>
 <contactref element="R2" pad="2"/>
 <contactref element="U$6" pad="20"/>
-<via x="9.039225" y="14.6304" extent="1-16" drill="0.381"/>
-<wire x1="9.039225" y1="14.6304" x2="9.039225" y2="13.820775" width="0.254" layer="16"/>
-<wire x1="9.039225" y1="13.820775" x2="9.2075" y2="13.6525" width="0.254" layer="16"/>
-<wire x1="9.2075" y1="13.6525" x2="12.065" y2="13.6525" width="0.254" layer="16"/>
-<wire x1="12.065" y1="13.6525" x2="12.7" y2="14.605" width="0.254" layer="16"/>
 <via x="12.7" y="14.605" extent="1-16" drill="0.381"/>
-<wire x1="8.6275" y1="17.955575" x2="8.309925" y2="17.955575" width="0.2032" layer="1"/>
-<wire x1="8.309925" y1="17.955575" x2="7.934325" y2="17.579975" width="0.2032" layer="1"/>
-<wire x1="7.934325" y1="17.579975" x2="7.934325" y2="17.11325" width="0.2032" layer="1"/>
-<wire x1="7.934325" y1="17.11325" x2="9.039225" y2="16.00835" width="0.2032" layer="1"/>
-<wire x1="9.039225" y1="14.6304" x2="9.039225" y2="16.00835" width="0.2032" layer="1"/>
 <wire x1="12.715" y1="13.72" x2="12.715" y2="14.59" width="0.2032" layer="1"/>
 <wire x1="12.715" y1="14.59" x2="12.7" y2="14.605" width="0.2032" layer="1"/>
 <wire x1="12.715" y1="14.59" x2="13.9739" y2="14.59" width="0.2032" layer="1"/>
 <wire x1="13.9739" y1="14.59" x2="14.08385" y2="14.48005" width="0.2032" layer="1"/>
+<via x="10.423525" y="18.669" extent="1-16" drill="0.381"/>
+<wire x1="8.6275" y1="17.955575" x2="9.0878" y2="17.955575" width="0.2032" layer="1"/>
+<wire x1="9.0878" y1="17.955575" x2="9.801225" y2="18.669" width="0.2032" layer="1"/>
+<wire x1="12.7" y1="14.605" x2="12.7381" y2="14.605" width="0.2032" layer="16"/>
+<wire x1="12.7381" y1="14.605" x2="12.912725" y2="14.779625" width="0.2032" layer="16"/>
+<wire x1="12.912725" y1="14.779625" x2="12.912725" y2="15.24635" width="0.2032" layer="16"/>
+<wire x1="12.912725" y1="15.24635" x2="13.0683" y2="15.401925" width="0.2032" layer="16"/>
+<wire x1="13.0683" y1="15.401925" x2="13.0683" y2="16.335375" width="0.2032" layer="16"/>
+<wire x1="10.423525" y1="18.669" x2="10.734675" y2="18.669" width="0.2032" layer="16"/>
+<wire x1="10.734675" y1="18.669" x2="13.0683" y2="16.335375" width="0.2032" layer="16"/>
+<wire x1="9.801225" y1="18.669" x2="10.423525" y2="18.669" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-SHDN">
 <contactref element="U$1" pad="1"/>
@@ -921,19 +956,16 @@ design rules under a new name.</descript
 <wire x1="7.58" y1="11.09385" x2="7.58" y2="11.866875" width="0.254" layer="1"/>
 <wire x1="7.58" y1="11.866875" x2="7.15645" y2="12.290425" width="0.254" layer="1"/>
 <via x="7.15645" y="12.290425" extent="1-16" drill="0.381"/>
-<via x="9.64565" y="18.202275" extent="1-16" drill="0.381"/>
-<wire x1="7.15645" y1="12.290425" x2="7.210425" y2="12.290425" width="0.254" layer="16"/>
-<wire x1="7.210425" y1="12.290425" x2="7.9375" y2="13.0175" width="0.254" layer="16"/>
-<wire x1="7.9375" y1="13.0175" x2="7.9375" y2="13.071475" width="0.2032" layer="16"/>
-<wire x1="7.9375" y1="13.071475" x2="8.40105" y2="13.535025" width="0.2032" layer="16"/>
-<wire x1="8.40105" y1="13.535025" x2="8.40105" y2="14.9352" width="0.2032" layer="16"/>
-<wire x1="8.40105" y1="14.9352" x2="8.7122" y2="15.24635" width="0.2032" layer="16"/>
-<wire x1="8.7122" y1="15.24635" x2="9.3345" y2="15.24635" width="0.2032" layer="16"/>
-<wire x1="9.3345" y1="15.24635" x2="9.490075" y2="15.401925" width="0.2032" layer="16"/>
-<wire x1="9.490075" y1="15.401925" x2="9.490075" y2="18.0467" width="0.2032" layer="16"/>
-<wire x1="9.490075" y1="18.0467" x2="9.64565" y2="18.202275" width="0.2032" layer="16"/>
-<wire x1="8.6275" y1="18.455575" x2="9.39235" y2="18.455575" width="0.2032" layer="1"/>
-<wire x1="9.39235" y1="18.455575" x2="9.64565" y2="18.202275" width="0.2032" layer="1"/>
+<via x="9.9568" y="19.459575" extent="1-16" drill="0.381"/>
+<wire x1="7.210425" y1="12.290425" x2="7.4676" y2="12.5476" width="0.2032" layer="16"/>
+<wire x1="7.4676" y1="12.5476" x2="7.4676" y2="14.157325" width="0.2032" layer="16"/>
+<wire x1="7.4676" y1="14.157325" x2="8.245475" y2="14.9352" width="0.2032" layer="16"/>
+<wire x1="8.245475" y1="14.9352" x2="8.245475" y2="17.73555" width="0.2032" layer="16"/>
+<wire x1="8.245475" y1="17.73555" x2="9.502775" y2="18.99285" width="0.2032" layer="16"/>
+<wire x1="9.502775" y1="18.99285" x2="9.9568" y2="19.459575" width="0.2032" layer="16"/>
+<wire x1="7.210425" y1="12.290425" x2="7.15645" y2="12.290425" width="0.2032" layer="16"/>
+<wire x1="8.6275" y1="18.455575" x2="8.9528" y2="18.455575" width="0.2032" layer="1"/>
+<wire x1="8.9528" y1="18.455575" x2="9.9568" y2="19.459575" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="U$1" pad="4"/>
@@ -1026,13 +1058,15 @@ design rules under a new name.</descript
 <wire x1="8.40105" y1="20.380325" x2="8.40105" y2="21.002625" width="0.2032" layer="16"/>
 <wire x1="8.40105" y1="21.1582" x2="12.290425" y2="21.1582" width="0.2032" layer="16"/>
 <wire x1="12.290425" y1="21.1582" x2="13.0683" y2="20.380325" width="0.2032" layer="16"/>
-<wire x1="13.0683" y1="20.380325" x2="13.0683" y2="17.73555" width="0.2032" layer="16"/>
-<wire x1="13.0683" y1="17.73555" x2="13.35405" y2="16.4973" width="0.2032" layer="16"/>
-<wire x1="13.35405" y1="16.4973" x2="13.35405" y2="14.2875" width="0.2032" layer="16"/>
 <wire x1="13.35405" y1="14.2875" x2="13.35405" y2="6.662875" width="0.2032" layer="16"/>
 <wire x1="13.35405" y1="6.662875" x2="14.9225" y2="5.411925" width="0.2032" layer="16"/>
 <wire x1="11.1275" y1="11.43" x2="11.76655" y2="11.43" width="0.2032" layer="16"/>
 <wire x1="11.76655" y1="11.43" x2="13.35405" y2="14.2875" width="0.2032" layer="16"/>
+<wire x1="13.35405" y1="14.2875" x2="13.35405" y2="14.9098" width="0.2032" layer="16"/>
+<wire x1="13.35405" y1="14.9098" x2="13.535025" y2="15.090775" width="0.2032" layer="16"/>
+<wire x1="13.535025" y1="15.090775" x2="13.535025" y2="18.824575" width="0.2032" layer="16"/>
+<wire x1="13.535025" y1="18.824575" x2="13.0683" y2="19.2913" width="0.2032" layer="16"/>
+<wire x1="13.0683" y1="19.2913" x2="13.0683" y2="20.380325" width="0.2032" layer="16"/>
 <wire x1="14.9225" y1="4.62135" x2="14.9225" y2="5.411925" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$6">
@@ -1046,20 +1080,19 @@ design rules under a new name.</descript
 <via x="15.875" y="9.2075" extent="1-16" drill="0.381"/>
 <wire x1="15.875" y1="9.2075" x2="15.875" y2="10.4775" width="0.2032" layer="16"/>
 <wire x1="15.875" y1="10.4775" x2="13.97" y2="12.3825" width="0.2032" layer="16"/>
-<wire x1="13.97" y1="12.3825" x2="13.97" y2="19.167475" width="0.2032" layer="16"/>
-<wire x1="13.97" y1="19.167475" x2="14.157325" y2="19.2913" width="0.2032" layer="16"/>
-<via x="14.157325" y="19.2913" extent="1-16" drill="0.381"/>
-<wire x1="14.157325" y1="19.2913" x2="15.001875" y2="19.446875" width="0.2032" layer="1"/>
-<wire x1="15.001875" y1="19.446875" x2="15.5575" y2="20.0025" width="0.2032" layer="1"/>
+<wire x1="13.97" y1="12.3825" x2="13.97" y2="19.478625" width="0.2032" layer="16"/>
+<wire x1="13.97" y1="19.478625" x2="14.00175" y2="19.60245" width="0.2032" layer="16"/>
+<via x="14.00175" y="19.60245" extent="1-16" drill="0.381"/>
+<wire x1="14.00175" y1="19.60245" x2="15.15745" y2="19.60245" width="0.2032" layer="1"/>
+<wire x1="15.15745" y1="19.60245" x2="15.5575" y2="20.0025" width="0.2032" layer="1"/>
 <wire x1="15.5575" y1="20.0025" x2="15.5575" y2="20.8257" width="0.2032" layer="1"/>
 <wire x1="15.5575" y1="20.8257" x2="15.562975" y2="20.831175" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U$5" pad="11_RF_IN"/>
 <contactref element="U$4" pad="FEED"/>
-<wire x1="15.5101" y1="21.0935" x2="14.149" y2="21.0935" width="0.2032" layer="16"/>
-<wire x1="14.149" y1="21.0935" x2="13.97" y2="21.2725" width="0.2032" layer="16"/>
-<wire x1="13.97" y1="21.2725" x2="13.97" y2="23.8125" width="0.2032" layer="16"/>
+<wire x1="15.5101" y1="21.0935" x2="17.6415" y2="21.0935" width="0.2032" layer="16"/>
+<wire x1="17.6415" y1="21.0935" x2="17.78" y2="21.116925" width="0.2032" layer="16"/>
 </signal>
 <signal name="TIMEPULSE">
 <contactref element="U$5" pad="4_TIMEPULSE"/>
@@ -1067,42 +1100,39 @@ design rules under a new name.</descript
 <signal name="GPS-RX">
 <contactref element="U$5" pad="3_RXD1"/>
 <contactref element="U$6" pad="27"/>
-<via x="10.734675" y="18.669" extent="1-16" drill="0.381"/>
-<wire x1="6.0101" y1="15.5935" x2="7.5036" y2="15.5935" width="0.2032" layer="16"/>
-<wire x1="7.5036" y1="15.5935" x2="8.40105" y2="16.49095" width="0.2032" layer="16"/>
-<wire x1="8.40105" y1="16.49095" x2="8.40105" y2="18.824575" width="0.2032" layer="16"/>
-<wire x1="8.40105" y1="18.824575" x2="9.02335" y2="19.446875" width="0.2032" layer="16"/>
-<wire x1="9.02335" y1="19.446875" x2="9.490075" y2="19.446875" width="0.2032" layer="16"/>
-<wire x1="9.490075" y1="19.446875" x2="9.9568" y2="19.9136" width="0.2032" layer="16"/>
-<wire x1="9.9568" y1="19.9136" x2="11.8237" y2="19.9136" width="0.2032" layer="16"/>
-<wire x1="11.8237" y1="19.9136" x2="12.446" y2="19.2913" width="0.2032" layer="16"/>
-<wire x1="12.446" y1="19.2913" x2="12.446" y2="18.35785" width="0.2032" layer="16"/>
-<wire x1="12.446" y1="18.35785" x2="12.290425" y2="18.202275" width="0.2032" layer="16"/>
-<wire x1="12.290425" y1="18.202275" x2="11.2014" y2="18.202275" width="0.2032" layer="16"/>
-<wire x1="11.2014" y1="18.202275" x2="10.734675" y2="18.669" width="0.2032" layer="16"/>
-<wire x1="11.7275" y1="16.855575" x2="11.7275" y2="17.165" width="0.2032" layer="1"/>
-<wire x1="11.7275" y1="17.165" x2="10.734675" y2="18.157825" width="0.2032" layer="1"/>
-<wire x1="10.734675" y1="18.669" x2="10.734675" y2="18.157825" width="0.2032" layer="1"/>
+<via x="11.356975" y="18.98015" extent="1-16" drill="0.381"/>
+<wire x1="6.0101" y1="15.5935" x2="7.182925" y2="15.5935" width="0.2032" layer="16"/>
+<wire x1="11.7275" y1="16.855575" x2="11.7275" y2="18.609625" width="0.2032" layer="1"/>
+<wire x1="11.7275" y1="18.609625" x2="11.356975" y2="18.98015" width="0.2032" layer="1"/>
+<wire x1="7.182925" y1="15.5935" x2="7.312025" y2="15.7226" width="0.2032" layer="16"/>
+<wire x1="7.292975" y1="18.183225" x2="7.312025" y2="15.7226" width="0.2032" layer="16"/>
+<wire x1="7.292975" y1="18.183225" x2="8.7122" y2="19.60245" width="0.2032" layer="16"/>
+<wire x1="8.7122" y1="19.60245" x2="8.7122" y2="19.758025" width="0.2032" layer="16"/>
+<wire x1="8.7122" y1="19.758025" x2="9.64565" y2="20.691475" width="0.2032" layer="16"/>
+<wire x1="9.64565" y1="20.691475" x2="11.356975" y2="20.691475" width="0.2032" layer="16"/>
+<wire x1="11.356975" y1="20.691475" x2="11.51255" y2="20.5359" width="0.2032" layer="16"/>
+<wire x1="11.51255" y1="20.5359" x2="11.51255" y2="18.98015" width="0.2032" layer="16"/>
+<wire x1="11.51255" y1="18.98015" x2="11.356975" y2="18.98015" width="0.2032" layer="16"/>
 </signal>
 <signal name="GPS-TX">
 <contactref element="U$5" pad="2_TXD1"/>
 <contactref element="U$6" pad="28"/>
-<via x="11.668125" y="18.824575" extent="1-16" drill="0.381"/>
-<wire x1="6.0101" y1="14.4935" x2="7.6482" y2="14.4935" width="0.2032" layer="16"/>
-<wire x1="7.6482" y1="14.4935" x2="7.934325" y2="14.779625" width="0.2032" layer="16"/>
-<wire x1="7.934325" y1="14.779625" x2="7.934325" y2="15.24635" width="0.2032" layer="16"/>
-<wire x1="7.934325" y1="15.24635" x2="8.40105" y2="15.713075" width="0.2032" layer="16"/>
-<wire x1="8.40105" y1="15.713075" x2="8.867775" y2="15.713075" width="0.2032" layer="16"/>
-<wire x1="8.867775" y1="15.713075" x2="8.867775" y2="18.513425" width="0.2032" layer="16"/>
-<wire x1="8.867775" y1="18.513425" x2="9.178925" y2="18.824575" width="0.2032" layer="16"/>
-<wire x1="9.178925" y1="18.824575" x2="9.64565" y2="18.824575" width="0.2032" layer="16"/>
-<wire x1="9.64565" y1="18.824575" x2="10.26795" y2="19.446875" width="0.2032" layer="16"/>
-<wire x1="10.26795" y1="19.446875" x2="11.045825" y2="19.446875" width="0.2032" layer="16"/>
-<wire x1="11.045825" y1="19.446875" x2="11.668125" y2="18.824575" width="0.2032" layer="16"/>
-<wire x1="11.668125" y1="18.824575" x2="11.668125" y2="17.891125" width="0.2032" layer="1"/>
-<wire x1="11.668125" y1="17.891125" x2="12.2275" y2="17.33175" width="0.2032" layer="1"/>
-<wire x1="12.2275" y1="17.0206" x2="12.2275" y2="17.33175" width="0.2032" layer="1"/>
-<wire x1="12.2275" y1="17.0206" x2="12.2275" y2="16.855575" width="0" layer="19" extent="1-1"/>
+<via x="10.8839" y="19.758025" extent="1-16" drill="0.381"/>
+<wire x1="6.0101" y1="14.4935" x2="7.191" y2="14.4935" width="0.2032" layer="16"/>
+<wire x1="7.191" y1="14.4935" x2="7.794625" y2="15.097125" width="0.2032" layer="16"/>
+<wire x1="12.2275" y1="16.855575" x2="12.2275" y2="17.176175" width="0.2032" layer="1"/>
+<wire x1="12.2275" y1="17.176175" x2="12.13485" y2="17.268825" width="0.2032" layer="1"/>
+<wire x1="12.13485" y1="17.268825" x2="12.13485" y2="19.135725" width="0.2032" layer="1"/>
+<wire x1="7.77875" y1="18.0467" x2="7.77875" y2="15.268575" width="0.2032" layer="16"/>
+<wire x1="7.77875" y1="15.268575" x2="7.794625" y2="15.097125" width="0.2032" layer="16"/>
+<wire x1="10.8839" y1="19.758025" x2="10.8839" y2="20.075525" width="0.2032" layer="16"/>
+<wire x1="10.8839" y1="20.075525" x2="10.734675" y2="20.22475" width="0.2032" layer="16"/>
+<wire x1="10.734675" y1="20.22475" x2="9.801225" y2="20.22475" width="0.2032" layer="16"/>
+<wire x1="7.77875" y1="18.0467" x2="9.178925" y2="19.446875" width="0.2032" layer="16"/>
+<wire x1="9.178925" y1="19.446875" x2="9.178925" y2="19.60245" width="0.2032" layer="16"/>
+<wire x1="9.178925" y1="19.60245" x2="9.801225" y2="20.22475" width="0.2032" layer="16"/>
+<wire x1="12.13485" y1="19.135725" x2="11.51255" y2="19.758025" width="0.2032" layer="1"/>
+<wire x1="11.51255" y1="19.758025" x2="10.8839" y2="19.758025" width="0.2032" layer="1"/>
 </signal>
 <signal name="GPS-EN">
 <contactref element="R4" pad="1"/>
@@ -1117,9 +1147,10 @@ design rules under a new name.</descript
 <wire x1="10.245" y1="15.4725" x2="10.16" y2="15.5575" width="0.2032" layer="1"/>
 <via x="10.16" y="15.5575" extent="1-16" drill="0.381"/>
 <via x="11.43" y="16.030575" extent="1-16" drill="0.381"/>
-<wire x1="11.43" y1="16.030575" x2="10.16" y2="15.5575" width="0.2032" layer="16"/>
 <wire x1="11.2275" y1="16.855575" x2="11.2275" y2="16.233075" width="0.2032" layer="1"/>
 <wire x1="11.2275" y1="16.233075" x2="11.43" y2="16.030575" width="0.2032" layer="1"/>
+<wire x1="10.16" y1="15.5575" x2="10.956925" y2="15.5575" width="0.2032" layer="16"/>
+<wire x1="10.956925" y1="15.5575" x2="11.43" y2="16.030575" width="0.2032" layer="16"/>
 </signal>
 <signal name="RADIO-MISO">
 <contactref element="U$6" pad="25"/>
@@ -1134,17 +1165,16 @@ design rules under a new name.</descript
 <signal name="RADIO-SCK">
 <contactref element="U$6" pad="24"/>
 <contactref element="U$1" pad="12"/>
-<via x="10.26795" y="17.579975" extent="1-16" drill="0.381"/>
+<via x="10.734675" y="17.73555" extent="1-16" drill="0.381"/>
 <via x="12.3825" y="15.719425" extent="1-16" drill="0.381"/>
 <wire x1="11.245" y1="14.69" x2="11.245" y2="15.28995" width="0.2032" layer="1"/>
 <wire x1="11.245" y1="15.28995" x2="11.356975" y2="15.401925" width="0.2032" layer="1"/>
 <wire x1="11.356975" y1="15.401925" x2="11.909425" y2="15.401925" width="0.2032" layer="1"/>
 <wire x1="11.909425" y1="15.401925" x2="12.3825" y2="15.719425" width="0.2032" layer="1"/>
-<wire x1="12.3825" y1="15.719425" x2="12.3825" y2="16.8275" width="0.2032" layer="16"/>
-<wire x1="12.3825" y1="16.8275" x2="11.630025" y2="17.579975" width="0.2032" layer="16"/>
-<wire x1="10.26795" y1="17.579975" x2="11.630025" y2="17.579975" width="0.2032" layer="16"/>
-<wire x1="10.2275" y1="16.855575" x2="10.2275" y2="17.539525" width="0.2032" layer="1"/>
-<wire x1="10.2275" y1="17.539525" x2="10.26795" y2="17.579975" width="0.2032" layer="1"/>
+<wire x1="12.3825" y1="15.719425" x2="12.3825" y2="16.087725" width="0.2032" layer="16"/>
+<wire x1="12.3825" y1="16.087725" x2="10.734675" y2="17.73555" width="0.2032" layer="16"/>
+<wire x1="10.2275" y1="16.855575" x2="10.2275" y2="17.228375" width="0.2032" layer="1"/>
+<wire x1="10.2275" y1="17.228375" x2="10.734675" y2="17.73555" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-NSS">
 <contactref element="U$6" pad="23"/>
@@ -1158,9 +1188,32 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWCLK">
 <contactref element="U$6" pad="22"/>
+<wire x1="9.2275" y1="16.855575" x2="9.2275" y2="16.38395" width="0.2032" layer="1"/>
+<wire x1="9.2275" y1="16.38395" x2="8.867775" y2="16.024225" width="0.2032" layer="1"/>
+<wire x1="8.867775" y1="16.024225" x2="8.867775" y2="14.627225" width="0.2032" layer="1"/>
+<wire x1="8.867775" y1="14.627225" x2="8.89" y2="14.605" width="0.2032" layer="1"/>
+<via x="8.89" y="14.605" extent="1-16" drill="0.381"/>
+<wire x1="8.89" y1="14.605" x2="8.89" y2="13.0175" width="0.2032" layer="16"/>
+<contactref element="U$7" pad="3"/>
+<wire x1="11.7475" y1="3.175" x2="8.89" y2="6.0325" width="0.254" layer="16"/>
+<wire x1="8.89" y1="13.0175" x2="8.89" y2="6.0325" width="0.254" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U$6" pad="21"/>
+<via x="9.801225" y="17.73555" extent="1-16" drill="0.381"/>
+<wire x1="9.801225" y1="17.73555" x2="9.64565" y2="15.86865" width="0.2032" layer="16"/>
+<wire x1="9.64565" y1="15.86865" x2="9.490075" y2="15.713075" width="0.2032" layer="16"/>
+<wire x1="9.490075" y1="15.713075" x2="9.490075" y2="15.24635" width="0.2032" layer="16"/>
+<wire x1="9.490075" y1="15.24635" x2="10.112375" y2="14.62405" width="0.2032" layer="16"/>
+<wire x1="10.112375" y1="14.62405" x2="10.112375" y2="13.0683" width="0.2032" layer="16"/>
+<wire x1="8.6275" y1="17.455575" x2="9.054525" y2="17.455575" width="0.2032" layer="1"/>
+<wire x1="9.054525" y1="17.455575" x2="9.178925" y2="17.579975" width="0.2032" layer="1"/>
+<wire x1="9.178925" y1="17.579975" x2="9.64565" y2="17.579975" width="0.2032" layer="1"/>
+<wire x1="9.64565" y1="17.579975" x2="9.801225" y2="17.73555" width="0.2032" layer="1"/>
+<contactref element="U$7" pad="4"/>
+<wire x1="13.0175" y1="3.175" x2="9.2075" y2="6.985" width="0.254" layer="16"/>
+<wire x1="9.2075" y1="6.985" x2="9.2075" y2="12.163425" width="0.254" layer="16"/>
+<wire x1="9.2075" y1="12.163425" x2="10.112375" y2="13.0683" width="0.254" layer="16"/>
 </signal>
 <signal name="N$2">
 <contactref element="PAD1" pad="1"/>