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="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" 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="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" 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="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="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="yes" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="no" 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"/>
@@ -196,22 +196,21 @@
 <wire x1="21.351875" y1="0.552846875" x2="21.351875" y2="20.79625" width="0" layer="20"/>
 <wire x1="21.351875" y1="20.79625" x2="20.716875" y2="21.43125" width="0" layer="20" curve="90"/>
 <wire x1="20.716875" y1="21.43125" x2="16.8275" y2="21.43125" width="0" layer="20"/>
-<wire x1="16.8275" y1="21.43125" x2="16.8275" y2="22.2232" width="0" layer="20"/>
-<wire x1="16.8275" y1="22.2232" x2="15.317575" y2="23.65375" width="0" layer="20" curve="90"/>
-<wire x1="15.317575" y1="23.65375" x2="14.97135625" y2="23.65375" width="0" layer="20"/>
-<wire x1="14.97135625" y1="23.65375" x2="13.573125" y2="22.01739375" width="0" layer="20" curve="90"/>
-<wire x1="13.573125" y1="22.01739375" x2="13.573125" y2="21.43125" width="0" layer="20"/>
+<wire x1="16.8275" y1="21.43125" x2="16.8275" y2="22.5407" width="0" layer="20"/>
+<wire x1="16.8275" y1="22.5407" x2="15.317575" y2="23.97125" width="0" layer="20" curve="90"/>
+<wire x1="15.317575" y1="23.97125" x2="14.97135625" y2="23.97125" width="0" layer="20"/>
+<wire x1="14.97135625" y1="23.97125" x2="13.573125" y2="22.33489375" width="0" layer="20" curve="90"/>
+<wire x1="13.573125" y1="22.33489375" x2="13.573125" y2="21.43125" width="0" layer="20"/>
 <dimension x1="21.59" y1="0" x2="21.9075" y2="21.2725" x3="-2.8575" y3="10.63625" textsize="1.778" layer="108" dtype="vertical" unit="inch"/>
 <dimension x1="9.2075" y1="21.9075" x2="21.2725" y2="21.9075" x3="15.24" y3="-6.6675" textsize="1.778" layer="108" dtype="horizontal" unit="inch"/>
-<hole x="15.1765" y="22.069425" drill="1.5875"/>
-<text x="19.605625" y="7.223125" size="0.8128" layer="22" font="vector" ratio="16" rot="MR0">vin</text>
-<text x="21.034375" y="2.38125" size="0.8128" layer="22" ratio="16" rot="MR0">protofusion.org/fh</text>
-<circle x="13.97" y="8.969375" radius="0.079375" width="0.4064" layer="22"/>
+<hole x="15.1765" y="22.386925" drill="1.5875"/>
+<text x="11.43" y="5.000625" size="0.8128" layer="22" font="vector" ratio="16" rot="MR0">vin</text>
+<text x="20.240625" y="1.27" size="0.8128" layer="22" ratio="16" rot="MR90">protofusion.org</text>
+<circle x="16.906875" y="7.3025" radius="0.079375" width="0.4064" layer="22"/>
 <circle x="12.620625" y="8.810625" radius="0.079375" width="0.4064" layer="21"/>
 <circle x="17.62125" y="14.9225" radius="0.079375" width="0.4064" layer="21"/>
 <circle x="10.080625" y="15.954375" radius="0.079375" width="0.4064" layer="21"/>
-<text x="9.604375" y="8.73125" size="0.8128" layer="29" font="vector" ratio="16" rot="SR270">featherhab</text>
-<text x="9.604375" y="1.5875" size="0.8128" layer="29" font="vector" ratio="16" rot="SR270">2</text>
+<text x="9.525" y="9.604375" size="0.762" layer="29" font="vector" ratio="16" rot="SR270">feather2</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -338,18 +337,6 @@ by exp-lbrs.ulp</description>
 </package>
 </packages>
 </library>
-<library name="wirepad">
-<description>&lt;b&gt;Single Pads&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="SMD1,27-2,54">
-<description>&lt;b&gt;SMD PAD&lt;/b&gt;</description>
-<smd name="1" x="0" y="0" dx="1.27" dy="2.54" layer="1"/>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-0.8" y="-2.4" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-</package>
-</packages>
-</library>
 <library name="Protofusion">
 <packages>
 <package name="UFQFPN28">
@@ -978,15 +965,37 @@ Cream on SMD OFF.&lt;br&gt;
 new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
 <packages>
-<package name="TP11R">
+<package name="TP08SQ">
 <description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.1" dy="1.1" layer="1" roundness="100" cream="no"/>
-<text x="-0.5499" y="0.5999" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
+<smd name="TP" x="0" y="0" dx="0.8" dy="0.8" layer="1" cream="no"/>
+<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
+<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
 <text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
 </package>
 </packages>
 </library>
+<library name="SLAT-Connectors">
+<description>SLAT Connectors</description>
+<packages>
+<package name="JST_ZH-V-2-1">
+<wire x1="2.98" y1="-2.2" x2="2.98" y2="1.3" width="0.254" layer="21"/>
+<wire x1="2.98" y1="1.3" x2="-1.52" y2="1.3" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="1.3" x2="-1.52" y2="-2.2" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="-2.2" x2="2.98" y2="-2.2" width="0.254" layer="21"/>
+<wire x1="2.98" y1="0.3" x2="2.48" y2="0.3" width="0.254" layer="21"/>
+<wire x1="2.48" y1="0.3" x2="2.48" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="2.48" y1="-0.7" x2="2.98" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="0.3" x2="-1.02" y2="0.3" width="0.254" layer="21"/>
+<wire x1="-1.02" y1="0.3" x2="-1.02" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="-1.02" y1="-0.7" x2="-1.52" y2="-0.7" width="0.254" layer="21"/>
+<pad name="1" x="0" y="-0.02" drill="0.7" diameter="1.016" shape="long" rot="R90"/>
+<pad name="2" x="1.5" y="-0.02" drill="0.7" diameter="1.016" shape="long" rot="R90"/>
+<text x="-1.6292" y="1.7272" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.7054" y="-3.9116" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="-1.5" y1="-2.25" x2="-0.75" y2="-1.5" layer="25"/>
+</package>
+</packages>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1220,45 +1229,47 @@ Please make sure your boards conform to 
 <element name="U2" library="picoAVA-R8" package="CRYSTAL_3.2X2.5-TCXO" value="CRYSTAL_3.2X2.5-TCXO" x="10.75875" y="15.2875" smashed="yes" rot="R270">
 <attribute name="NAME" x="11.40875" y="17.7375" size="1" layer="25" font="vector" ratio="12"/>
 </element>
-<element name="R1" library="SparkFun" package="0402-RES" value="100k" x="11.375" y="9.50635" smashed="yes">
-<attribute name="NAME" x="8.525" y="9.70635" size="0.4064" layer="25"/>
-<attribute name="VALUE" x="8.525" y="9.10635" size="0.4064" layer="27"/>
+<element name="R1" library="SparkFun" package="0402-RES" value="100k" x="11.375" y="10.14135" smashed="yes">
+<attribute name="NAME" x="8.525" y="10.34135" size="0.4064" layer="25"/>
+<attribute name="VALUE" x="8.525" y="9.74135" size="0.4064" layer="27"/>
 </element>
 <element name="R2" library="SparkFun" package="0402-RES" value="100k" x="18.86135" y="13.0513" rot="R180"/>
 <element name="U$4" library="picoAVA-R9" package="AVA_JTI_ANTENNA-1575AT43A40" value="AVA_JTI_ANTENNA-1575AT43A40" x="4.7625" y="12.855575" rot="MR0"/>
 <element name="U5" library="picoAVA-R9" package="AVA_UBLOX_MAX-6" value="AVA_UBLOX_MAX-6" x="15.0749" y="16.129" rot="MR180"/>
 <element name="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.00555"/>
+<element name="R4" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="100R" x="19.357975" y="18.926175"/>
 <element name="R5" library="picoAVA-R9" package="SPARKFUN_0402-RES" value="10k" x="19.52625" y="6.50875"/>
 <element name="C7" library="picoAVA-R9" package="SPARKFUN_0402-CAP" value="0.1uF" x="19.20875" y="14.44625"/>
 <element name="U6" library="Protofusion" package="UFQFPN28" value="STM32F031G6U6" x="14.9225" y="17.618075" rot="R180"/>
 <element name="CM1" library="SparkFun" package="0402-CAP" value="1.8pF" x="14.3002" y="3.16865" rot="R180"/>
 <element name="CM4" library="SparkFun" package="0402-CAP" value="4.7pF" x="12.0777" y="6.1849" rot="R90"/>
-<element name="PAD4" library="wirepad" package="SMD1,27-2,54" value="" x="19.05" y="3.96875" rot="MR90"/>
-<element name="PAD5" library="wirepad" package="SMD1,27-2,54" value="" x="19.129375" y="6.429375" 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"/>
-<element name="C9" library="SparkFun" package="0805" value="47uF" x="15.636875" y="9.8425" rot="MR0"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="16.51" y="1.27" rot="MR270"/>
+<element name="U4" library="Protofusion" package="TSOT23-6" value="LTC3531-3.3" x="14.525625" y="6.0325" rot="MR270"/>
+<element name="C6" library="SparkFun" package="0805" value="47uF" x="14.843125" y="3.81" rot="MR180"/>
+<element name="L1" library="SparkFun-Passives" package="1210" value="LQH32CN100K33L" x="14.525625" y="9.445625" rot="MR0"/>
+<element name="C9" library="SparkFun" package="0805" value="47uF" x="18.176875" y="4.365625" rot="MR270"/>
 <element name="C5" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.556875" y="19.288125" rot="R180"/>
 <element name="C8" library="SparkFun" package="0402-CAP" value="0.1uF" x="19.446875" y="16.66875" rot="R90"/>
 <element name="U$3" library="Protofusion" package="FEATHERHAB-ALPHA" value="" x="0.3175" y="12.22375"/>
 <element name="C10" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.556875" y="18.0975" rot="R180"/>
 <element name="LED1" library="adafruit" package="CHIPLED_0603" value="" x="10.715625" y="20.47875" rot="R90"/>
 <element name="R6" library="SLAT-RCL" package="R0402" value="" x="13.255625" y="20.47875"/>
-<element name="TP1" library="testpad" package="TP11R" value="TPTP11R" x="18.653125" y="20.399375">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.653125" y="20.399375" size="1.778" layer="27" display="off"/>
+<element name="TP1" library="testpad" package="TP08SQ" value="TPTP08SQ" x="18.7325" y="20.081875">
+<attribute name="TP_SIGNAL_NAME" value="" x="18.7325" y="20.081875" size="1.778" layer="27" display="off"/>
 </element>
-<element name="TP2" library="testpad" package="TP11R" value="TPTP11R" x="17.383125" y="20.399375">
-<attribute name="TP_SIGNAL_NAME" value="" x="17.383125" y="20.399375" size="1.778" layer="27" display="off"/>
+<element name="TP2" library="testpad" package="TP08SQ" value="TPTP08SQ" x="17.4625" y="20.081875">
+<attribute name="TP_SIGNAL_NAME" value="" x="17.4625" y="20.081875" size="1.778" layer="27" display="off"/>
 </element>
-<element name="TP3" library="testpad" package="TP11R" value="TPTP11R" x="19.923125" y="20.399375">
-<attribute name="TP_SIGNAL_NAME" value="" x="19.923125" y="20.399375" size="1.778" layer="27" display="off"/>
+<element name="TP3" library="testpad" package="TP08SQ" value="TPTP08SQ" x="20.0025" y="20.081875">
+<attribute name="TP_SIGNAL_NAME" value="" x="20.0025" y="20.081875" size="1.778" layer="27" display="off"/>
 </element>
-<element name="U$1" library="Protofusion" package="WIREPAD" value="WIREPAD" x="16.8275" y="1.349375"/>
-<element name="U$2" library="Protofusion" package="WIREPAD" value="WIREPAD" x="15.08125" y="1.349375"/>
-<element name="U$5" library="Protofusion" package="WIREPAD" value="WIREPAD" x="13.335" y="1.349375"/>
+<element name="GND-1" library="Protofusion" package="WIREPAD" value="WIREPAD" x="16.98625" y="1.349375"/>
+<element name="ANT" library="Protofusion" package="WIREPAD" value="WIREPAD" x="15.24" y="1.349375"/>
+<element name="GND-2" library="Protofusion" package="WIREPAD" value="WIREPAD" x="13.49375" y="1.349375"/>
+<element name="J3" library="SLAT-Connectors" package="JST_ZH-V-2-1" value="JST_ZH-V-2-1" x="10.795" y="3.175" rot="MR270"/>
+<element name="R3" library="SLAT-RCL" package="R0402" value="2M 1%" x="10.795" y="5.55625" rot="MR180"/>
+<element name="R7" library="SLAT-RCL" package="R0402" value="2M 1%" x="10.795" y="6.6675" rot="MR0"/>
+<element name="CM3" library="SparkFun" package="0402-CAP" value="0.1uF" x="10.715625" y="7.858125" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1300,13 +1311,10 @@ Please make sure your boards conform to 
 <contactref element="U5" pad="12_GND"/>
 <contactref element="U5" pad="10_GND"/>
 <contactref element="U5" pad="1_GND"/>
-<via x="17.243425" y="7.1374" extent="1-16" drill="0.3302"/>
-<via x="11.198225" y="4.08305" extent="1-16" drill="0.3302"/>
+<via x="17.0053" y="6.740525" extent="1-16" drill="0.3302"/>
 <contactref element="U6" pad="16"/>
-<via x="15.24" y="11.1125" extent="1-16" drill="0.3302"/>
-<contactref element="PAD4" pad="1"/>
+<via x="14.208125" y="10.16" extent="1-16" drill="0.3302"/>
 <contactref element="J1" pad="2"/>
-<via x="9.8806" y="10.4521" extent="1-16" drill="0.3302"/>
 <contactref element="U4" pad="2"/>
 <contactref element="C6" pad="2"/>
 <contactref element="C9" pad="2"/>
@@ -1316,41 +1324,45 @@ Please make sure your boards conform to 
 <vertex x="17.145" y="-1.27"/>
 <vertex x="10.795" y="-1.27"/>
 </polygon>
-<via x="16.1925" y="12.065" extent="1-16" drill="0.3302"/>
-<via x="14.2875" y="12.065" extent="1-16" drill="0.3302"/>
-<via x="16.278225" y="4.3942" extent="1-16" drill="0.3302"/>
-<via x="12.150725" y="4.08305" extent="1-16" drill="0.3302"/>
-<via x="12.150725" y="3.209925" extent="1-16" drill="0.3302"/>
-<via x="12.150725" y="2.257425" extent="1-16" drill="0.3302"/>
-<via x="10.880725" y="5.03555" extent="1-16" drill="0.3302"/>
-<via x="10.880725" y="5.98805" extent="1-16" drill="0.3302"/>
-<via x="10.880725" y="6.94055" extent="1-16" drill="0.3302"/>
-<via x="10.880725" y="7.89305" extent="1-16" drill="0.3302"/>
-<via x="16.278225" y="3.4417" extent="1-16" drill="0.3302"/>
-<via x="17.3101" y="5.0292" extent="1-16" drill="0.3302"/>
-<via x="17.3101" y="5.82295" extent="1-16" drill="0.3302"/>
-<via x="17.15135" y="3.044825" extent="1-16" drill="0.3302"/>
-<via x="19.5326" y="5.1943" extent="1-16" drill="0.3302"/>
-<via x="19.135725" y="8.3693" extent="1-16" drill="0.3302"/>
-<via x="18.818225" y="7.57555" extent="1-16" drill="0.3302"/>
-<via x="17.071975" y="3.997325" extent="1-16" drill="0.3302"/>
-<via x="10.67435" y="10.690225" extent="1-16" drill="0.3302"/>
+<via x="16.1925" y="11.033125" extent="1-16" drill="0.3302"/>
+<via x="14.208125" y="12.144375" extent="1-16" drill="0.3302"/>
+<via x="16.913225" y="5.902325" extent="1-16" drill="0.3302"/>
+<via x="16.83385" y="3.044825" extent="1-16" drill="0.3302"/>
 <contactref element="C5" pad="2"/>
 <contactref element="C8" pad="2"/>
 <contactref element="C10" pad="2"/>
 <contactref element="LED1" pad="C"/>
 <via x="12.461875" y="19.52625" extent="1-16" drill="0.3302"/>
 <contactref element="TP3" pad="TP"/>
-<via x="15.319375" y="20.47875" extent="1-16" drill="0.3302"/>
+<via x="15.71625" y="20.47875" extent="1-16" drill="0.3302"/>
 <wire x1="13.0725" y1="18.368075" x2="12.429425" y2="18.368075" width="0.254" layer="1"/>
 <wire x1="12.429425" y1="18.368075" x2="12.3825" y2="18.415" width="0.254" layer="1"/>
 <wire x1="12.3825" y1="18.415" x2="12.3825" y2="19.446875" width="0.254" layer="1"/>
 <wire x1="12.3825" y1="19.446875" x2="12.461875" y2="19.52625" width="0.254" layer="1"/>
 <wire x1="9.906875" y1="18.0975" x2="9.906875" y2="16.974375" width="0.4064" layer="1"/>
 <wire x1="9.906875" y1="16.974375" x2="10.07875" y2="16.8025" width="0.4064" layer="1"/>
-<contactref element="U$1" pad="1"/>
-<contactref element="U$5" pad="1"/>
-<wire x1="20.0249" y1="20.529" x2="19.923125" y2="20.399375" width="0" layer="19" extent="1-16"/>
+<contactref element="GND-1" pad="1"/>
+<contactref element="GND-2" pad="1"/>
+<contactref element="J3" pad="2"/>
+<wire x1="14.208125" y1="12.144375" x2="14.208125" y2="10.16" width="0.254" layer="1"/>
+<wire x1="14.208125" y1="12.144375" x2="14.208125" y2="12.114375" width="0.254" layer="1"/>
+<wire x1="14.208125" y1="12.114375" x2="15.19" y2="11.1325" width="0.254" layer="1"/>
+<via x="19.294475" y="4.23545" extent="1-16" drill="0.3302"/>
+<via x="16.271875" y="20.955" extent="1-16" drill="0.3302"/>
+<via x="12.2301" y="0.669925" extent="1-16" drill="0.3302"/>
+<via x="9.928225" y="0.669925" extent="1-16" drill="0.3302"/>
+<contactref element="R7" pad="1"/>
+<contactref element="CM3" pad="2"/>
+<wire x1="10.00125" y1="11.58875" x2="10.00125" y2="11.033125" width="0.2032" layer="16"/>
+<wire x1="11.1125" y1="11.668125" x2="11.1125" y2="11.033125" width="0.2032" layer="16"/>
+<via x="9.921875" y="10.874375" extent="1-16" drill="0.3302"/>
+<via x="10.874375" y="8.89" extent="1-16" drill="0.3302"/>
+<via x="12.468225" y="4.321175" extent="1-16" drill="0.3302"/>
+<via x="9.928225" y="4.5593" extent="1-16" drill="0.3302"/>
+<via x="16.83385" y="4.473575" extent="1-16" drill="0.3302"/>
+<via x="12.065" y="15.875" extent="1-16" drill="0.3302"/>
+<via x="12.065" y="14.76375" extent="1-16" drill="0.3302"/>
+<via x="10.9601" y="4.5593" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="VCC">
 <contactref element="LCHOKE" pad="2"/>
@@ -1365,16 +1377,16 @@ Please make sure your boards conform to 
 <contactref element="U6" pad="17"/>
 <contactref element="U6" pad="5"/>
 <contactref element="U5" pad="6_V_BCKP"/>
-<via x="20.558125" y="1.5875" extent="1-16" drill="0.3302"/>
-<wire x1="17.2725" y1="17.868075" x2="17.691925" y2="17.868075" width="0.254" layer="1"/>
+<via x="20.16125" y="1.11125" extent="1-16" drill="0.3302"/>
+<wire x1="17.2725" y1="17.868075" x2="17.616" y2="17.868075" width="0.254" layer="1"/>
+<wire x1="17.616" y1="17.868075" x2="18.415" y2="17.069075" width="0.254" layer="1"/>
+<wire x1="18.415" y1="17.069075" x2="18.415" y2="16.51" width="0.254" layer="1"/>
 <wire x1="15.95755" y1="18.792825" x2="14.4126" y2="18.792825" width="0.254" layer="1"/>
 <wire x1="13.0812" y1="17.859375" x2="13.0725" y2="17.868075" width="0.254" layer="1"/>
 <wire x1="17.2725" y1="17.868075" x2="16.8823" y2="17.868075" width="0.254" layer="1"/>
 <wire x1="16.8823" y1="17.868075" x2="15.95755" y2="18.792825" width="0.254" layer="1"/>
 <contactref element="J1" pad="1"/>
 <via x="18.415" y="16.51" extent="1-16" drill="0.3302"/>
-<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"/>
 <wire x1="20.0249" y1="15.079" x2="19.607875" y2="15.079" width="0.2032" layer="16"/>
 <wire x1="19.607875" y1="15.079" x2="19.3675" y2="15.319375" width="0.2032" layer="16"/>
 <wire x1="19.3675" y1="15.319375" x2="18.970625" y2="15.319375" width="0.2032" layer="16"/>
@@ -1384,23 +1396,13 @@ Please make sure your boards conform to 
 <wire x1="18.4175" y1="10.475" x2="18.415" y2="10.4775" width="0.2032" layer="1"/>
 <contactref element="U4" pad="3"/>
 <contactref element="C9" pad="1"/>
-<via x="17.62125" y="9.286875" extent="1-16" drill="0.3302"/>
-<wire x1="20.558125" y1="1.5875" x2="20.32" y2="1.349375" width="0.2032" layer="16"/>
-<wire x1="20.32" y1="1.349375" x2="17.700625" y2="1.349375" width="0.2032" layer="16"/>
-<wire x1="17.700625" y1="1.349375" x2="17.4625" y2="1.5875" width="0.2032" layer="16"/>
-<wire x1="16.505" y1="8.175625" x2="16.505" y2="9.810625" width="0.3048" layer="16"/>
-<wire x1="16.505" y1="9.810625" x2="16.536875" y2="9.8425" width="0.3048" layer="16"/>
 <contactref element="C5" pad="1"/>
 <wire x1="14.4126" y1="18.792825" x2="13.48785" y2="17.868075" width="0.254" layer="1"/>
 <wire x1="13.48785" y1="17.868075" x2="13.0725" y2="17.868075" width="0.254" layer="1"/>
 <contactref element="C8" pad="1"/>
 <wire x1="19.446875" y1="16.01875" x2="18.90625" y2="16.01875" width="0.254" layer="1"/>
 <wire x1="18.90625" y1="16.01875" x2="18.415" y2="16.51" width="0.254" layer="1"/>
-<wire x1="18.573075" y1="5.13385" x2="18.573075" y2="1.746925" width="0.254" layer="1"/>
-<wire x1="18.573075" y1="1.746925" x2="18.7325" y2="1.5875" width="0.254" layer="1"/>
-<wire x1="18.7325" y1="1.5875" x2="20.558125" y2="1.5875" width="0.254" layer="1"/>
-<wire x1="19.446875" y1="16.01875" x2="19.446875" y2="15.5575" width="0.254" layer="1"/>
-<wire x1="19.446875" y1="15.5575" x2="19.20875" y2="15.319375" width="0.254" layer="1"/>
+<wire x1="18.573075" y1="5.13385" x2="18.573075" y2="1.588175" width="0.254" layer="1"/>
 <wire x1="13.0725" y1="17.868075" x2="12.297965625" y2="17.868075" width="0.254" layer="1"/>
 <wire x1="12.297965625" y1="17.868075" x2="11.90625" y2="18.259790625" width="0.254" layer="1"/>
 <wire x1="11.90625" y1="18.259790625" x2="11.90625" y2="19.129375" width="0.254" layer="1"/>
@@ -1414,7 +1416,7 @@ Please make sure your boards conform to 
 <wire x1="18.176875" y1="6.50875" x2="17.93875" y2="6.746875" width="0.254" layer="1"/>
 <wire x1="17.93875" y1="6.746875" x2="17.93875" y2="8.0662" width="0.254" layer="1"/>
 <wire x1="17.93875" y1="8.0662" x2="17.9351" y2="8.06985" width="0.254" layer="1"/>
-<wire x1="19.20875" y1="15.319375" x2="19.20875" y2="13.890625" width="0.254" layer="1"/>
+<wire x1="19.20875" y1="15.780625" x2="19.20875" y2="13.890625" width="0.254" layer="1"/>
 <wire x1="19.20875" y1="13.890625" x2="19.446875" y2="13.6525" width="0.254" layer="1"/>
 <wire x1="19.446875" y1="13.6525" x2="19.446875" y2="13.115775" width="0.254" layer="1"/>
 <wire x1="19.446875" y1="13.115775" x2="19.51135" y2="13.0513" width="0.254" layer="1"/>
@@ -1426,7 +1428,8 @@ Please make sure your boards conform to 
 <wire x1="18.46195" y1="10.593625" x2="18.496875" y2="10.5587" width="0.254" layer="1"/>
 <wire x1="17.16" y1="10.1325" x2="17.59375" y2="10.1325" width="0.254" layer="1"/>
 <wire x1="17.59375" y1="10.1325" x2="17.93875" y2="10.4775" width="0.254" layer="1"/>
-<wire x1="17.93875" y1="10.4775" x2="18.415675" y2="10.4775" width="0.254" layer="1"/>
+<wire x1="17.93875" y1="10.4775" x2="18.415" y2="10.4775" width="0.254" layer="1"/>
+<wire x1="18.415" y1="10.4775" x2="18.415675" y2="10.4775" width="0.254" layer="1"/>
 <wire x1="19.51135" y1="13.0513" x2="19.51135" y2="12.895325" width="0.254" layer="1"/>
 <wire x1="19.51135" y1="12.895325" x2="18.46195" y2="11.845925" width="0.254" layer="1"/>
 <wire x1="18.496875" y1="10.5587" x2="18.496875" y2="9.311275" width="0.3048" layer="1"/>
@@ -1435,13 +1438,24 @@ Please make sure your boards conform to 
 <wire x1="17.9351" y1="8.171975" x2="18.0975" y2="8.334375" width="0.3048" layer="1"/>
 <wire x1="18.490525" y1="9.304925" x2="18.490525" y2="8.625275" width="0.3048" layer="1"/>
 <wire x1="18.490525" y1="8.625275" x2="17.9351" y2="8.06985" width="0.3048" layer="1"/>
-<wire x1="17.62125" y1="9.286875" x2="18.472475" y2="9.286875" width="0.3048" layer="1"/>
 <wire x1="18.472475" y1="9.286875" x2="18.490525" y2="9.304925" width="0.3048" layer="1"/>
-<wire x1="16.536875" y1="9.8425" x2="17.4437625" y2="9.8425" width="0.3048" layer="16"/>
-<wire x1="17.4437625" y1="9.8425" x2="17.62125" y2="9.6650125" width="0.3048" layer="16"/>
-<wire x1="17.62125" y1="9.6650125" x2="17.62125" y2="9.286875" width="0.3048" layer="16"/>
-<wire x1="18.415675" y1="10.4775" x2="18.4175" y2="10.475" width="0" layer="19" extent="1-1"/>
-<wire x1="18.46195" y1="10.593625" x2="18.4175" y2="10.475" width="0" layer="19" extent="1-1"/>
+<wire x1="15.24" y1="1.27" x2="15.24" y2="0.714375" width="0.2032" layer="16"/>
+<wire x1="15.24" y1="0.714375" x2="15.478125" y2="0.47625" width="0.2032" layer="16"/>
+<wire x1="15.795625" y1="5.4025" x2="16.02875" y2="5.4025" width="0.254" layer="16"/>
+<wire x1="16.02875" y1="5.4025" x2="16.1925" y2="5.23875" width="0.254" layer="16"/>
+<wire x1="16.1925" y1="5.23875" x2="18.15" y2="5.23875" width="0.254" layer="16"/>
+<wire x1="18.15" y1="5.23875" x2="18.176875" y2="5.265625" width="0.254" layer="16"/>
+<wire x1="18.176875" y1="5.265625" x2="17.93875" y2="5.50375" width="0.254" layer="16"/>
+<wire x1="17.93875" y1="5.50375" x2="17.93875" y2="6.746875" width="0.254" layer="16"/>
+<via x="17.93875" y="6.746875" extent="1-16" drill="0.381"/>
+<wire x1="18.46195" y1="10.593625" x2="18.415" y2="10.546675" width="0.254" layer="1"/>
+<wire x1="18.415" y1="10.546675" x2="18.415" y2="10.4775" width="0.254" layer="1"/>
+<wire x1="19.20875" y1="15.780625" x2="19.446875" y2="16.01875" width="0.254" layer="1"/>
+<wire x1="18.573075" y1="1.588175" x2="19.05" y2="1.11125" width="0.254" layer="1"/>
+<wire x1="19.05" y1="1.11125" x2="20.16125" y2="1.11125" width="0.254" layer="1"/>
+<wire x1="15.478125" y1="0.47625" x2="19.93674375" y2="0.47625" width="0.254" layer="16"/>
+<wire x1="19.93674375" y1="0.47625" x2="20.16125" y2="0.70075625" width="0.254" layer="16"/>
+<wire x1="20.16125" y1="0.70075625" x2="20.16125" y2="1.11125" width="0.254" layer="16"/>
 </signal>
 <signal name="RADIO-GPIO1">
 <contactref element="U1" pad="10"/>
@@ -1455,33 +1469,33 @@ Please make sure your boards conform to 
 <wire x1="18.176875" y1="13.0025" x2="18.4189" y2="13.0025" width="0.2032" layer="1"/>
 <wire x1="13.0725" y1="16.368075" x2="13.5328" y2="16.368075" width="0.2032" layer="1"/>
 <wire x1="13.5328" y1="16.368075" x2="14.246225" y2="17.0815" width="0.2032" layer="1"/>
-<wire x1="17.145" y1="13.0175" x2="17.1831" y2="13.0175" width="0.2032" layer="16"/>
-<wire x1="17.1831" y1="13.0175" x2="17.516475" y2="13.350875" width="0.2032" layer="16"/>
-<wire x1="17.516475" y1="13.350875" x2="17.516475" y2="13.8176" width="0.2032" layer="16"/>
-<wire x1="17.516475" y1="13.8176" x2="17.5133" y2="13.814425" width="0.2032" layer="16"/>
-<wire x1="17.5133" y1="13.814425" x2="17.5133" y2="14.747875" width="0.2032" layer="16"/>
 <wire x1="14.868525" y1="17.0815" x2="15.179675" y2="17.0815" width="0.2032" layer="16"/>
 <wire x1="15.179675" y1="17.0815" x2="17.5133" y2="14.747875" width="0.2032" layer="16"/>
 <wire x1="14.246225" y1="17.0815" x2="14.868525" y2="17.0815" width="0.2032" layer="1"/>
 <wire x1="18.21135" y1="13.0513" x2="18.21135" y2="12.968025" width="0.254" layer="1"/>
 <wire x1="18.21135" y1="12.968025" x2="18.176875" y2="13.0025" width="0.254" layer="1"/>
+<wire x1="17.5133" y1="14.747875" x2="17.5133" y2="13.3858" width="0.2032" layer="16"/>
+<wire x1="17.5133" y1="13.3858" x2="17.145" y2="13.0175" width="0.2032" layer="16"/>
 </signal>
 <signal name="RADIO-SHDN">
 <contactref element="U1" pad="1"/>
 <contactref element="R1" pad="2"/>
 <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.04125" width="0.254" layer="1"/>
-<wire x1="12.025" y1="10.04125" x2="11.60145" y2="10.4648" width="0.254" layer="1"/>
-<via x="11.60145" y="10.4648" extent="1-16" drill="0.3302"/>
+<wire x1="14.19" y1="9.1625" x2="11.7925" y2="9.1625" width="0.254" layer="1"/>
+<wire x1="12.025" y1="10.14135" x2="12.025" y2="10.04125" width="0.254" layer="1"/>
+<via x="11.7602" y="9.1948" extent="1-16" drill="0.3302"/>
 <via x="14.4018" y="17.872075" extent="1-16" drill="0.3302"/>
 <wire x1="13.0725" y1="16.868075" x2="13.3978" y2="16.868075" width="0.2032" layer="1"/>
 <wire x1="13.3978" y1="16.868075" x2="14.4018" y2="17.872075" width="0.2032" layer="1"/>
-<wire x1="11.60145" y1="10.4648" x2="12.0523" y2="10.4648" width="0.2032" layer="16"/>
-<wire x1="12.0523" y1="10.4648" x2="12.3825" y2="10.795" width="0.2032" layer="16"/>
-<wire x1="12.3825" y1="10.795" x2="12.3825" y2="15.852775" width="0.2032" layer="16"/>
-<wire x1="12.3825" y1="15.852775" x2="14.4018" y2="17.872075" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="11.4046" x2="11.7602" y2="10.30605" width="0.2032" layer="16"/>
+<wire x1="11.7602" y1="10.30605" x2="11.7602" y2="9.1948" width="0.2032" layer="16"/>
+<wire x1="11.7925" y1="9.1625" x2="11.7602" y2="9.1948" width="0.254" layer="1"/>
+<wire x1="12.025" y1="10.14135" x2="11.7602" y2="9.87655" width="0.254" layer="1"/>
+<wire x1="11.7602" y1="9.87655" x2="11.7602" y2="9.1948" width="0.254" layer="1"/>
+<wire x1="14.4018" y1="17.872075" x2="13.335" y2="16.805275" width="0.2032" layer="16"/>
+<wire x1="13.335" y1="16.805275" x2="13.335" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="13.335" y1="13.97" x2="12.85875" y2="13.49375" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="13.49375" x2="12.85875" y2="11.4046" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$1">
 <contactref element="U1" pad="4"/>
@@ -1547,10 +1561,10 @@ Please make sure your boards conform to 
 <contactref element="U5" pad="8_VCC"/>
 <contactref element="U5" pad="7_VCC_IO"/>
 <contactref element="C7" pad="1"/>
-<via x="20.475575" y="2.860675" extent="1-16" drill="0.3302"/>
-<wire x1="20.716875" y1="3.101975" x2="20.716875" y2="9.128125" width="0.2032" layer="16"/>
-<wire x1="20.716875" y1="9.128125" x2="18.7325" y2="11.1125" width="0.2032" layer="16"/>
-<wire x1="18.7325" y1="11.1125" x2="18.7325" y2="11.829" width="0.2032" layer="16"/>
+<via x="20.158075" y="2.066925" extent="1-16" drill="0.3302"/>
+<wire x1="20.716875" y1="2.625725" x2="20.716875" y2="9.36625" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="9.36625" x2="18.7325" y2="11.350625" width="0.2032" layer="16"/>
+<wire x1="18.7325" y1="11.350625" x2="18.7325" y2="11.829" width="0.2032" layer="16"/>
 <wire x1="18.7325" y1="11.829" x2="18.7325" y2="12.879" width="0.2032" layer="16"/>
 <wire x1="18.7325" y1="12.879" x2="18.7325" y2="13.97" width="0.2032" layer="16"/>
 <wire x1="18.7325" y1="13.97" x2="20.0159" y2="13.97" width="0.2032" layer="16"/>
@@ -1564,34 +1578,37 @@ Please make sure your boards conform to 
 <wire x1="19.3675" y1="3.03385" x2="19.523075" y2="3.03385" width="0.2032" layer="1"/>
 <wire x1="19.50865" y1="3.019425" x2="19.523075" y2="3.03385" width="0.2032" layer="1"/>
 <wire x1="19.50865" y1="3.019425" x2="19.523075" y2="3.005" width="0.254" layer="1"/>
-<wire x1="20.475575" y1="2.860675" x2="19.69625" y2="2.860675" width="0.254" layer="1"/>
-<wire x1="19.69625" y1="2.860675" x2="19.523075" y2="3.03385" width="0.254" layer="1"/>
-<wire x1="20.716875" y1="3.101975" x2="20.475575" y2="2.860675" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="2.625725" x2="20.158075" y2="2.066925" width="0.2032" layer="16"/>
 <wire x1="18.55875" y1="14.44625" x2="18.55875" y2="15.175625" width="0.254" layer="1"/>
 <wire x1="18.55875" y1="15.175625" x2="18.176875" y2="15.5575" width="0.254" layer="1"/>
+<wire x1="20.158075" y1="2.066925" x2="19.681825" y2="2.066925" width="0.254" layer="1"/>
+<wire x1="19.681825" y1="2.066925" x2="19.52625" y2="2.2225" width="0.254" layer="1"/>
+<wire x1="19.52625" y1="2.2225" x2="19.52625" y2="3.030675" width="0.254" layer="1"/>
+<wire x1="19.52625" y1="3.030675" x2="19.523075" y2="3.03385" width="0.254" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="Q1" pad="1"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
 <via x="20.0025" y="7.62" extent="1-16" drill="0.3302"/>
-<wire x1="20.0025" y1="7.62" x2="20.0025" y2="9.2075" width="0.2032" layer="16"/>
-<wire x1="20.0025" y1="9.2075" x2="17.93875" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="17.93875" y1="11.27125" x2="17.93875" y2="14.843125" width="0.2032" layer="16"/>
-<via x="18.44675" y="18.01495" extent="1-16" drill="0.3302"/>
-<wire x1="18.44675" y1="18.01495" x2="19.60245" y2="18.01495" width="0.2032" layer="1"/>
-<wire x1="19.60245" y1="18.01495" x2="20.0025" y2="18.415" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="7.62" x2="20.0025" y2="9.445625" width="0.2032" layer="16"/>
+<wire x1="20.0025" y1="9.445625" x2="17.93875" y2="11.509375" width="0.2032" layer="16"/>
+<wire x1="17.93875" y1="11.509375" x2="17.93875" y2="14.843125" width="0.2032" layer="16"/>
+<via x="18.44675" y="17.935575" extent="1-16" drill="0.3302"/>
+<wire x1="18.44675" y1="17.935575" x2="19.674446875" y2="17.935575" width="0.2032" layer="1"/>
+<wire x1="19.674446875" y1="17.935575" x2="20.0025" y2="18.263628125" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="18.263628125" x2="20.0025" y2="18.93165" width="0.2032" layer="1"/>
 <wire x1="17.93875" y1="14.843125" x2="17.4625" y2="15.319375" width="0.2032" layer="16"/>
-<wire x1="17.4625" y1="15.319375" x2="17.4625" y2="17.0307" width="0.2032" layer="16"/>
-<wire x1="17.4625" y1="17.0307" x2="18.44675" y2="18.01495" width="0.2032" layer="16"/>
-<wire x1="20.0025" y1="18.415" x2="20.0025" y2="19.000075" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="19.000075" x2="20.007975" y2="19.00555" width="0.2032" layer="1"/>
 <wire x1="20.473075" y1="5.13385" x2="20.473075" y2="5.16505" width="0.254" layer="1"/>
 <wire x1="20.473075" y1="5.16505" x2="20.240625" y2="5.3975" width="0.254" layer="1"/>
 <wire x1="20.240625" y1="5.3975" x2="20.240625" y2="6.444375" width="0.254" layer="1"/>
 <wire x1="20.240625" y1="6.444375" x2="20.17625" y2="6.50875" width="0.254" layer="1"/>
 <wire x1="20.17625" y1="6.50875" x2="20.17625" y2="7.44625" width="0.254" layer="1"/>
 <wire x1="20.17625" y1="7.44625" x2="20.0025" y2="7.62" width="0.254" layer="1"/>
+<wire x1="17.4625" y1="15.319375" x2="17.4625" y2="16.951325" width="0.2032" layer="16"/>
+<wire x1="17.4625" y1="16.951325" x2="18.44675" y2="17.935575" width="0.2032" layer="16"/>
+<wire x1="20.0025" y1="19.000075" x2="20.0025" y2="18.93165" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="18.93165" x2="20.007975" y2="18.926175" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U5" pad="11_RF_IN"/>
@@ -1607,9 +1624,9 @@ Please make sure your boards conform to 
 <contactref element="U6" pad="27"/>
 <via x="15.801975" y="17.39265" extent="1-16" drill="0.3302"/>
 <wire x1="15.801975" y1="17.39265" x2="15.80515" y2="17.39265" width="0.2032" layer="16"/>
-<wire x1="15.80515" y1="17.39265" x2="17.145" y2="18.7325" width="0.2032" layer="16"/>
-<wire x1="17.145" y1="18.7325" x2="19.05" y2="18.7325" width="0.2032" layer="16"/>
-<wire x1="19.05" y1="18.7325" x2="19.3675" y2="18.415" width="0.2032" layer="16"/>
+<wire x1="15.80515" y1="17.39265" x2="16.98625" y2="18.57375" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="18.57375" x2="19.20875" y2="18.57375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="18.57375" x2="19.3675" y2="18.415" width="0.2032" layer="16"/>
 <wire x1="19.3675" y1="18.415" x2="19.9889" y2="18.415" width="0.2032" layer="16"/>
 <wire x1="19.9889" y1="18.415" x2="20.0249" y2="18.379" width="0.2032" layer="16"/>
 <wire x1="16.1725" y1="15.268075" x2="16.1725" y2="15.656875" width="0.2032" layer="1"/>
@@ -1627,15 +1644,15 @@ Please make sure your boards conform to 
 <wire x1="16.57985" y1="17.548225" x2="15.95755" y2="18.170525" width="0.2032" layer="1"/>
 <wire x1="15.95755" y1="18.170525" x2="15.3289" y2="18.170525" width="0.2032" layer="1"/>
 <wire x1="15.3289" y1="18.170525" x2="15.313025" y2="18.170525" width="0.2032" layer="16"/>
-<wire x1="15.313025" y1="18.170525" x2="16.51" y2="19.3675" width="0.2032" layer="16"/>
-<wire x1="16.51" y1="19.3675" x2="19.9134" y2="19.3675" width="0.2032" layer="16"/>
-<wire x1="19.9134" y1="19.3675" x2="20.0249" y2="19.479" width="0.2032" layer="16"/>
+<wire x1="15.313025" y1="18.170525" x2="16.6215" y2="19.479" width="0.2032" layer="16"/>
+<wire x1="20.0249" y1="19.479" x2="16.6215" y2="19.479" width="0.2032" layer="16"/>
 </signal>
 <signal name="GPS-EN">
 <contactref element="R4" pad="1"/>
 <contactref element="U6" pad="7"/>
 <wire x1="17.2725" y1="18.868075" x2="18.5705" y2="18.868075" width="0.2032" layer="1"/>
-<wire x1="18.5705" y1="18.868075" x2="18.707975" y2="19.00555" width="0.2032" layer="1"/>
+<wire x1="18.707975" y1="18.926175" x2="18.6286" y2="18.926175" width="0.2032" layer="1"/>
+<wire x1="18.6286" y1="18.926175" x2="18.5705" y2="18.868075" width="0.2032" layer="1"/>
 </signal>
 <signal name="RADIO-MOSI">
 <contactref element="U6" pad="26"/>
@@ -1686,19 +1703,22 @@ Please make sure your boards conform to 
 </signal>
 <signal name="SWCLK">
 <contactref element="U6" pad="22"/>
-<via x="13.0175" y="14.9225" extent="1-16" drill="0.3302"/>
+<via x="13.49375" y="13.096875" extent="1-16" drill="0.3302"/>
 <contactref element="J1" pad="3"/>
-<wire x1="9.73455" y1="2.82235625" x2="9.73455" y2="9.063321875" width="0.2032" layer="16"/>
-<wire x1="9.73455" y1="9.063321875" x2="10.434353125" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="10.434353125" y1="9.763125" x2="11.985625" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="14.766925" y1="0.796925" x2="11.75998125" y2="0.796925" width="0.2032" layer="16"/>
-<wire x1="11.75998125" y1="0.796925" x2="9.73455" y2="2.82235625" width="0.2032" layer="16"/>
-<wire x1="11.985625" y1="9.763125" x2="13.0175" y2="10.795" width="0.2032" layer="16"/>
-<wire x1="13.0175" y1="10.795" x2="13.0175" y2="14.9225" width="0.2032" layer="16"/>
-<wire x1="13.6725" y1="15.268075" x2="13.363075" y2="15.268075" width="0.2032" layer="1"/>
-<wire x1="13.363075" y1="15.268075" x2="13.0175" y2="14.9225" width="0.2032" layer="1"/>
-<wire x1="14.766925" y1="0.796925" x2="14.9225" y2="0.9525" width="0.2032" layer="16"/>
-<wire x1="14.9225" y1="0.9525" x2="14.9225" y2="1.5875" width="0.2032" layer="16"/>
+<wire x1="13.731875" y1="12.85875" x2="15.319375" y2="12.85875" width="0.2032" layer="16"/>
+<wire x1="15.319375" y1="12.85875" x2="16.906875" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="16.906875" y1="11.27125" x2="18.89125" y2="9.286875" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="9.286875" x2="18.89125" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="7.14375" x2="19.923125" y2="6.111875" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="6.111875" x2="19.923125" y2="3.413125" width="0.2032" layer="16"/>
+<wire x1="18.018125" y1="2.143125" x2="17.78" y2="1.905" width="0.2032" layer="16"/>
+<wire x1="17.78" y1="1.905" x2="17.78" y2="1.27" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="3.413125" x2="18.653125" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="18.018125" y1="2.143125" x2="18.653125" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="13.6725" y1="15.268075" x2="13.6725" y2="14.625" width="0.2032" layer="1"/>
+<wire x1="13.6725" y1="14.625" x2="13.49375" y2="14.44625" width="0.2032" layer="1"/>
+<wire x1="13.49375" y1="14.44625" x2="13.49375" y2="13.096875" width="0.2032" layer="1"/>
+<wire x1="13.731875" y1="12.85875" x2="13.49375" y2="13.096875" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U6" pad="21"/>
@@ -1708,15 +1728,19 @@ Please make sure your boards conform to 
 <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="J1" pad="4"/>
-<wire x1="10.201275" y1="3.08605625" x2="10.201275" y2="8.805015625" width="0.2032" layer="16"/>
-<wire x1="10.201275" y1="8.805015625" x2="10.692659375" y2="9.2964" width="0.2032" layer="16"/>
-<wire x1="10.692659375" y1="9.2964" x2="12.181196875" y2="9.2964" width="0.2032" layer="16"/>
-<wire x1="12.181196875" y1="9.2964" x2="13.49375" y2="10.608953125" width="0.2032" layer="16"/>
-<wire x1="13.49375" y1="10.608953125" x2="13.49375" y2="14.44625" width="0.2032" layer="16"/>
-<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"/>
-<wire x1="10.201275" y1="3.08605625" x2="11.69983125" y2="1.5875" width="0.2032" layer="16"/>
-<wire x1="11.69983125" y1="1.5875" x2="13.6525" y2="1.5875" width="0.2032" layer="16"/>
+<wire x1="14.319496875" y1="13.255625" x2="15.5575" y2="13.255625" width="0.2032" layer="16"/>
+<wire x1="15.5575" y1="13.255625" x2="17.30375" y2="11.509375" width="0.2032" layer="16"/>
+<wire x1="14.319496875" y1="13.255625" x2="13.81125" y2="13.763871875" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="13.763871875" x2="13.81125" y2="15.71625" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="15.71625" x2="14.246225" y2="16.151225" width="0.2032" layer="16"/>
+<wire x1="14.246225" y1="16.151225" x2="14.246225" y2="16.14805" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="11.509375" x2="19.288125" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="19.288125" y1="9.525" x2="19.288125" y2="7.3025" width="0.2032" layer="16"/>
+<wire x1="19.288125" y1="7.3025" x2="20.32" y2="6.270625" width="0.2032" layer="16"/>
+<wire x1="20.32" y1="6.270625" x2="20.32" y2="3.254375" width="0.2032" layer="16"/>
+<wire x1="20.32" y1="3.254375" x2="19.20875" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="2.143125" x2="19.20875" y2="1.42875" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="1.42875" x2="19.05" y2="1.27" width="0.2032" layer="16"/>
 </signal>
 <signal name="ANT">
 <contactref element="LM2" pad="1"/>
@@ -1725,39 +1749,25 @@ Please make sure your boards conform to 
 <wire x1="14.9502" y1="3.16865" x2="14.9502" y2="1.721725" width="0.3048" layer="1"/>
 <wire x1="14.9502" y1="3.16865" x2="14.9502" y2="3.5612" width="0.3048" layer="1"/>
 <wire x1="14.9502" y1="3.5612" x2="14.987725" y2="3.523675" width="0.254" layer="1"/>
-<contactref element="U$2" pad="1"/>
+<contactref element="ANT" pad="1"/>
 <wire x1="14.9502" y1="1.721725" x2="14.9502" y2="1.480425" width="0.254" layer="1"/>
 <wire x1="14.9502" y1="1.480425" x2="15.08125" y2="1.349375" width="0.254" layer="1"/>
+<wire x1="15.08125" y1="1.349375" x2="15.24" y2="1.349375" width="0.254" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="U4" pad="1"/>
 <contactref element="L1" pad="1"/>
-<wire x1="12.3825" y1="8.42625" x2="14.354375" y2="8.42625" width="0.254" layer="16"/>
-<wire x1="14.354375" y1="8.42625" x2="14.605" y2="8.175625" width="0.254" layer="16"/>
+<wire x1="15.795625" y1="7.3025" x2="16.113125" y2="7.3025" width="0.254" layer="16"/>
+<wire x1="16.113125" y1="7.3025" x2="16.1925" y2="7.381875" width="0.254" layer="16"/>
+<wire x1="16.1925" y1="7.381875" x2="16.1925" y2="9.37875" width="0.254" layer="16"/>
+<wire x1="16.125625" y1="9.445625" x2="16.1925" y2="9.37875" width="0.254" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="L1" pad="2"/>
 <contactref element="U4" pad="6"/>
-<wire x1="12.3825" y1="5.22625" x2="14.605" y2="5.22625" width="0.254" layer="16"/>
-<wire x1="14.605" y1="5.22625" x2="14.605" y2="5.555625" width="0.254" layer="16"/>
-</signal>
-<signal name="N$8">
-<contactref element="U4" pad="5"/>
-<contactref element="C6" pad="1"/>
-<contactref element="U4" pad="4"/>
-<contactref element="PAD5" pad="1"/>
-<wire x1="15.555" y1="5.555625" x2="15.555" y2="4.145" width="0.3048" layer="16"/>
-<wire x1="19.129375" y1="6.588125" x2="19.20875" y2="6.50875" width="0.254" layer="16"/>
-<wire x1="15.555" y1="4.145" x2="15.41375" y2="4.145" width="0.254" layer="16"/>
-<wire x1="15.41375" y1="4.145" x2="15.41375" y2="3.96875" width="0.254" layer="16"/>
-<wire x1="15.555" y1="5.555625" x2="16.505" y2="5.555625" width="0.3048" layer="16"/>
-<wire x1="16.505" y1="5.555625" x2="16.505" y2="5.565625" width="0.3048" layer="16"/>
-<wire x1="16.505" y1="5.565625" x2="16.505" y2="5.948125" width="0.254" layer="16"/>
-<wire x1="19.20875" y1="6.50875" x2="19.129375" y2="6.429375" width="0.254" layer="16"/>
-<wire x1="16.98625" y1="6.50875" x2="16.51" y2="6.0325" width="0.254" layer="16"/>
-<wire x1="16.51" y1="6.0325" x2="16.51" y2="5.570625" width="0.254" layer="16"/>
-<wire x1="16.51" y1="5.570625" x2="16.505" y2="5.565625" width="0.254" layer="16"/>
-<wire x1="19.20875" y1="6.50875" x2="16.98625" y2="6.50875" width="0.254" layer="16"/>
+<wire x1="13.175625" y1="7.3025" x2="13.175625" y2="9.43375" width="0.254" layer="16"/>
+<wire x1="12.925625" y1="9.445625" x2="12.9375" y2="9.43375" width="0.254" layer="16"/>
+<wire x1="12.9375" y1="9.43375" x2="13.175625" y2="9.43375" width="0.254" layer="16"/>
 </signal>
 <signal name="N$11">
 <polygon width="0" layer="16" pour="cutout">
@@ -1816,17 +1826,112 @@ Please make sure your boards conform to 
 <signal name="N$17">
 <contactref element="U6" pad="8"/>
 <contactref element="TP1" pad="TP"/>
-<wire x1="16.6725" y1="19.468075" x2="17.721825" y2="19.468075" width="0.254" layer="1"/>
-<wire x1="17.721825" y1="19.468075" x2="18.653125" y2="20.399375" width="0.254" layer="1"/>
+<wire x1="16.6725" y1="19.468075" x2="16.66875" y2="19.464325" width="0.2032" layer="1"/>
+<wire x1="16.66875" y1="19.464325" x2="16.66875" y2="19.288125" width="0.2032" layer="1"/>
+<wire x1="16.66875" y1="19.288125" x2="17.859375" y2="19.288125" width="0.2032" layer="1"/>
+<wire x1="18.7325" y1="20.081875" x2="18.653125" y2="20.081875" width="0.2032" layer="1"/>
+<wire x1="18.653125" y1="20.081875" x2="17.859375" y2="19.288125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="U6" pad="9"/>
 <contactref element="TP2" pad="TP"/>
-<wire x1="17.383125" y1="20.399375" x2="16.430625" y2="20.399375" width="0.254" layer="1"/>
-<wire x1="16.430625" y1="20.399375" x2="16.1725" y2="20.14125" width="0.254" layer="1"/>
-<wire x1="16.1725" y1="19.468075" x2="16.1725" y2="20.14125" width="0.254" layer="1"/>
+<wire x1="16.1725" y1="19.468075" x2="16.1725" y2="20.061875" width="0.2032" layer="1"/>
+<wire x1="16.1725" y1="20.061875" x2="16.35125" y2="20.240625" width="0.2032" layer="1"/>
+<wire x1="16.35125" y1="20.240625" x2="17.30375" y2="20.240625" width="0.2032" layer="1"/>
+<wire x1="17.30375" y1="20.240625" x2="17.4625" y2="20.081875" width="0.2032" layer="1"/>
+</signal>
+<signal name="VBATT_SENSE">
+<contactref element="R3" pad="1"/>
+<contactref element="R7" pad="2"/>
+<contactref element="CM3" pad="1"/>
+<contactref element="U6" pad="12"/>
+<wire x1="14.6725" y1="19.468075" x2="14.6725" y2="20.308125" width="0.2032" layer="1"/>
+<wire x1="14.6725" y1="20.308125" x2="14.843125" y2="20.47875" width="0.2032" layer="1"/>
+<via x="14.843125" y="20.47875" extent="1-16" drill="0.3302"/>
+<wire x1="14.843125" y1="20.47875" x2="12.85875" y2="18.494375" width="0.2032" layer="16"/>
+<wire x1="12.461875" y1="11.58875" x2="11.1125" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="11.1125" y1="10.239375" x2="11.1125" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="10.195" y1="5.55625" x2="10.195" y2="6.6675" width="0.2032" layer="16"/>
+<wire x1="10.195" y1="6.6675" x2="10.195" y2="7.72875" width="0.2032" layer="16"/>
+<wire x1="10.195" y1="7.72875" x2="10.065625" y2="7.858125" width="0.2032" layer="16"/>
+<wire x1="10.065625" y1="7.858125" x2="10.065625" y2="8.954375" width="0.2032" layer="16"/>
+<wire x1="10.065625" y1="8.954375" x2="11.1125" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="18.494375" x2="12.85875" y2="14.208125" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="14.208125" x2="12.461875" y2="13.81125" width="0.2032" layer="16"/>
+<wire x1="12.461875" y1="13.81125" x2="12.461875" y2="11.58875" width="0.2032" layer="16"/>
+</signal>
+<signal name="VBATT">
+<contactref element="R3" pad="2"/>
+<contactref element="U4" pad="5"/>
+<contactref element="C6" pad="1"/>
+<contactref element="U4" pad="4"/>
+<contactref element="J3" pad="1"/>
+<wire x1="13.943125" y1="3.81" x2="13.943125" y2="3.995625" width="0.254" layer="16"/>
+<wire x1="13.943125" y1="3.995625" x2="13.6525" y2="4.28625" width="0.254" layer="16"/>
+<wire x1="13.6525" y1="4.28625" x2="13.6525" y2="5.4025" width="0.254" layer="16"/>
+<wire x1="13.6525" y1="5.4025" x2="13.185625" y2="5.4025" width="0.254" layer="16"/>
+<wire x1="10.815" y1="3.175" x2="12.3825" y2="3.175" width="0.254" layer="16"/>
+<wire x1="12.3825" y1="3.175" x2="13.0175" y2="3.81" width="0.254" layer="16"/>
+<wire x1="13.0175" y1="3.81" x2="13.943125" y2="3.81" width="0.254" layer="16"/>
+<wire x1="13.185625" y1="5.4025" x2="11.54875" y2="5.4025" width="0.2032" layer="16"/>
+<wire x1="11.54875" y1="5.4025" x2="11.395" y2="5.55625" width="0.2032" layer="16"/>
+<wire x1="13.175625" y1="6.3525" x2="13.175625" y2="5.4125" width="0.2032" layer="16"/>
+<wire x1="13.175625" y1="5.4125" x2="13.185625" y2="5.4025" width="0.2032" layer="16"/>
+</signal>
+<signal name="N$8">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="10.398125" y="20.16125"/>
+<vertex x="10.715625" y="20.16125"/>
+<vertex x="10.715625" y="20.79625"/>
+<vertex x="10.398125" y="20.79625"/>
+</polygon>
+</signal>
+<signal name="N$19">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="11.27125" y="4.206875"/>
+<vertex x="8.651875" y="4.206875"/>
+<vertex x="8.651875" y="3.730625"/>
+<vertex x="11.27125" y="3.730625"/>
+</polygon>
+</signal>
+<signal name="N$20">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="10.4775" y="13.17625"/>
+<vertex x="10.95375" y="13.17625"/>
+<vertex x="10.95375" y="14.12875"/>
+<vertex x="10.4775" y="14.12875"/>
+</polygon>
+</signal>
+<signal name="N$23">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="16.589375" y="7.064375"/>
+<vertex x="17.700625" y="7.064375"/>
+<vertex x="17.700625" y="7.540625"/>
+<vertex x="16.589375" y="7.540625"/>
+</polygon>
+</signal>
+<signal name="N$24">
+<polygon width="0" layer="16" pour="cutout">
+<vertex x="13.335" y="21.2725"/>
+<vertex x="17.145" y="21.2725"/>
+<vertex x="17.145" y="21.9075"/>
+<vertex x="13.335" y="21.9075"/>
+</polygon>
+</signal>
+<signal name="N$25">
+<polygon width="0" layer="1" pour="cutout">
+<vertex x="13.335" y="21.2725"/>
+<vertex x="17.145" y="21.2725"/>
+<vertex x="17.145" y="21.9075"/>
+<vertex x="13.335" y="21.9075"/>
+</polygon>
 </signal>
 </signals>
+<errors>
+<approved hash="19,1,3a880b1c173c26a8"/>
+<approved hash="19,1,ff275b1c5fa3fb9a"/>
+<approved hash="19,1,277df909ff022176"/>
+</errors>
 </board>
 </drawing>
 </eagle>
diff --git a/hab.sch b/hab.sch
--- a/hab.sch
+++ b/hab.sch
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
-<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
-<layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
-<layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
-<layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
-<layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
-<layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
-<layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
-<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
+<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
+<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
+<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
+<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,20 +53,20 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
-<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="53" name="tGND_GNDA" color="7" fill="1" visible="no" active="no"/>
-<layer number="54" name="bGND_GNDA" color="7" fill="1" visible="no" active="no"/>
-<layer number="55" name="dxf2" color="5" fill="1" visible="no" active="no"/>
-<layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
-<layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
-<layer number="59" name="tCarbon" color="7" fill="1" visible="no" active="no"/>
-<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="1" visible="yes" active="no"/>
+<layer number="54" name="bGND_GNDA" color="7" fill="1" visible="yes" active="no"/>
+<layer number="55" name="dxf2" color="5" fill="1" visible="yes" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
+<layer number="57" name="tCAD" color="7" fill="1" visible="yes" active="no"/>
+<layer number="59" name="tCarbon" color="7" fill="1" visible="yes" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="yes" active="no"/>
 <layer number="90" name="Modules" color="5" fill="1" visible="yes" active="yes"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
@@ -1515,45 +1515,6 @@ by exp-lbrs.ulp</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="wirepad">
-<description>&lt;b&gt;Single Pads&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="SMD1,27-2,54">
-<description>&lt;b&gt;SMD PAD&lt;/b&gt;</description>
-<smd name="1" x="0" y="0" dx="1.27" dy="2.54" layer="1"/>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-0.8" y="-2.4" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-</package>
-</packages>
-<symbols>
-<symbol name="PAD">
-<wire x1="-1.016" y1="1.016" x2="1.016" y2="-1.016" width="0.254" layer="94"/>
-<wire x1="-1.016" y1="-1.016" x2="1.016" y2="1.016" width="0.254" layer="94"/>
-<text x="-1.143" y="1.8542" size="1.778" layer="95">&gt;NAME</text>
-<text x="-1.143" y="-3.302" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="P" x="2.54" y="0" visible="off" length="short" direction="pas" rot="R180"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="SMD2" prefix="PAD" uservalue="yes">
-<description>&lt;b&gt;SMD PAD&lt;/b&gt;</description>
-<gates>
-<gate name="1" symbol="PAD" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="SMD1,27-2,54">
-<connects>
-<connect gate="1" pin="P" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="Protofusion">
 <packages>
 <package name="UFQFPN28">
@@ -5354,6 +5315,60 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 </deviceset>
 </devicesets>
 </library>
+<library name="SLAT-Connectors">
+<description>SLAT Connectors</description>
+<packages>
+<package name="JST_ZH-V-2-1">
+<wire x1="2.98" y1="-2.2" x2="2.98" y2="1.3" width="0.254" layer="21"/>
+<wire x1="2.98" y1="1.3" x2="-1.52" y2="1.3" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="1.3" x2="-1.52" y2="-2.2" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="-2.2" x2="2.98" y2="-2.2" width="0.254" layer="21"/>
+<wire x1="2.98" y1="0.3" x2="2.48" y2="0.3" width="0.254" layer="21"/>
+<wire x1="2.48" y1="0.3" x2="2.48" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="2.48" y1="-0.7" x2="2.98" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="-1.52" y1="0.3" x2="-1.02" y2="0.3" width="0.254" layer="21"/>
+<wire x1="-1.02" y1="0.3" x2="-1.02" y2="-0.7" width="0.254" layer="21"/>
+<wire x1="-1.02" y1="-0.7" x2="-1.52" y2="-0.7" width="0.254" layer="21"/>
+<pad name="1" x="0" y="-0.02" drill="0.7" diameter="1.016" shape="long" rot="R90"/>
+<pad name="2" x="1.5" y="-0.02" drill="0.7" diameter="1.016" shape="long" rot="R90"/>
+<text x="-1.6292" y="1.7272" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.7054" y="-3.9116" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="-1.5" y1="-2.25" x2="-0.75" y2="-1.5" layer="25"/>
+</package>
+</packages>
+<symbols>
+<symbol name="CON-2-1">
+<wire x1="1.27" y1="-2.54" x2="-3.81" y2="-2.54" width="0.4064" layer="94"/>
+<wire x1="-1.27" y1="0" x2="0" y2="0" width="0.6096" layer="94"/>
+<wire x1="-1.27" y1="2.54" x2="0" y2="2.54" width="0.6096" layer="94"/>
+<wire x1="-3.81" y1="5.08" x2="-3.81" y2="-2.54" width="0.4064" layer="94"/>
+<wire x1="1.27" y1="-2.54" x2="1.27" y2="5.08" width="0.4064" layer="94"/>
+<wire x1="-3.81" y1="5.08" x2="1.27" y2="5.08" width="0.4064" layer="94"/>
+<text x="-3.81" y="-5.08" size="1.778" layer="96" font="vector">&gt;VALUE</text>
+<text x="-3.81" y="6.35" size="1.778" layer="95" font="vector">&gt;NAME</text>
+<pin name="2" x="5.08" y="0" visible="pad" length="middle" direction="pas" rot="R180"/>
+<pin name="1" x="5.08" y="2.54" visible="pad" length="middle" direction="pas" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="JST_ZH-V-2-1" prefix="J">
+<gates>
+<gate name="G$1" symbol="CON-2-1" x="-7.62" y="-2.54"/>
+</gates>
+<devices>
+<device name="" package="JST_ZH-V-2-1">
+<connects>
+<connect gate="G$1" pin="1" pad="1"/>
+<connect gate="G$1" pin="2" pad="2"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -5409,8 +5424,6 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <part name="P+7" library="SparkFun" deviceset="VCC" device=""/>
 <part name="CM1" library="SparkFun" deviceset="CAP" device="0402-CAP" value="1.8pF"/>
 <part name="CM4" library="SparkFun" deviceset="CAP" device="0402-CAP" value="4.7pF"/>
-<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="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
 <part name="P+9" library="SparkFun" deviceset="VCC" device=""/>
@@ -5418,7 +5431,7 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <part name="P+10" library="SparkFun" deviceset="VCC" device=""/>
 <part name="GND19" library="SparkFun" deviceset="GND" device=""/>
 <part name="U4" library="Protofusion" deviceset="LTC3531-3.3" device=""/>
-<part name="C6" library="SparkFun" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
+<part name="C6" library="SparkFun" deviceset="CAP" device="0805" value="47uF"/>
 <part name="L1" library="SparkFun-Passives" deviceset="INDUCTOR" device="1210" value="LQH32CN100K33L"/>
 <part name="C9" library="SparkFun" deviceset="CAP" device="0805" value="47uF"/>
 <part name="C5" library="SparkFun" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
@@ -5432,33 +5445,55 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <part name="LED1" library="adafruit" deviceset="LED" device="CHIPLED_0603"/>
 <part name="GND23" library="SparkFun" deviceset="GND" device=""/>
 <part name="R6" library="SLAT-RCL" deviceset="R0402" device=""/>
-<part name="TP1" library="testpad" deviceset="TP" device="TP11R"/>
-<part name="TP2" library="testpad" deviceset="TP" device="TP11R"/>
-<part name="TP3" library="testpad" deviceset="TP" device="TP11R"/>
+<part name="TP1" library="testpad" deviceset="TP" device="TP08SQ" value="TPTP08SQ"/>
+<part name="TP2" library="testpad" deviceset="TP" device="TP08SQ" value="TPTP08SQ"/>
+<part name="TP3" library="testpad" deviceset="TP" device="TP08SQ" value="TPTP08SQ"/>
 <part name="GND24" library="SparkFun" deviceset="GND" device=""/>
-<part name="U$1" library="Protofusion" deviceset="WIREPAD" device=""/>
-<part name="U$2" library="Protofusion" deviceset="WIREPAD" device=""/>
-<part name="U$5" library="Protofusion" deviceset="WIREPAD" device=""/>
+<part name="GND-1" library="Protofusion" deviceset="WIREPAD" device=""/>
+<part name="ANT" library="Protofusion" deviceset="WIREPAD" device=""/>
+<part name="GND-2" library="Protofusion" deviceset="WIREPAD" device=""/>
+<part name="J3" library="SLAT-Connectors" deviceset="JST_ZH-V-2-1" device=""/>
+<part name="R3" library="SLAT-RCL" deviceset="R0402" device="" value="2M 1%"/>
+<part name="R7" library="SLAT-RCL" deviceset="R0402" device="" value="2M 1%"/>
+<part name="GND25" library="SparkFun" deviceset="GND" device=""/>
+<part name="CM3" library="SparkFun" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="GND26" library="SparkFun" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
 <plain>
+<text x="91.44" y="55.88" size="5.08" layer="94">Add more Cin!</text>
 </plain>
 <instances>
 <instance part="U1" gate="G$1" x="149.86" y="160.02"/>
 <instance part="C1" gate="G$1" x="116.84" y="124.46"/>
 <instance part="C2" gate="G$1" x="127" y="124.46"/>
 <instance part="C3" gate="G$1" x="137.16" y="124.46"/>
-<instance part="C4" gate="G$1" x="170.18" y="187.96" rot="R90"/>
-<instance part="C0" gate="G$1" x="81.28" y="157.48" rot="R90"/>
+<instance part="C4" gate="G$1" x="170.18" y="187.96" smashed="yes" rot="R90">
+<attribute name="NAME" x="170.942" y="189.103" size="1.778" layer="95"/>
+<attribute name="VALUE" x="170.942" y="185.547" size="1.778" layer="96"/>
+</instance>
+<instance part="C0" gate="G$1" x="81.28" y="157.48" smashed="yes" rot="R90">
+<attribute name="NAME" x="82.042" y="158.623" size="1.778" layer="95"/>
+<attribute name="VALUE" x="82.042" y="154.813" size="1.778" layer="96"/>
+</instance>
 <instance part="CM" gate="G$1" x="53.34" y="147.32"/>
 <instance part="CM2" gate="G$1" x="33.02" y="147.32"/>
-<instance part="L0" gate="G$1" x="63.5" y="157.48" rot="R90"/>
-<instance part="LM" gate="G$1" x="43.18" y="157.48" rot="R90"/>
-<instance part="LM2" gate="G$1" x="22.86" y="157.48" rot="R90"/>
+<instance part="L0" gate="G$1" x="63.5" y="157.48" smashed="yes" rot="R90">
+<attribute name="NAME" x="58.166" y="160.02" size="1.778" layer="95"/>
+<attribute name="VALUE" x="58.166" y="154.686" size="1.778" layer="96"/>
+</instance>
+<instance part="LM" gate="G$1" x="43.18" y="157.48" smashed="yes" rot="R90">
+<attribute name="NAME" x="38.1" y="159.766" size="1.778" layer="95"/>
+<attribute name="VALUE" x="37.592" y="154.686" size="1.778" layer="96"/>
+</instance>
+<instance part="LM2" gate="G$1" x="22.86" y="157.48" smashed="yes" rot="R90">
+<attribute name="NAME" x="17.272" y="159.766" size="1.778" layer="95"/>
+<attribute name="VALUE" x="17.018" y="154.686" size="1.778" layer="96"/>
+</instance>
 <instance part="LCHOKE" gate="G$1" x="91.44" y="167.64" smashed="yes" rot="R180">
-<attribute name="NAME" x="93.98" y="170.18" size="1.778" layer="95"/>
-<attribute name="VALUE" x="93.98" y="167.64" size="1.778" layer="96"/>
+<attribute name="NAME" x="92.964" y="168.148" size="1.778" layer="95"/>
+<attribute name="VALUE" x="92.964" y="165.354" size="1.778" layer="96"/>
 </instance>
 <instance part="P+1" gate="1" x="111.76" y="137.16"/>
 <instance part="GND1" gate="1" x="116.84" y="114.3"/>
@@ -5471,15 +5506,27 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <instance part="U2" gate="G$1" x="210.82" y="187.96" rot="MR0"/>
 <instance part="GND10" gate="1" x="195.58" y="172.72" rot="MR0"/>
 <instance part="GND11" gate="1" x="226.06" y="172.72" rot="MR0"/>
-<instance part="R1" gate="G$1" x="114.3" y="172.72" rot="R90"/>
+<instance part="R1" gate="G$1" x="114.3" y="172.72" smashed="yes" rot="R90">
+<attribute name="NAME" x="111.76" y="175.26" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="112.014" y="172.72" size="1.778" layer="96" rot="R180"/>
+</instance>
 <instance part="P+3" gate="1" x="190.5" y="152.4"/>
-<instance part="R2" gate="G$1" x="190.5" y="144.78" rot="R270"/>
+<instance part="R2" gate="G$1" x="190.5" y="144.78" smashed="yes" rot="R270">
+<attribute name="NAME" x="192.532" y="146.0246" size="1.778" layer="95"/>
+<attribute name="VALUE" x="192.532" y="143.51" size="1.778" layer="96"/>
+</instance>
 <instance part="GND12" gate="1" x="2.54" y="144.78"/>
 <instance part="U$4" gate="G$1" x="266.7" y="189.23" rot="R180"/>
 <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="R4" gate="G$1" x="347.98" y="203.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="351.282" y="203.9366" size="1.778" layer="95"/>
+<attribute name="VALUE" x="351.282" y="200.66" size="1.778" layer="96"/>
+</instance>
+<instance part="R5" gate="G$1" x="341.63" y="210.82" smashed="yes" rot="R270">
+<attribute name="NAME" x="343.916" y="212.852" size="1.778" layer="95"/>
+<attribute name="VALUE" x="343.916" y="210.312" size="1.778" layer="96"/>
+</instance>
 <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"/>
@@ -5491,10 +5538,14 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <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="22.86" y="172.72" rot="R90"/>
-<instance part="CM4" gate="G$1" x="43.18" 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="CM1" gate="G$1" x="22.86" y="172.72" smashed="yes" rot="R90">
+<attribute name="NAME" x="24.13" y="174.117" size="1.778" layer="95"/>
+<attribute name="VALUE" x="23.622" y="170.307" size="1.778" layer="96"/>
+</instance>
+<instance part="CM4" gate="G$1" x="43.18" y="172.72" smashed="yes" rot="R90">
+<attribute name="NAME" x="43.942" y="173.609" size="1.778" layer="95"/>
+<attribute name="VALUE" x="44.196" y="170.307" size="1.778" layer="96"/>
+</instance>
 <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"/>
@@ -5519,16 +5570,46 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <instance part="GND21" gate="1" x="114.3" y="162.56"/>
 <instance part="C10" gate="G$1" x="231.14" y="182.88"/>
 <instance part="GND22" gate="1" x="231.14" y="172.72" rot="MR0"/>
-<instance part="LED1" gate="G$1" x="246.38" y="58.42"/>
+<instance part="LED1" gate="G$1" x="246.38" y="58.42" smashed="yes">
+<attribute name="NAME" x="248.92" y="56.388" size="1.778" layer="95"/>
+<attribute name="VALUE" x="252.095" y="53.848" size="1.778" layer="96" rot="R90"/>
+</instance>
 <instance part="GND23" gate="1" x="246.38" y="48.26"/>
-<instance part="R6" gate="G$1" x="246.38" y="68.58" rot="R90"/>
-<instance part="TP1" gate="G$1" x="251.46" y="96.52" rot="R90"/>
-<instance part="TP2" gate="G$1" x="251.46" y="93.98" rot="R90"/>
+<instance part="R6" gate="G$1" x="246.38" y="68.58" smashed="yes" rot="R90">
+<attribute name="NAME" x="248.412" y="68.0466" size="1.778" layer="95"/>
+<attribute name="VALUE" x="249.682" y="64.77" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="TP1" gate="G$1" x="251.46" y="96.52" smashed="yes" rot="R90">
+<attribute name="NAME" x="250.952" y="97.282" size="1.778" layer="95" rot="R180"/>
+<attribute name="TP_SIGNAL_NAME" x="252.73" y="97.79" size="1.778" layer="97" rot="R90"/>
+</instance>
+<instance part="TP2" gate="G$1" x="251.46" y="93.98" smashed="yes" rot="R90">
+<attribute name="NAME" x="250.952" y="94.742" size="1.778" layer="95" rot="R180"/>
+<attribute name="TP_SIGNAL_NAME" x="252.73" y="95.25" size="1.778" layer="97" rot="R90"/>
+</instance>
 <instance part="TP3" gate="G$1" x="226.06" y="91.44"/>
 <instance part="GND24" gate="1" x="226.06" y="83.82"/>
-<instance part="U$1" gate="G$1" x="-7.62" y="165.1"/>
-<instance part="U$2" gate="G$1" x="-12.7" y="157.48"/>
-<instance part="U$5" gate="G$1" x="-7.62" y="149.86"/>
+<instance part="GND-1" gate="G$1" x="-7.62" y="165.1" smashed="yes">
+<attribute name="NAME" x="-9.271" y="166.0398" size="1.778" layer="95" rot="R180"/>
+</instance>
+<instance part="ANT" gate="G$1" x="-12.7" y="157.48" smashed="yes">
+<attribute name="NAME" x="-14.351" y="158.1658" size="1.778" layer="95" rot="R180"/>
+</instance>
+<instance part="GND-2" gate="G$1" x="-7.62" y="149.86" smashed="yes">
+<attribute name="NAME" x="-9.271" y="150.5458" size="1.778" layer="95" rot="R180"/>
+</instance>
+<instance part="J3" gate="G$1" x="134.62" y="76.2"/>
+<instance part="R3" gate="G$1" x="99.06" y="91.44" smashed="yes" rot="R90">
+<attribute name="NAME" x="101.092" y="90.9066" size="1.778" layer="95"/>
+<attribute name="VALUE" x="101.092" y="88.646" size="1.778" layer="96"/>
+</instance>
+<instance part="R7" gate="G$1" x="99.06" y="76.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="101.092" y="75.6666" size="1.778" layer="95"/>
+<attribute name="VALUE" x="100.838" y="73.152" size="1.778" layer="96"/>
+</instance>
+<instance part="GND25" gate="1" x="99.06" y="66.04"/>
+<instance part="CM3" gate="G$1" x="116.84" y="73.66"/>
+<instance part="GND26" gate="1" x="116.84" y="66.04"/>
 </instances>
 <busses>
 </busses>
@@ -5595,8 +5676,8 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <wire x1="2.54" y1="165.1" x2="-5.08" y2="165.1" width="0.1524" layer="91"/>
 <wire x1="2.54" y1="149.86" x2="-5.08" y2="149.86" width="0.1524" layer="91"/>
 <junction x="2.54" y="149.86"/>
-<pinref part="U$1" gate="G$1" pin="P"/>
-<pinref part="U$5" gate="G$1" pin="P"/>
+<pinref part="GND-1" gate="G$1" pin="P"/>
+<pinref part="GND-2" gate="G$1" pin="P"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
@@ -5628,10 +5709,10 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <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="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"/>
+<wire x1="139.7" y1="76.2" x2="144.78" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="144.78" y1="76.2" x2="144.78" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="J3" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="J1" gate="G$1" pin="GND"/>
@@ -5678,6 +5759,16 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <pinref part="GND24" gate="1" pin="GND"/>
 <wire x1="226.06" y1="86.36" x2="226.06" y2="88.9" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="GND25" gate="1" pin="GND"/>
+<wire x1="99.06" y1="68.58" x2="99.06" y2="71.12" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="CM3" gate="G$1" pin="2"/>
+<pinref part="GND26" gate="1" pin="GND"/>
+<wire x1="116.84" y1="71.12" x2="116.84" y2="68.58" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="VCC" class="0">
 <segment>
@@ -6022,7 +6113,7 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <pinref part="CM1" gate="G$1" pin="1"/>
 <wire x1="17.78" y1="172.72" x2="12.7" y2="172.72" width="0.1524" layer="91"/>
 <wire x1="12.7" y1="172.72" x2="12.7" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="P"/>
+<pinref part="ANT" gate="G$1" pin="P"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -6039,22 +6130,6 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <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="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="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="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>
 <net name="TCXO-POWER" class="0">
 <segment>
 <pinref part="U6" gate="G$1" pin="TIM1_1/MCO/PA8"/>
@@ -6100,6 +6175,47 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <wire x1="254" y1="93.98" x2="256.54" y2="93.98" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="VBATT_SENSE" class="0">
+<segment>
+<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="86.36" x2="99.06" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="99.06" y1="83.82" x2="99.06" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="83.82" x2="99.06" y2="83.82" width="0.1524" layer="91"/>
+<junction x="99.06" y="83.82"/>
+<label x="96.52" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="99.06" y1="83.82" x2="116.84" y2="83.82" width="0.1524" layer="91"/>
+<pinref part="CM3" gate="G$1" pin="1"/>
+<wire x1="116.84" y1="83.82" x2="116.84" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="U6" gate="G$1" pin="PA6/SPI1_MISO/TIM3_1"/>
+<wire x1="254" y1="86.36" x2="256.54" y2="86.36" width="0.1524" layer="91"/>
+<label x="254" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="VBATT" class="0">
+<segment>
+<pinref part="R3" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="99.06" x2="99.06" y2="96.52" width="0.1524" layer="91"/>
+<label x="99.06" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U4" gate="G$1" pin="VIN"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<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="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"/>
+<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"/>
+<pinref part="J3" gate="G$1" pin="1"/>
+<label x="142.24" y="78.74" size="1.27" layer="95"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>