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>