diff --git a/breakout-hardware/bristol_longshot.brd b/breakout-hardware/bristol_longshot.brd
index e528cb9..7af155d 100644
--- a/breakout-hardware/bristol_longshot.brd
+++ b/breakout-hardware/bristol_longshot.brd
@@ -1806,56 +1806,56 @@ Covered vias can be set in Masks (Limit).
 </pass>
 </autorouter>
 <elements>
-<element name="U$38" library="spv1040" package="TSSOP8" value="SPV1040" x="16.5" y="6"/>
-<element name="U$51" library="l6924d" package="VFQFPN16" value="L6924D" x="31" y="10.25"/>
-<element name="R3" library="microbuilder_v3" package="_0402" value="820kΩ" x="24.25" y="5.25" rot="R270"/>
-<element name="R4" library="microbuilder_v3" package="_0402" value="2M2Ω" x="23.25" y="5.25" rot="R90"/>
-<element name="C20" library="microbuilder_v3" package="_0402" value="1nF" x="23.75" y="3.75"/>
-<element name="U$61" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="55.75" y="9.75" rot="R90"/>
-<element name="U$62" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="55.75" y="5.5" rot="R90"/>
-<element name="U$63" library="TPS3808" package="S-PWSON-N6" value="TPS3808" x="45" y="5.5" rot="R270"/>
-<element name="U3" library="74LVC1G04GW_inverter" package="SOT65P210X110-5N" value="74LVC1G04GW" x="44.875" y="9.75" rot="R180">
+<element name="U2" library="spv1040" package="TSSOP8" value="SPV1040" x="16.5" y="6"/>
+<element name="U3" library="l6924d" package="VFQFPN16" value="L6924D" x="31" y="10.25"/>
+<element name="R8" library="microbuilder_v3" package="_0402" value="820kΩ" x="24.25" y="5.25" rot="R270"/>
+<element name="R6" library="microbuilder_v3" package="_0402" value="2M2Ω" x="23.25" y="5.25" rot="R90"/>
+<element name="C8" library="microbuilder_v3" package="_0402" value="1nF" x="23.75" y="3.75"/>
+<element name="U5" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="55.75" y="9.75" rot="R90"/>
+<element name="U4" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="55.75" y="5.5" rot="R90"/>
+<element name="U6" library="TPS3808" package="S-PWSON-N6" value="TPS3808" x="45" y="5.5" rot="R270"/>
+<element name="U7" library="74LVC1G04GW_inverter" package="SOT65P210X110-5N" value="74LVC1G04GW" x="44.875" y="9.75" rot="R180">
 <attribute name="PACKAGE" value="SOT-5" x="44.875" y="9.75" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="OC_NEWARK" value="03P2774" x="44.875" y="9.75" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="74LVC1G04GW" x="44.875" y="9.75" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="SUPPLIER" value="NXP" x="44.875" y="9.75" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="OC_FARNELL" value="1631683" x="44.875" y="9.75" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="U$64" library="BAT760" package="SOD323" value="BAT760" x="41.75" y="7.75" rot="R180"/>
-<element name="U$65" library="BAT760" package="SOD323" value="BAT760" x="41.75" y="6.25" rot="R180"/>
-<element name="L8" library="SparkFun" package="1007" value="2.2µH" x="58.5" y="9.75" rot="R180"/>
-<element name="C22" library="resistor" package="C0603K" value="10µF" x="54.875" y="7.375" rot="R180"/>
+<element name="D3" library="BAT760" package="SOD323" value="BAT760" x="41.75" y="7.75" rot="R180"/>
+<element name="D4" library="BAT760" package="SOD323" value="BAT760" x="41.75" y="6.25" rot="R180"/>
+<element name="L4" library="SparkFun" package="1007" value="2.2µH" x="58.5" y="9.75" rot="R180"/>
+<element name="C18" library="resistor" package="C0603K" value="10µF" x="54.875" y="7.375" rot="R180"/>
 <element name="D2" library="led" package="CHIPLED_0603" value="GREEN" x="31.5" y="6.5"/>
-<element name="U$1" library="spv1040" package="TSSOP8" value="SPV1040" x="16.5" y="15.5"/>
-<element name="R1" library="microbuilder_v3" package="_0402" value="820kΩ" x="24.25" y="14.75" rot="R270"/>
-<element name="R2" library="microbuilder_v3" package="_0402" value="2M2Ω" x="23.25" y="14.75" rot="R90"/>
-<element name="C1" library="microbuilder_v3" package="_0402" value="1nF" x="23.75" y="13.25"/>
-<element name="L1" library="SparkFun" package="1007" value="2.2µH" x="58.5" y="5.5" rot="R180"/>
-<element name="R9" library="microbuilder_v3" package="_0402" value="10kΩ" x="42.75" y="9.75" rot="R270"/>
-<element name="L2" library="SparkFun" package="1007" value="2.2µH" x="13.75" y="15.75"/>
-<element name="L3" library="SparkFun" package="1007" value="2.2µH" x="13.75" y="6.25"/>
+<element name="U1" library="spv1040" package="TSSOP8" value="SPV1040" x="16.5" y="15.5"/>
+<element name="R7" library="microbuilder_v3" package="_0402" value="820kΩ" x="24.25" y="14.75" rot="R270"/>
+<element name="R5" library="microbuilder_v3" package="_0402" value="2M2Ω" x="23.25" y="14.75" rot="R90"/>
+<element name="C7" library="microbuilder_v3" package="_0402" value="1nF" x="23.75" y="13.25"/>
+<element name="L3" library="SparkFun" package="1007" value="2.2µH" x="58.5" y="5.5" rot="R180"/>
+<element name="R14" library="microbuilder_v3" package="_0402" value="10kΩ" x="42.75" y="9.75" rot="R270"/>
+<element name="L1" library="SparkFun" package="1007" value="2.2µH" x="13.75" y="15.75"/>
+<element name="L2" library="SparkFun" package="1007" value="2.2µH" x="13.75" y="6.25"/>
 <element name="JP1" library="SparkFun" package="1X02_LOCK" value="" x="17.5" y="2"/>
-<element name="R10" library="microbuilder_v3" package="_0402" value="1kΩ" x="15.5" y="7.75" rot="R270"/>
-<element name="C3" library="microbuilder_v3" package="_0402" value="1nF" x="17.25" y="7.5" rot="R180"/>
-<element name="C4" library="microbuilder_v3" package="_0402" value="1nF" x="17.25" y="17" rot="R180"/>
-<element name="R11" library="microbuilder_v3" package="_0402" value="1kΩ" x="15.5" y="17.25" rot="R270"/>
+<element name="R2" library="microbuilder_v3" package="_0402" value="1kΩ" x="15.5" y="7.75" rot="R270"/>
+<element name="C6" library="microbuilder_v3" package="_0402" value="1nF" x="17.25" y="7.5" rot="R180"/>
+<element name="C5" library="microbuilder_v3" package="_0402" value="1nF" x="17.25" y="17" rot="R180"/>
+<element name="R1" library="microbuilder_v3" package="_0402" value="1kΩ" x="15.5" y="17.25" rot="R270"/>
 <element name="JP2" library="SparkFun" package="1X02_LOCK" value="" x="17.5" y="11.5"/>
 <element name="JP3" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="PV1" x="3.75" y="16.5" rot="R270"/>
 <element name="JP4" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="PV2" x="3.75" y="7" rot="R270"/>
 <element name="JP5" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="" x="39.5" y="16.25" rot="R180"/>
 <element name="JP6" library="SparkFun" package="1X02_LOCK" value="Shutdown" x="35.25" y="4.5" rot="R90"/>
-<element name="C2" library="microbuilder_v3" package="_0402" value="4.7µF" x="14.25" y="18.25" rot="R90"/>
-<element name="C5" library="microbuilder_v3" package="_0402" value="4.7µF" x="13.25" y="18.25" rot="R90"/>
-<element name="C6" library="microbuilder_v3" package="_0402" value="4.7µF" x="13.25" y="8.75" rot="R90"/>
-<element name="C7" library="microbuilder_v3" package="_0402" value="4.7µF" x="14.25" y="8.75" rot="R90"/>
-<element name="C8" library="microbuilder_v3" package="_0402" value="4.7µF" x="31" y="13.25" rot="R90"/>
-<element name="R5" library="microbuilder_v3" package="_0402" value="47kΩ" x="27.5" y="14.25" rot="R180"/>
-<element name="R6" library="microbuilder_v3" package="_0402" value="100kΩ" x="28.5" y="13.375"/>
+<element name="C1" library="microbuilder_v3" package="_0402" value="4.7µF" x="14.25" y="18.25" rot="R90"/>
+<element name="C2" library="microbuilder_v3" package="_0402" value="4.7µF" x="13.25" y="18.25" rot="R90"/>
+<element name="C3" library="microbuilder_v3" package="_0402" value="4.7µF" x="13.25" y="8.75" rot="R90"/>
+<element name="C4" library="microbuilder_v3" package="_0402" value="4.7µF" x="14.25" y="8.75" rot="R90"/>
+<element name="C12" library="microbuilder_v3" package="_0402" value="4.7µF" x="31" y="13.25" rot="R90"/>
+<element name="R11" library="microbuilder_v3" package="_0402" value="47kΩ" x="27.5" y="14.25" rot="R180"/>
+<element name="R10" library="microbuilder_v3" package="_0402" value="100kΩ" x="28.5" y="13.375"/>
 <element name="C9" library="microbuilder_v3" package="_0402" value="1nF" x="27.5" y="12.5"/>
-<element name="R7" library="microbuilder_v3" package="_0402" value="47kΩ" x="27.5" y="10"/>
-<element name="C10" library="microbuilder_v3" package="_0402" value="47nF" x="34.5" y="9.5"/>
-<element name="R8" library="microbuilder_v3" package="_0402" value="10kΩ" x="27.5" y="11"/>
-<element name="R12" library="microbuilder_v3" package="_0402" value="100kΩ" x="34.5" y="10.5" rot="R180"/>
+<element name="R12" library="microbuilder_v3" package="_0402" value="47kΩ" x="27.5" y="10"/>
+<element name="C13" library="microbuilder_v3" package="_0402" value="47nF" x="34.5" y="9.5"/>
+<element name="R13" library="microbuilder_v3" package="_0402" value="10kΩ" x="27.5" y="11"/>
+<element name="R9" library="microbuilder_v3" package="_0402" value="100kΩ" x="34.5" y="10.5" rot="R180"/>
 <element name="U$30" library="Harwin-Test-Point" package="S1751-46R" value="S1751-46R" x="10.5" y="16.75" rot="R180"/>
 <element name="U$31" library="Harwin-Test-Point" package="S1751-46R" value="S1751-46R" x="10.5" y="7.25" rot="R180"/>
 <element name="U$33" library="Harwin-Test-Point" package="S1751-46R" value="S1751-46R" x="13.75" y="11.5" rot="R180"/>
@@ -1870,15 +1870,15 @@ Covered vias can be set in Masks (Limit).
 <element name="U$46" library="Harwin-Test-Point" package="S1751-46R" value="S1751-46R" x="62.25" y="8.75"/>
 <element name="U$47" library="Harwin-Test-Point" package="S1751-46R" value="S1751-46R" x="44.5" y="14.25" rot="R180"/>
 <element name="D1" library="led" package="CHIPLED_0603" value="GREEN" x="33" y="6.5"/>
-<element name="R13" library="microbuilder_v3" package="_0402" value="1kΩ" x="33" y="4.25" rot="R270"/>
-<element name="R14" library="microbuilder_v3" package="_0402" value="1kΩ" x="31.5" y="4.25" rot="R270"/>
-<element name="C12" library="microbuilder_v3" package="_0402" value="4.7µF" x="53.75" y="9.25" rot="R270"/>
-<element name="C13" library="microbuilder_v3" package="_0402" value="4.7µF" x="53.75" y="5" rot="R270"/>
-<element name="C14" library="microbuilder_v3" package="_0402" value="1nF" x="44.5" y="7.75"/>
+<element name="R3" library="microbuilder_v3" package="_0402" value="1kΩ" x="33" y="4.25" rot="R270"/>
+<element name="R4" library="microbuilder_v3" package="_0402" value="1kΩ" x="31.5" y="4.25" rot="R270"/>
+<element name="C16" library="microbuilder_v3" package="_0402" value="4.7µF" x="53.75" y="9.25" rot="R270"/>
+<element name="C15" library="microbuilder_v3" package="_0402" value="4.7µF" x="53.75" y="5" rot="R270"/>
+<element name="C10" library="microbuilder_v3" package="_0402" value="1nF" x="44.5" y="7.75"/>
 <element name="JTAG1" library="microbuilder_v3" package="2X05_1.27MM_SMT" value="" x="60.75" y="16"/>
 <element name="JP7" library="SparkFun" package="1X04_LOCK" value="" x="34.25" y="1.5"/>
-<element name="C15" library="resistor" package="C0603K" value="10µF" x="54.875" y="11.625" rot="R180"/>
-<element name="C16" library="microbuilder_v3" package="_0402" value="DNP" x="44.5" y="4"/>
+<element name="C17" library="resistor" package="C0603K" value="10µF" x="54.875" y="11.625" rot="R180"/>
+<element name="C14" library="microbuilder_v3" package="_0402" value="DNP" x="44.5" y="4"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1894,25 +1894,25 @@ Covered vias can be set in Masks (Limit).
 <vertex x="65" y="0"/>
 <vertex x="0" y="0"/>
 </polygon>
-<contactref element="U$38" pad="2"/>
-<contactref element="R3" pad="1"/>
-<contactref element="C20" pad="2"/>
-<contactref element="U$38" pad="2"/>
-<contactref element="U$1" pad="2"/>
-<contactref element="R1" pad="1"/>
-<contactref element="C1" pad="2"/>
-<contactref element="U$1" pad="2"/>
-<contactref element="U$51" pad="P$6"/>
-<contactref element="U$51" pad="P$17"/>
-<contactref element="U$63" pad="5"/>
-<contactref element="U$63" pad="PAD"/>
-<contactref element="U$62" pad="6"/>
-<contactref element="U$62" pad="PAD"/>
-<contactref element="U$61" pad="6"/>
-<contactref element="U$61" pad="PAD"/>
-<contactref element="U$62" pad="2"/>
-<contactref element="U$61" pad="2"/>
-<contactref element="C22" pad="2"/>
+<contactref element="U2" pad="2"/>
+<contactref element="R8" pad="1"/>
+<contactref element="C8" pad="2"/>
+<contactref element="U2" pad="2"/>
+<contactref element="U1" pad="2"/>
+<contactref element="R7" pad="1"/>
+<contactref element="C7" pad="2"/>
+<contactref element="U1" pad="2"/>
+<contactref element="U3" pad="P$6"/>
+<contactref element="U3" pad="P$17"/>
+<contactref element="U6" pad="5"/>
+<contactref element="U6" pad="PAD"/>
+<contactref element="U4" pad="6"/>
+<contactref element="U4" pad="PAD"/>
+<contactref element="U5" pad="6"/>
+<contactref element="U5" pad="PAD"/>
+<contactref element="U4" pad="2"/>
+<contactref element="U5" pad="2"/>
+<contactref element="C18" pad="2"/>
 <via x="55.75" y="9.25" extent="1-16" drill="0.3"/>
 <via x="55.75" y="10.25" extent="1-16" drill="0.3"/>
 <wire x1="54.7" y1="9.1" x2="55.75" y2="9.1" width="0.2" layer="1"/>
@@ -1921,23 +1921,23 @@ Covered vias can be set in Masks (Limit).
 <via x="55.75" y="6" extent="1-16" drill="0.3"/>
 <wire x1="54.7" y1="4.85" x2="55.75" y2="4.85" width="0.2" layer="1"/>
 <wire x1="55.75" y1="4.85" x2="55.75" y2="5" width="0.2" layer="1"/>
-<contactref element="C3" pad="1"/>
-<contactref element="C4" pad="1"/>
+<contactref element="C6" pad="1"/>
+<contactref element="C5" pad="1"/>
 <contactref element="JP3" pad="2"/>
 <contactref element="JP4" pad="2"/>
-<contactref element="U3" pad="3"/>
+<contactref element="U7" pad="3"/>
+<contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
-<contactref element="C5" pad="2"/>
-<contactref element="C6" pad="2"/>
-<contactref element="C7" pad="2"/>
+<contactref element="C3" pad="2"/>
+<contactref element="C4" pad="2"/>
 <contactref element="JP5" pad="2"/>
-<contactref element="C8" pad="2"/>
-<contactref element="R5" pad="2"/>
+<contactref element="C12" pad="2"/>
+<contactref element="R11" pad="2"/>
 <contactref element="C9" pad="1"/>
-<contactref element="R7" pad="1"/>
-<contactref element="C10" pad="2"/>
-<contactref element="U$51" pad="P$9"/>
-<contactref element="R8" pad="1"/>
+<contactref element="R12" pad="1"/>
+<contactref element="C13" pad="2"/>
+<contactref element="U3" pad="P$9"/>
+<contactref element="R13" pad="1"/>
 <contactref element="C11" pad="2"/>
 <via x="45" y="6" extent="1-16" drill="0.3"/>
 <via x="45" y="5" extent="1-16" drill="0.3"/>
@@ -1946,9 +1946,9 @@ Covered vias can be set in Masks (Limit).
 <wire x1="31.25" y1="10" x2="31" y2="10.25" width="0.2" layer="1"/>
 <wire x1="31.75" y1="11.725" x2="31.75" y2="11" width="0.2" layer="1"/>
 <wire x1="31.75" y1="11" x2="31" y2="10.25" width="0.2" layer="1"/>
-<contactref element="C13" pad="2"/>
-<contactref element="C12" pad="2"/>
-<contactref element="C14" pad="2"/>
+<contactref element="C15" pad="2"/>
+<contactref element="C16" pad="2"/>
+<contactref element="C10" pad="2"/>
 <contactref element="JTAG1" pad="3"/>
 <contactref element="JTAG1" pad="5"/>
 <via x="17.75" y="6.75" extent="1-16" drill="0.3"/>
@@ -1969,7 +1969,7 @@ Covered vias can be set in Masks (Limit).
 <contactref element="JP7" pad="2"/>
 <contactref element="JP7" pad="3"/>
 <contactref element="JP7" pad="4"/>
-<contactref element="R12" pad="1"/>
+<contactref element="R9" pad="1"/>
 <via x="31" y="14.625" extent="1-16" drill="0.3"/>
 <via x="30.5" y="10.75" extent="1-16" drill="0.3"/>
 <via x="30.5" y="9.75" extent="1-16" drill="0.3"/>
@@ -1984,7 +1984,7 @@ Covered vias can be set in Masks (Limit).
 <via x="53" y="8.75" extent="1-16" drill="0.3"/>
 <via x="53" y="4.5" extent="1-16" drill="0.3"/>
 <via x="53" y="7.375" extent="1-16" drill="0.3"/>
-<contactref element="C15" pad="2"/>
+<contactref element="C17" pad="2"/>
 <via x="53" y="11.625" extent="1-16" drill="0.3"/>
 <wire x1="31.5" y1="9.75" x2="31.5" y2="10.25" width="0.4" layer="1"/>
 <wire x1="31.5" y1="10.25" x2="31" y2="10.25" width="0.4" layer="1"/>
@@ -1992,17 +1992,17 @@ Covered vias can be set in Masks (Limit).
 <via x="18.125" y="13.75" extent="1-16" drill="0.3"/>
 <via x="18" y="4.25" extent="1-16" drill="0.3"/>
 <via x="14.5" y="4.25" extent="1-16" drill="0.3"/>
-<contactref element="C16" pad="2"/>
+<contactref element="C14" pad="2"/>
 <via x="59.5" y="16" extent="1-16" drill="0.3"/>
 <via x="60.75" y="16" extent="1-16" drill="0.3"/>
 </signal>
 <signal name="KEY">
 </signal>
 <signal name="SPV_VCTRL2">
-<contactref element="C20" pad="1"/>
-<contactref element="R3" pad="2"/>
-<contactref element="R4" pad="1"/>
-<contactref element="U$38" pad="5"/>
+<contactref element="C8" pad="1"/>
+<contactref element="R8" pad="2"/>
+<contactref element="R6" pad="1"/>
+<contactref element="U2" pad="5"/>
 <wire x1="21.9" y1="4.525" x2="23.033" y2="4.525" width="0.4" layer="1"/>
 <wire x1="23.033" y1="4.525" x2="23.25" y2="4.742" width="0.4" layer="1"/>
 <wire x1="23.242" y1="3.75" x2="23.242" y2="4.734" width="0.4" layer="1"/>
@@ -2010,11 +2010,11 @@ Covered vias can be set in Masks (Limit).
 <wire x1="24.25" y1="4.742" x2="23.25" y2="4.742" width="0.4" layer="1"/>
 </signal>
 <signal name="SUPERVISOR_VCC">
-<contactref element="U$64" pad="C"/>
-<contactref element="U$63" pad="1"/>
-<contactref element="U$65" pad="C"/>
-<contactref element="U3" pad="5"/>
-<contactref element="R9" pad="2"/>
+<contactref element="D3" pad="C"/>
+<contactref element="U6" pad="1"/>
+<contactref element="D4" pad="C"/>
+<contactref element="U7" pad="5"/>
+<contactref element="R14" pad="2"/>
 <contactref element="U$47" pad="PAD"/>
 <wire x1="43.9098" y1="9.0896" x2="42.9024" y2="9.0896" width="0.2" layer="1"/>
 <wire x1="42.9024" y1="9.0896" x2="42.75" y2="9.242" width="0.2" layer="1"/>
@@ -2023,7 +2023,7 @@ Covered vias can be set in Masks (Limit).
 <wire x1="42.85" y1="9.142" x2="42.75" y2="9.242" width="0.4" layer="1"/>
 <wire x1="43.95" y1="6.15" x2="42.95" y2="6.15" width="0.2" layer="1"/>
 <wire x1="42.95" y1="6.15" x2="42.85" y2="6.25" width="0.2" layer="1"/>
-<contactref element="C14" pad="1"/>
+<contactref element="C10" pad="1"/>
 <wire x1="42.85" y1="7.75" x2="43.992" y2="7.75" width="0.2" layer="1"/>
 <via x="42" y="12.375" extent="1-16" drill="0.3"/>
 <via x="42" y="9.125" extent="1-16" drill="0.3"/>
@@ -2034,9 +2034,9 @@ Covered vias can be set in Masks (Limit).
 <wire x1="42" y1="12.375" x2="42" y2="9.125" width="0.4" layer="16"/>
 </signal>
 <signal name="BATTERY_EN">
-<contactref element="U$61" pad="4"/>
-<contactref element="U3" pad="4"/>
-<contactref element="R9" pad="1"/>
+<contactref element="U5" pad="4"/>
+<contactref element="U7" pad="4"/>
+<contactref element="R14" pad="1"/>
 <contactref element="U$44" pad="PAD"/>
 <wire x1="49.65" y1="10.4" x2="49" y2="9.75" width="0.2" layer="1"/>
 <wire x1="43.9098" y1="10.4104" x2="42.9024" y2="10.4104" width="0.2" layer="1"/>
@@ -2054,19 +2054,19 @@ Covered vias can be set in Masks (Limit).
 <wire x1="50.875" y1="10.4" x2="53" y2="10.4" width="0.2" layer="16"/>
 </signal>
 <signal name="TANK">
-<contactref element="U$62" pad="5"/>
-<contactref element="U$65" pad="A"/>
-<contactref element="U$63" pad="2"/>
+<contactref element="U4" pad="5"/>
+<contactref element="D4" pad="A"/>
+<contactref element="U6" pad="2"/>
 <contactref element="JP2" pad="2"/>
 <contactref element="JP1" pad="2"/>
-<contactref element="U$51" pad="P$1"/>
-<contactref element="U$51" pad="P$2"/>
+<contactref element="U3" pad="P$1"/>
+<contactref element="U3" pad="P$2"/>
 <contactref element="JP6" pad="1"/>
 <contactref element="C11" pad="1"/>
 <contactref element="U$41" pad="PAD"/>
-<contactref element="R14" pad="2"/>
-<contactref element="R13" pad="2"/>
-<contactref element="C13" pad="1"/>
+<contactref element="R4" pad="2"/>
+<contactref element="R3" pad="2"/>
+<contactref element="C15" pad="1"/>
 <wire x1="54.7" y1="5.5" x2="53.758" y2="5.5" width="0.2" layer="1"/>
 <wire x1="53.758" y1="5.5" x2="53.75" y2="5.508" width="0.2" layer="1"/>
 <wire x1="30.25" y1="8.775" x2="30.025" y2="9" width="0.2" layer="1"/>
@@ -2101,11 +2101,11 @@ Covered vias can be set in Masks (Limit).
 <wire x1="43" y1="5.5" x2="43.95" y2="5.5" width="0.4" layer="1"/>
 </signal>
 <signal name="1.8V">
-<contactref element="U$61" pad="3"/>
-<contactref element="U$62" pad="3"/>
-<contactref element="C22" pad="1"/>
-<contactref element="L1" pad="2"/>
-<contactref element="L8" pad="2"/>
+<contactref element="U5" pad="3"/>
+<contactref element="U4" pad="3"/>
+<contactref element="C18" pad="1"/>
+<contactref element="L3" pad="2"/>
+<contactref element="L4" pad="2"/>
 <contactref element="U$42" pad="PAD"/>
 <wire x1="56.8" y1="6.15" x2="58.15" y2="6.15" width="0.2" layer="1"/>
 <wire x1="58.15" y1="6.15" x2="58.5" y2="6.5" width="0.2" layer="1"/>
@@ -2116,7 +2116,7 @@ Covered vias can be set in Masks (Limit).
 <wire x1="54" y1="14.25" x2="55.5" y2="14.25" width="0.4" layer="1"/>
 <wire x1="55.75" y1="14.25" x2="58.21" y2="14.25" width="0.4" layer="1"/>
 <wire x1="58.21" y1="14.25" x2="58.21" y2="14.15" width="0.4" layer="1"/>
-<contactref element="C15" pad="1"/>
+<contactref element="C17" pad="1"/>
 <via x="56.875" y="6.875" extent="1-16" drill="0.3"/>
 <via x="56.875" y="11.125" extent="1-16" drill="0.3"/>
 <wire x1="56.8" y1="6.15" x2="56.8" y2="6.8" width="0.2" layer="1"/>
@@ -2132,25 +2132,25 @@ Covered vias can be set in Masks (Limit).
 <wire x1="55.75" y1="14.25" x2="55.5" y2="14.25" width="0.4" layer="1"/>
 </signal>
 <signal name="TANK_BUCK_SW">
-<contactref element="U$62" pad="1"/>
-<contactref element="L1" pad="1"/>
+<contactref element="U4" pad="1"/>
+<contactref element="L3" pad="1"/>
 <contactref element="U$45" pad="PAD"/>
 <wire x1="56.8" y1="4.85" x2="58.15" y2="4.85" width="0.2" layer="1"/>
 <wire x1="58.15" y1="4.85" x2="58.5" y2="4.5" width="0.2" layer="1"/>
 <wire x1="58.5" y1="4.5" x2="62.25" y2="4.5" width="0.4" layer="1"/>
 </signal>
 <signal name="BATTERY_BUCK_SW">
-<contactref element="L8" pad="1"/>
-<contactref element="U$61" pad="1"/>
+<contactref element="L4" pad="1"/>
+<contactref element="U5" pad="1"/>
 <contactref element="U$46" pad="PAD"/>
 <wire x1="56.8" y1="9.1" x2="58.15" y2="9.1" width="0.2" layer="1"/>
 <wire x1="58.15" y1="9.1" x2="58.5" y2="8.75" width="0.2" layer="1"/>
 <wire x1="58.5" y1="8.75" x2="62.25" y2="8.75" width="0.4" layer="1"/>
 </signal>
 <signal name="TANK_EN">
-<contactref element="U$62" pad="4"/>
-<contactref element="U$63" pad="6"/>
-<contactref element="U3" pad="2"/>
+<contactref element="U4" pad="4"/>
+<contactref element="U6" pad="6"/>
+<contactref element="U7" pad="2"/>
 <contactref element="U$43" pad="PAD"/>
 <wire x1="54.7" y1="6.15" x2="49.65" y2="6.15" width="0.2" layer="1"/>
 <wire x1="49.65" y1="6.15" x2="49" y2="5.5" width="0.2" layer="1"/>
@@ -2162,14 +2162,14 @@ Covered vias can be set in Masks (Limit).
 <wire x1="46.75" y1="9.5" x2="46.75" y2="6.15" width="0.2" layer="1"/>
 </signal>
 <signal name="BATTERY">
-<contactref element="U$61" pad="5"/>
-<contactref element="U$64" pad="A"/>
-<contactref element="U$51" pad="P$11"/>
-<contactref element="U$51" pad="P$10"/>
+<contactref element="U5" pad="5"/>
+<contactref element="D3" pad="A"/>
+<contactref element="U3" pad="P$11"/>
+<contactref element="U3" pad="P$10"/>
 <contactref element="JP5" pad="1"/>
-<contactref element="C8" pad="1"/>
-<contactref element="U$39" pad="PAD"/>
 <contactref element="C12" pad="1"/>
+<contactref element="U$39" pad="PAD"/>
+<contactref element="C16" pad="1"/>
 <wire x1="54.7" y1="9.75" x2="53.758" y2="9.75" width="0.2" layer="1"/>
 <wire x1="53.758" y1="9.75" x2="53.75" y2="9.758" width="0.2" layer="1"/>
 <wire x1="39.6778" y1="16.25" x2="39" y2="15.5722" width="0.8" layer="1"/>
@@ -2191,28 +2191,28 @@ Covered vias can be set in Masks (Limit).
 <wire x1="53.625" y1="9.633" x2="53.75" y2="9.758" width="0.4" layer="1"/>
 </signal>
 <signal name="LX1">
-<contactref element="L2" pad="2"/>
-<contactref element="U$1" pad="3"/>
+<contactref element="L1" pad="2"/>
+<contactref element="U1" pad="3"/>
 <contactref element="U$33" pad="PAD"/>
 <wire x1="15.7" y1="14.675" x2="13.825" y2="14.675" width="0.4" layer="1"/>
 <wire x1="13.825" y1="14.675" x2="13.75" y2="14.75" width="0.4" layer="1"/>
 <wire x1="13.75" y1="11.5" x2="13.75" y2="14.75" width="0.4" layer="1"/>
 </signal>
 <signal name="LX2">
-<contactref element="L3" pad="2"/>
-<contactref element="U$38" pad="3"/>
+<contactref element="L2" pad="2"/>
+<contactref element="U2" pad="3"/>
 <contactref element="U$34" pad="PAD"/>
 <wire x1="15.7" y1="5.175" x2="13.75" y2="5.175" width="0.4" layer="1"/>
 <wire x1="13.75" y1="5.175" x2="13.75" y2="5.25" width="0.4" layer="1"/>
 <wire x1="13.75" y1="5.175" x2="13.75" y2="2" width="0.4" layer="1"/>
 </signal>
 <signal name="PV1">
-<contactref element="L2" pad="1"/>
-<contactref element="R11" pad="1"/>
+<contactref element="L1" pad="1"/>
+<contactref element="R1" pad="1"/>
 <contactref element="JP3" pad="1"/>
-<contactref element="U$1" pad="8"/>
-<contactref element="C5" pad="1"/>
+<contactref element="U1" pad="8"/>
 <contactref element="C2" pad="1"/>
+<contactref element="C1" pad="1"/>
 <contactref element="U$30" pad="PAD"/>
 <wire x1="13.25" y1="17.742" x2="13.25" y2="16.75" width="0.4" layer="1"/>
 <wire x1="13.25" y1="16.75" x2="13.75" y2="16.75" width="0.4" layer="1"/>
@@ -2228,11 +2228,11 @@ Covered vias can be set in Masks (Limit).
 <wire x1="3.75" y1="16.75" x2="3.75" y2="16.6778" width="0.8" layer="1"/>
 </signal>
 <signal name="MPPT-VOUT-2">
-<contactref element="U$38" pad="4"/>
+<contactref element="U2" pad="4"/>
 <contactref element="JP1" pad="1"/>
-<contactref element="U$38" pad="7"/>
-<contactref element="U$38" pad="6"/>
-<contactref element="R4" pad="2"/>
+<contactref element="U2" pad="7"/>
+<contactref element="U2" pad="6"/>
+<contactref element="R6" pad="2"/>
 <wire x1="15.7" y1="4.525" x2="16.725" y2="4.525" width="0.4" layer="1"/>
 <wire x1="16.725" y1="4.525" x2="17.25" y2="4" width="0.4" layer="1"/>
 <wire x1="17.25" y1="4" x2="17.25" y2="2.0722" width="0.4" layer="1"/>
@@ -2244,20 +2244,20 @@ Covered vias can be set in Masks (Limit).
 <wire x1="23.183" y1="5.825" x2="23.25" y2="5.758" width="0.4" layer="1"/>
 </signal>
 <signal name="MPP-SET2">
-<contactref element="U$38" pad="1"/>
-<contactref element="C3" pad="2"/>
-<contactref element="R10" pad="2"/>
+<contactref element="U2" pad="1"/>
+<contactref element="C6" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="16.742" y1="7.5" x2="16.484" y2="7.242" width="0.4" layer="1"/>
 <wire x1="16.484" y1="7.242" x2="15.5" y2="7.242" width="0.4" layer="1"/>
 <wire x1="15.5" y1="7.242" x2="15.5" y2="6.475" width="0.2" layer="1"/>
 <wire x1="15.5" y1="6.475" x2="15.7" y2="6.475" width="0.2" layer="1"/>
 </signal>
 <signal name="MPPT-VOUT-1">
-<contactref element="U$1" pad="4"/>
+<contactref element="U1" pad="4"/>
 <contactref element="JP2" pad="1"/>
-<contactref element="U$1" pad="7"/>
-<contactref element="U$1" pad="6"/>
-<contactref element="R2" pad="2"/>
+<contactref element="U1" pad="7"/>
+<contactref element="U1" pad="6"/>
+<contactref element="R5" pad="2"/>
 <wire x1="21.9" y1="15.325" x2="23.183" y2="15.325" width="0.4" layer="1"/>
 <wire x1="23.183" y1="15.325" x2="23.25" y2="15.258" width="0.4" layer="1"/>
 <wire x1="21.9" y1="14.675" x2="21.9" y2="15.325" width="0.4" layer="1"/>
@@ -2268,12 +2268,12 @@ Covered vias can be set in Masks (Limit).
 <wire x1="17.3222" y1="13.4778" x2="17.3222" y2="11.5" width="0.4" layer="1"/>
 </signal>
 <signal name="PV2">
-<contactref element="U$38" pad="8"/>
-<contactref element="L3" pad="1"/>
-<contactref element="R10" pad="1"/>
+<contactref element="U2" pad="8"/>
+<contactref element="L2" pad="1"/>
+<contactref element="R2" pad="1"/>
 <contactref element="JP4" pad="1"/>
-<contactref element="C7" pad="1"/>
-<contactref element="C6" pad="1"/>
+<contactref element="C4" pad="1"/>
+<contactref element="C3" pad="1"/>
 <contactref element="U$31" pad="PAD"/>
 <wire x1="13.25" y1="8.242" x2="13.25" y2="7.25" width="0.4" layer="1"/>
 <wire x1="13.25" y1="7.25" x2="13.75" y2="7.25" width="0.4" layer="1"/>
@@ -2289,18 +2289,18 @@ Covered vias can be set in Masks (Limit).
 <wire x1="3.75" y1="7.25" x2="3.75" y2="7.1778" width="0.8" layer="1"/>
 </signal>
 <signal name="N$1">
-<contactref element="R11" pad="2"/>
-<contactref element="U$1" pad="1"/>
-<contactref element="C4" pad="2"/>
+<contactref element="R1" pad="2"/>
+<contactref element="U1" pad="1"/>
+<contactref element="C5" pad="2"/>
 <wire x1="15.5" y1="16.742" x2="16.484" y2="16.742" width="0.4" layer="1"/>
 <wire x1="16.484" y1="16.742" x2="16.742" y2="17" width="0.4" layer="1"/>
 <wire x1="15.5" y1="16.742" x2="15.5" y2="15.975" width="0.2" layer="1"/>
 <wire x1="15.5" y1="15.975" x2="15.7" y2="15.975" width="0.2" layer="1"/>
 </signal>
 <signal name="TH">
-<contactref element="R6" pad="2"/>
-<contactref element="R5" pad="1"/>
-<contactref element="U$51" pad="P$8"/>
+<contactref element="R10" pad="2"/>
+<contactref element="R11" pad="1"/>
+<contactref element="U3" pad="P$8"/>
 <wire x1="32.475" y1="11" x2="32.475" y2="11.725" width="0.2" layer="1"/>
 <wire x1="28.008" y1="14.25" x2="28.75" y2="14.25" width="0.4" layer="1"/>
 <wire x1="28.75" y1="14.25" x2="29" y2="14" width="0.4" layer="1"/>
@@ -2314,8 +2314,8 @@ Covered vias can be set in Masks (Limit).
 <wire x1="29.875" y1="12.625" x2="29.875" y2="13.375" width="0.2" layer="16"/>
 </signal>
 <signal name="VREF">
-<contactref element="R6" pad="1"/>
-<contactref element="U$51" pad="P$12"/>
+<contactref element="R10" pad="1"/>
+<contactref element="U3" pad="P$12"/>
 <contactref element="C9" pad="2"/>
 <wire x1="28.008" y1="12.5" x2="29.75" y2="12.5" width="0.2" layer="1"/>
 <wire x1="29.75" y1="12.5" x2="30.25" y2="12" width="0.2" layer="1"/>
@@ -2324,30 +2324,30 @@ Covered vias can be set in Masks (Limit).
 <wire x1="28.008" y1="13.234" x2="28.008" y2="12.5" width="0.4" layer="1"/>
 </signal>
 <signal name="RPRG">
-<contactref element="U$51" pad="P$15"/>
-<contactref element="R7" pad="2"/>
+<contactref element="U3" pad="P$15"/>
+<contactref element="R12" pad="2"/>
 <wire x1="29.525" y1="10" x2="28.008" y2="10" width="0.2" layer="1"/>
 </signal>
 <signal name="VPRE">
-<contactref element="U$51" pad="P$14"/>
+<contactref element="U3" pad="P$14"/>
 </signal>
 <signal name="IPRE">
-<contactref element="U$51" pad="P$16"/>
+<contactref element="U3" pad="P$16"/>
 </signal>
 <signal name="N$3">
-<contactref element="U$51" pad="P$5"/>
-<contactref element="C10" pad="1"/>
+<contactref element="U3" pad="P$5"/>
+<contactref element="C13" pad="1"/>
 <wire x1="32.475" y1="9.5" x2="33.992" y2="9.5" width="0.2" layer="1"/>
 </signal>
 <signal name="REND">
-<contactref element="U$51" pad="P$13"/>
-<contactref element="R8" pad="2"/>
+<contactref element="U3" pad="P$13"/>
+<contactref element="R13" pad="2"/>
 <wire x1="29.525" y1="11" x2="28.008" y2="11" width="0.2" layer="1"/>
 </signal>
 <signal name="SD">
-<contactref element="U$51" pad="P$7"/>
+<contactref element="U3" pad="P$7"/>
 <contactref element="JP6" pad="2"/>
-<contactref element="R12" pad="2"/>
+<contactref element="R9" pad="2"/>
 <wire x1="32.475" y1="10.5" x2="33.5" y2="10.5" width="0.2" layer="1"/>
 <wire x1="33.5" y1="10.5" x2="33.992" y2="10.5" width="0.2" layer="1"/>
 <via x="33.5" y="10.5" extent="1-16" drill="0.3"/>
@@ -2355,10 +2355,10 @@ Covered vias can be set in Masks (Limit).
 <wire x1="33.5" y1="8.9678" x2="33.5" y2="10.5" width="0.4" layer="16"/>
 </signal>
 <signal name="SPV_VCTRL1">
-<contactref element="C1" pad="1"/>
-<contactref element="R1" pad="2"/>
-<contactref element="R2" pad="1"/>
-<contactref element="U$1" pad="5"/>
+<contactref element="C7" pad="1"/>
+<contactref element="R7" pad="2"/>
+<contactref element="R5" pad="1"/>
+<contactref element="U1" pad="5"/>
 <wire x1="23.25" y1="14.242" x2="24.25" y2="14.242" width="0.4" layer="1"/>
 <wire x1="23.242" y1="13.25" x2="23.242" y2="14.234" width="0.4" layer="1"/>
 <wire x1="23.242" y1="14.234" x2="23.25" y2="14.242" width="0.4" layer="1"/>
@@ -2367,29 +2367,29 @@ Covered vias can be set in Masks (Limit).
 </signal>
 <signal name="ST1">
 <contactref element="D1" pad="C"/>
-<contactref element="U$51" pad="P$4"/>
+<contactref element="U3" pad="P$4"/>
 <wire x1="31.75" y1="8.775" x2="31.75" y2="8.5" width="0.2" layer="1"/>
 <wire x1="31.75" y1="8.5" x2="33" y2="7.25" width="0.2" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="D1" pad="A"/>
-<contactref element="R13" pad="1"/>
+<contactref element="R3" pad="1"/>
 <wire x1="33" y1="5.75" x2="33" y2="4.758" width="0.4" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="D2" pad="A"/>
-<contactref element="R14" pad="1"/>
+<contactref element="R4" pad="1"/>
 <wire x1="31.5" y1="5.75" x2="31.5" y2="4.758" width="0.4" layer="1"/>
 </signal>
 <signal name="ST2">
-<contactref element="U$51" pad="P$3"/>
+<contactref element="U3" pad="P$3"/>
 <contactref element="D2" pad="C"/>
 <wire x1="31.25" y1="8.775" x2="31.25" y2="7.5" width="0.2" layer="1"/>
 <wire x1="31.25" y1="7.5" x2="31.5" y2="7.25" width="0.2" layer="1"/>
 </signal>
 <signal name="N$2">
-<contactref element="U$63" pad="3"/>
-<contactref element="C16" pad="1"/>
+<contactref element="U6" pad="3"/>
+<contactref element="C14" pad="1"/>
 <wire x1="43.95" y1="4.85" x2="43.992" y2="4.85" width="0.2" layer="1"/>
 <wire x1="43.992" y1="4.85" x2="43.992" y2="4" width="0.2" layer="1"/>
 </signal>
diff --git a/breakout-hardware/bristol_longshot.brd.pdf b/breakout-hardware/bristol_longshot.brd.pdf
new file mode 100644
index 0000000..66fab0d
Binary files /dev/null and b/breakout-hardware/bristol_longshot.brd.pdf differ
diff --git a/breakout-hardware/bristol_longshot.sch b/breakout-hardware/bristol_longshot.sch
index 8906378..4cc613c 100644
--- a/breakout-hardware/bristol_longshot.sch
+++ b/breakout-hardware/bristol_longshot.sch
@@ -7936,30 +7936,30 @@ Metric Code Size 5664</description>
 </classes>
 <parts>
 <part name="FRAME3" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
-<part name="U$38" library="spv1040" deviceset="SPV1040" device=""/>
-<part name="U$51" library="l6924d" deviceset="L6924D" device=""/>
-<part name="R3" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="820kΩ"/>
-<part name="R4" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="2M2Ω"/>
+<part name="U2" library="spv1040" deviceset="SPV1040" device=""/>
+<part name="U3" library="l6924d" deviceset="L6924D" device=""/>
+<part name="R8" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="820kΩ"/>
+<part name="R6" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="2M2Ω"/>
 <part name="U$54" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$59" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C20" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="C8" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="U$60" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="U$61" library="TPS62243" deviceset="TPS62243" device=""/>
-<part name="U$62" library="TPS62243" deviceset="TPS62243" device=""/>
-<part name="U$63" library="TPS3808" deviceset="TPS3808" device=""/>
-<part name="U3" library="74LVC1G04GW_inverter" deviceset="74LVC1G04GW" device=""/>
-<part name="U$64" library="BAT760" deviceset="BAT760" device=""/>
-<part name="U$65" library="BAT760" deviceset="BAT760" device=""/>
-<part name="L8" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
-<part name="C22" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="U5" library="TPS62243" deviceset="TPS62243" device=""/>
+<part name="U4" library="TPS62243" deviceset="TPS62243" device=""/>
+<part name="U6" library="TPS3808" deviceset="TPS3808" device=""/>
+<part name="U7" library="74LVC1G04GW_inverter" deviceset="74LVC1G04GW" device=""/>
+<part name="D3" library="BAT760" deviceset="BAT760" device=""/>
+<part name="D4" library="BAT760" deviceset="BAT760" device=""/>
+<part name="L4" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
+<part name="C18" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
 <part name="D2" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
 <part name="U$66" library="microbuilder_v3" deviceset="1.8V" device=""/>
-<part name="U$1" library="spv1040" deviceset="SPV1040" device=""/>
-<part name="R1" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="820kΩ"/>
-<part name="R2" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="2M2Ω"/>
+<part name="U1" library="spv1040" deviceset="SPV1040" device=""/>
+<part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="820kΩ"/>
+<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="2M2Ω"/>
 <part name="U$2" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$3" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C1" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="C7" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="U$4" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
 <part name="U$5" library="microbuilder_v3" deviceset="GND" device=""/>
@@ -7970,17 +7970,17 @@ Metric Code Size 5664</description>
 <part name="U$10" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$11" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$12" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="L1" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
-<part name="R9" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
-<part name="L2" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
 <part name="L3" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
+<part name="R14" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
+<part name="L1" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
+<part name="L2" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
 <part name="JP1" library="SparkFun" deviceset="M02" device="LOCK"/>
-<part name="R10" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
-<part name="C3" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="R2" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
+<part name="C6" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="U$13" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$14" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C4" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
-<part name="R11" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
+<part name="C5" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="R1" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
 <part name="JP2" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="JP3" library="SparkFun" deviceset="M02" device="3.5MM_LOCK" value="PV1"/>
 <part name="JP4" library="SparkFun" deviceset="M02" device="3.5MM_LOCK" value="PV2"/>
@@ -7989,31 +7989,31 @@ Metric Code Size 5664</description>
 <part name="FRAME2" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
 <part name="JP5" library="SparkFun" deviceset="M02" device="3.5MM_LOCK"/>
 <part name="JP6" library="SparkFun" deviceset="M02" device="LOCK" value="Shutdown"/>
+<part name="C1" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="C2" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
-<part name="C5" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$17" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$18" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C6" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
-<part name="C7" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C3" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C4" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$19" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$20" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$21" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C8" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C12" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$22" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="47kΩ"/>
-<part name="R6" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
+<part name="R11" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="47kΩ"/>
+<part name="R10" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
 <part name="U$23" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="C9" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="U$24" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="47kΩ"/>
+<part name="R12" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="47kΩ"/>
 <part name="U$25" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C10" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="47nF"/>
+<part name="C13" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="47nF"/>
 <part name="U$26" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$27" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R8" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
+<part name="R13" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
 <part name="U$28" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$29" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R12" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
+<part name="R9" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
 <part name="U$30" library="Harwin-Test-Point" deviceset="S1751-46R" device=""/>
 <part name="U$31" library="Harwin-Test-Point" deviceset="S1751-46R" device=""/>
 <part name="U$33" library="Harwin-Test-Point" deviceset="S1751-46R" device=""/>
@@ -8029,22 +8029,22 @@ Metric Code Size 5664</description>
 <part name="U$46" library="Harwin-Test-Point" deviceset="S1751-46R" device=""/>
 <part name="U$47" library="Harwin-Test-Point" deviceset="S1751-46R" device=""/>
 <part name="D1" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
-<part name="R13" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
-<part name="R14" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
-<part name="C12" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
-<part name="C13" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="R3" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
+<part name="R4" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
+<part name="C16" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C15" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$48" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$49" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$50" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C14" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="C10" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="JTAG1" library="microbuilder_v3" deviceset="JTAG-CORTEXM3" device="SMT"/>
 <part name="U$32" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$35" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP7" library="SparkFun" deviceset="M04" device="LOCK"/>
 <part name="U$36" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C15" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="C17" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
 <part name="U$37" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C16" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="DNP"/>
+<part name="C14" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="DNP"/>
 <part name="U$52" library="microbuilder_v3" deviceset="GND" device=""/>
 </parts>
 <sheets>
@@ -8080,30 +8080,30 @@ to 3h for Rprg = 47kΩ</text>
 <instances>
 <instance part="FRAME3" gate="G$1" x="0" y="0"/>
 <instance part="FRAME3" gate="G$2" x="144.78" y="0"/>
-<instance part="U$38" gate="G$1" x="124.46" y="71.12"/>
-<instance part="U$51" gate="G$1" x="375.92" y="116.84"/>
-<instance part="R3" gate="G$1" x="172.72" y="58.42" rot="R90"/>
-<instance part="R4" gate="G$1" x="172.72" y="68.58" rot="R90"/>
+<instance part="U2" gate="G$1" x="124.46" y="71.12"/>
+<instance part="U3" gate="G$1" x="375.92" y="116.84"/>
+<instance part="R8" gate="G$1" x="172.72" y="58.42" rot="R90"/>
+<instance part="R6" gate="G$1" x="172.72" y="68.58" rot="R90"/>
 <instance part="U$54" gate="G$1" x="93.98" y="73.66" rot="R270"/>
 <instance part="U$59" gate="G$1" x="172.72" y="50.8"/>
-<instance part="C20" gate="G$1" x="162.56" y="55.88"/>
+<instance part="C8" gate="G$1" x="162.56" y="55.88"/>
 <instance part="U$60" gate="G$1" x="162.56" y="50.8"/>
-<instance part="U$61" gate="G$1" x="703.58" y="93.98"/>
-<instance part="U$62" gate="G$1" x="703.58" y="124.46"/>
-<instance part="U$63" gate="G$1" x="538.48" y="101.6"/>
-<instance part="U3" gate="A" x="589.28" y="99.06"/>
-<instance part="U$64" gate="G$1" x="538.48" y="134.62"/>
-<instance part="U$65" gate="G$1" x="538.48" y="124.46"/>
-<instance part="L8" gate="G$1" x="726.44" y="101.6" rot="R90"/>
-<instance part="C22" gate="G$1" x="739.14" y="88.9"/>
+<instance part="U5" gate="G$1" x="703.58" y="93.98"/>
+<instance part="U4" gate="G$1" x="703.58" y="124.46"/>
+<instance part="U6" gate="G$1" x="538.48" y="101.6"/>
+<instance part="U7" gate="A" x="589.28" y="99.06"/>
+<instance part="D3" gate="G$1" x="538.48" y="134.62"/>
+<instance part="D4" gate="G$1" x="538.48" y="124.46"/>
+<instance part="L4" gate="G$1" x="726.44" y="101.6" rot="R90"/>
+<instance part="C18" gate="G$1" x="739.14" y="88.9"/>
 <instance part="D2" gate="G$1" x="340.36" y="142.24"/>
 <instance part="U$66" gate="G$1" x="739.14" y="144.78" rot="MR0"/>
-<instance part="U$1" gate="G$1" x="124.46" y="127"/>
-<instance part="R1" gate="G$1" x="172.72" y="114.3" rot="R90"/>
-<instance part="R2" gate="G$1" x="172.72" y="124.46" rot="R90"/>
+<instance part="U1" gate="G$1" x="124.46" y="127"/>
+<instance part="R7" gate="G$1" x="172.72" y="114.3" rot="R90"/>
+<instance part="R5" gate="G$1" x="172.72" y="124.46" rot="R90"/>
 <instance part="U$2" gate="G$1" x="93.98" y="129.54" rot="R270"/>
 <instance part="U$3" gate="G$1" x="172.72" y="106.68"/>
-<instance part="C1" gate="G$1" x="162.56" y="111.76"/>
+<instance part="C7" gate="G$1" x="162.56" y="111.76"/>
 <instance part="U$4" gate="G$1" x="162.56" y="106.68"/>
 <instance part="FRAME1" gate="G$1" x="505.46" y="0"/>
 <instance part="FRAME1" gate="G$2" x="650.24" y="0"/>
@@ -8115,17 +8115,17 @@ to 3h for Rprg = 47kΩ</text>
 <instance part="U$10" gate="G$1" x="688.34" y="109.22"/>
 <instance part="U$11" gate="G$1" x="688.34" y="78.74"/>
 <instance part="U$12" gate="G$1" x="739.14" y="78.74"/>
-<instance part="L1" gate="G$1" x="726.44" y="132.08" rot="R90"/>
-<instance part="R9" gate="G$1" x="609.6" y="114.3" rot="R90"/>
-<instance part="L2" gate="G$1" x="83.82" y="124.46" rot="R90"/>
-<instance part="L3" gate="G$1" x="83.82" y="68.58" rot="R90"/>
+<instance part="L3" gate="G$1" x="726.44" y="132.08" rot="R90"/>
+<instance part="R14" gate="G$1" x="609.6" y="114.3" rot="R90"/>
+<instance part="L1" gate="G$1" x="83.82" y="124.46" rot="R90"/>
+<instance part="L2" gate="G$1" x="83.82" y="68.58" rot="R90"/>
 <instance part="JP1" gate="G$1" x="93.98" y="48.26" rot="R90"/>
-<instance part="R10" gate="G$1" x="76.2" y="78.74"/>
-<instance part="C3" gate="G$1" x="88.9" y="83.82" rot="R270"/>
+<instance part="R2" gate="G$1" x="76.2" y="78.74"/>
+<instance part="C6" gate="G$1" x="88.9" y="83.82" rot="R270"/>
 <instance part="U$13" gate="G$1" x="99.06" y="83.82" rot="R90"/>
 <instance part="U$14" gate="G$1" x="99.06" y="139.7" rot="R90"/>
-<instance part="C4" gate="G$1" x="88.9" y="139.7" rot="R270"/>
-<instance part="R11" gate="G$1" x="76.2" y="134.62"/>
+<instance part="C5" gate="G$1" x="88.9" y="139.7" rot="R270"/>
+<instance part="R1" gate="G$1" x="76.2" y="134.62"/>
 <instance part="JP2" gate="G$1" x="93.98" y="104.14" rot="R90"/>
 <instance part="JP3" gate="G$1" x="22.86" y="124.46" rot="MR180"/>
 <instance part="JP4" gate="G$1" x="22.86" y="68.58" rot="MR180"/>
@@ -8135,31 +8135,31 @@ to 3h for Rprg = 47kΩ</text>
 <instance part="FRAME2" gate="G$2" x="396.24" y="0"/>
 <instance part="JP5" gate="G$1" x="467.36" y="124.46" rot="R180"/>
 <instance part="JP6" gate="G$1" x="325.12" y="111.76" rot="MR180"/>
-<instance part="C2" gate="G$1" x="40.64" y="114.3"/>
-<instance part="C5" gate="G$1" x="50.8" y="114.3"/>
+<instance part="C1" gate="G$1" x="40.64" y="114.3"/>
+<instance part="C2" gate="G$1" x="50.8" y="114.3"/>
 <instance part="U$17" gate="G$1" x="40.64" y="106.68"/>
 <instance part="U$18" gate="G$1" x="50.8" y="106.68"/>
-<instance part="C6" gate="G$1" x="40.64" y="58.42"/>
-<instance part="C7" gate="G$1" x="50.8" y="58.42"/>
+<instance part="C3" gate="G$1" x="40.64" y="58.42"/>
+<instance part="C4" gate="G$1" x="50.8" y="58.42"/>
 <instance part="U$19" gate="G$1" x="40.64" y="50.8"/>
 <instance part="U$20" gate="G$1" x="50.8" y="50.8"/>
 <instance part="U$21" gate="G$1" x="454.66" y="96.52"/>
-<instance part="C8" gate="G$1" x="444.5" y="104.14"/>
+<instance part="C12" gate="G$1" x="444.5" y="104.14"/>
 <instance part="U$22" gate="G$1" x="444.5" y="96.52"/>
-<instance part="R5" gate="G$1" x="391.16" y="137.16"/>
-<instance part="R6" gate="G$1" x="375.92" y="137.16"/>
+<instance part="R11" gate="G$1" x="391.16" y="137.16"/>
+<instance part="R10" gate="G$1" x="375.92" y="137.16"/>
 <instance part="U$23" gate="G$1" x="401.32" y="132.08"/>
 <instance part="C9" gate="G$1" x="360.68" y="137.16" rot="R90"/>
 <instance part="U$24" gate="G$1" x="350.52" y="132.08"/>
-<instance part="R7" gate="G$1" x="429.26" y="106.68" rot="R90"/>
+<instance part="R12" gate="G$1" x="429.26" y="106.68" rot="R90"/>
 <instance part="U$25" gate="G$1" x="429.26" y="96.52"/>
-<instance part="C10" gate="G$1" x="312.42" y="104.14"/>
+<instance part="C13" gate="G$1" x="312.42" y="104.14"/>
 <instance part="U$26" gate="G$1" x="312.42" y="91.44"/>
 <instance part="U$27" gate="G$1" x="386.08" y="96.52"/>
-<instance part="R8" gate="G$1" x="436.88" y="106.68" rot="R90"/>
+<instance part="R13" gate="G$1" x="436.88" y="106.68" rot="R90"/>
 <instance part="U$28" gate="G$1" x="436.88" y="96.52"/>
 <instance part="U$29" gate="G$1" x="337.82" y="91.44"/>
-<instance part="R12" gate="G$1" x="337.82" y="101.6" rot="R90"/>
+<instance part="R9" gate="G$1" x="337.82" y="101.6" rot="R90"/>
 <instance part="U$30" gate="G$1" x="40.64" y="124.46" rot="R90"/>
 <instance part="U$31" gate="G$1" x="40.64" y="68.58" rot="R90"/>
 <instance part="U$33" gate="G$1" x="91.44" y="124.46" rot="R270"/>
@@ -8175,22 +8175,22 @@ to 3h for Rprg = 47kΩ</text>
 <instance part="U$46" gate="G$1" x="718.82" y="101.6" rot="R90"/>
 <instance part="U$47" gate="G$1" x="609.6" y="124.46"/>
 <instance part="D1" gate="G$1" x="330.2" y="142.24"/>
-<instance part="R13" gate="G$1" x="330.2" y="152.4" rot="R90"/>
-<instance part="R14" gate="G$1" x="340.36" y="152.4" rot="R90"/>
-<instance part="C12" gate="G$1" x="678.18" y="86.36"/>
-<instance part="C13" gate="G$1" x="678.18" y="116.84"/>
+<instance part="R3" gate="G$1" x="330.2" y="152.4" rot="R90"/>
+<instance part="R4" gate="G$1" x="340.36" y="152.4" rot="R90"/>
+<instance part="C16" gate="G$1" x="678.18" y="86.36"/>
+<instance part="C15" gate="G$1" x="678.18" y="116.84"/>
 <instance part="U$48" gate="G$1" x="678.18" y="78.74"/>
 <instance part="U$49" gate="G$1" x="678.18" y="109.22"/>
 <instance part="U$50" gate="G$1" x="556.26" y="106.68"/>
-<instance part="C14" gate="G$1" x="556.26" y="114.3"/>
+<instance part="C10" gate="G$1" x="556.26" y="114.3"/>
 <instance part="JTAG1" gate="G$1" x="703.58" y="50.8" rot="MR0"/>
 <instance part="U$32" gate="G$1" x="716.28" y="68.58" rot="MR0"/>
 <instance part="U$35" gate="G$1" x="716.28" y="40.64"/>
 <instance part="JP7" gate="G$1" x="662.94" y="55.88"/>
 <instance part="U$36" gate="G$1" x="670.56" y="40.64"/>
-<instance part="C15" gate="G$1" x="728.98" y="88.9"/>
+<instance part="C17" gate="G$1" x="728.98" y="88.9"/>
 <instance part="U$37" gate="G$1" x="728.98" y="78.74"/>
-<instance part="C16" gate="G$1" x="518.16" y="83.82"/>
+<instance part="C14" gate="G$1" x="518.16" y="83.82"/>
 <instance part="U$52" gate="G$1" x="518.16" y="78.74"/>
 </instances>
 <busses>
@@ -8198,48 +8198,48 @@ to 3h for Rprg = 47kΩ</text>
 <nets>
 <net name="GND" class="0">
 <segment>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R8" gate="G$1" pin="1"/>
 <pinref part="U$59" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C20" gate="G$1" pin="P$2"/>
+<pinref part="C8" gate="G$1" pin="P$2"/>
 <pinref part="U$60" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U$54" gate="G$1" pin="GND"/>
-<pinref part="U$38" gate="G$1" pin="GND"/>
+<pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="96.52" y1="73.66" x2="99.06" y2="73.66" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R1" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="1"/>
 <pinref part="U$3" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C1" gate="G$1" pin="P$2"/>
+<pinref part="C7" gate="G$1" pin="P$2"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="GND"/>
-<pinref part="U$1" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="GND"/>
 <wire x1="96.52" y1="129.54" x2="99.06" y2="129.54" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$51" gate="G$1" pin="GND"/>
+<pinref part="U3" gate="G$1" pin="GND"/>
 <pinref part="U$5" gate="G$1" pin="GND"/>
 <wire x1="370.84" y1="99.06" x2="370.84" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$51" gate="G$1" pin="GND2"/>
+<pinref part="U3" gate="G$1" pin="GND2"/>
 <pinref part="U$6" gate="G$1" pin="GND"/>
 <wire x1="373.38" y1="99.06" x2="373.38" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$63" gate="G$1" pin="GND"/>
+<pinref part="U6" gate="G$1" pin="GND"/>
 <pinref part="U$7" gate="G$1" pin="GND"/>
 <wire x1="538.48" y1="81.28" x2="538.48" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$63" gate="G$1" pin="GND2"/>
+<pinref part="U6" gate="G$1" pin="GND2"/>
 <pinref part="U$8" gate="G$1" pin="GND"/>
 <wire x1="541.02" y1="81.28" x2="541.02" y2="83.82" width="0.1524" layer="91"/>
 </segment>
@@ -8247,48 +8247,48 @@ to 3h for Rprg = 47kΩ</text>
 <pinref part="U$9" gate="G$1" pin="GND"/>
 <wire x1="571.5" y1="88.9" x2="566.42" y2="88.9" width="0.1524" layer="91"/>
 <wire x1="566.42" y1="88.9" x2="566.42" y2="81.28" width="0.1524" layer="91"/>
-<pinref part="U3" gate="A" pin="GND"/>
+<pinref part="U7" gate="A" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U$62" gate="G$1" pin="GND"/>
+<pinref part="U4" gate="G$1" pin="GND"/>
 <pinref part="U$10" gate="G$1" pin="GND"/>
 <wire x1="690.88" y1="119.38" x2="688.34" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="688.34" y1="119.38" x2="688.34" y2="116.84" width="0.1524" layer="91"/>
-<pinref part="U$62" gate="G$1" pin="GND2"/>
+<pinref part="U4" gate="G$1" pin="GND2"/>
 <wire x1="688.34" y1="116.84" x2="688.34" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="690.88" y1="116.84" x2="688.34" y2="116.84" width="0.1524" layer="91"/>
 <junction x="688.34" y="116.84"/>
-<pinref part="U$62" gate="G$1" pin="MODE"/>
+<pinref part="U4" gate="G$1" pin="MODE"/>
 <wire x1="690.88" y1="124.46" x2="688.34" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="688.34" y1="124.46" x2="688.34" y2="119.38" width="0.1524" layer="91"/>
 <junction x="688.34" y="119.38"/>
 </segment>
 <segment>
-<pinref part="U$61" gate="G$1" pin="GND"/>
+<pinref part="U5" gate="G$1" pin="GND"/>
 <pinref part="U$11" gate="G$1" pin="GND"/>
 <wire x1="690.88" y1="88.9" x2="688.34" y2="88.9" width="0.1524" layer="91"/>
 <wire x1="688.34" y1="88.9" x2="688.34" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="U$61" gate="G$1" pin="GND2"/>
+<pinref part="U5" gate="G$1" pin="GND2"/>
 <wire x1="688.34" y1="86.36" x2="688.34" y2="81.28" width="0.1524" layer="91"/>
 <wire x1="690.88" y1="86.36" x2="688.34" y2="86.36" width="0.1524" layer="91"/>
 <junction x="688.34" y="86.36"/>
-<pinref part="U$61" gate="G$1" pin="MODE"/>
+<pinref part="U5" gate="G$1" pin="MODE"/>
 <wire x1="690.88" y1="93.98" x2="688.34" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="688.34" y1="93.98" x2="688.34" y2="88.9" width="0.1524" layer="91"/>
 <junction x="688.34" y="88.9"/>
 </segment>
 <segment>
-<pinref part="C22" gate="G$1" pin="2"/>
+<pinref part="C18" gate="G$1" pin="2"/>
 <pinref part="U$12" gate="G$1" pin="GND"/>
 <wire x1="739.14" y1="83.82" x2="739.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C3" gate="G$1" pin="P$1"/>
+<pinref part="C6" gate="G$1" pin="P$1"/>
 <pinref part="U$13" gate="G$1" pin="GND"/>
 <wire x1="96.52" y1="83.82" x2="93.98" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="P$1"/>
+<pinref part="C5" gate="G$1" pin="P$1"/>
 <pinref part="U$14" gate="G$1" pin="GND"/>
 <wire x1="93.98" y1="139.7" x2="96.52" y2="139.7" width="0.1524" layer="91"/>
 </segment>
@@ -8306,22 +8306,22 @@ to 3h for Rprg = 47kΩ</text>
 </segment>
 <segment>
 <pinref part="U$17" gate="G$1" pin="GND"/>
-<pinref part="C2" gate="G$1" pin="P$2"/>
+<pinref part="C1" gate="G$1" pin="P$2"/>
 <wire x1="40.64" y1="109.22" x2="40.64" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$18" gate="G$1" pin="GND"/>
-<pinref part="C5" gate="G$1" pin="P$2"/>
+<pinref part="C2" gate="G$1" pin="P$2"/>
 <wire x1="50.8" y1="109.22" x2="50.8" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$19" gate="G$1" pin="GND"/>
-<pinref part="C6" gate="G$1" pin="P$2"/>
+<pinref part="C3" gate="G$1" pin="P$2"/>
 <wire x1="40.64" y1="53.34" x2="40.64" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$20" gate="G$1" pin="GND"/>
-<pinref part="C7" gate="G$1" pin="P$2"/>
+<pinref part="C4" gate="G$1" pin="P$2"/>
 <wire x1="50.8" y1="53.34" x2="50.8" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 <segment>
@@ -8332,11 +8332,11 @@ to 3h for Rprg = 47kΩ</text>
 </segment>
 <segment>
 <pinref part="U$22" gate="G$1" pin="GND"/>
-<pinref part="C8" gate="G$1" pin="P$2"/>
+<pinref part="C12" gate="G$1" pin="P$2"/>
 <wire x1="444.5" y1="99.06" x2="444.5" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R5" gate="G$1" pin="2"/>
+<pinref part="R11" gate="G$1" pin="2"/>
 <pinref part="U$23" gate="G$1" pin="GND"/>
 <wire x1="396.24" y1="137.16" x2="401.32" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="401.32" y1="137.16" x2="401.32" y2="134.62" width="0.1524" layer="91"/>
@@ -8348,28 +8348,28 @@ to 3h for Rprg = 47kΩ</text>
 <wire x1="350.52" y1="137.16" x2="355.6" y2="137.16" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R12" gate="G$1" pin="1"/>
 <pinref part="U$25" gate="G$1" pin="GND"/>
 <wire x1="429.26" y1="101.6" x2="429.26" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C10" gate="G$1" pin="P$2"/>
+<pinref part="C13" gate="G$1" pin="P$2"/>
 <pinref part="U$26" gate="G$1" pin="GND"/>
 <wire x1="312.42" y1="101.6" x2="312.42" y2="93.98" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$51" gate="G$1" pin="VOPRG"/>
+<pinref part="U3" gate="G$1" pin="VOPRG"/>
 <pinref part="U$27" gate="G$1" pin="GND"/>
 <wire x1="386.08" y1="101.6" x2="386.08" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$28" gate="G$1" pin="GND"/>
-<pinref part="R8" gate="G$1" pin="1"/>
+<pinref part="R13" gate="G$1" pin="1"/>
 <wire x1="436.88" y1="99.06" x2="436.88" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$29" gate="G$1" pin="GND"/>
-<pinref part="R12" gate="G$1" pin="1"/>
+<pinref part="R9" gate="G$1" pin="1"/>
 <wire x1="337.82" y1="93.98" x2="337.82" y2="96.52" width="0.1524" layer="91"/>
 </segment>
 <segment>
@@ -8378,18 +8378,18 @@ to 3h for Rprg = 47kΩ</text>
 <wire x1="299.72" y1="93.98" x2="299.72" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C13" gate="G$1" pin="P$2"/>
+<pinref part="C15" gate="G$1" pin="P$2"/>
 <pinref part="U$49" gate="G$1" pin="GND"/>
 <wire x1="678.18" y1="114.3" x2="678.18" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C12" gate="G$1" pin="P$2"/>
+<pinref part="C16" gate="G$1" pin="P$2"/>
 <pinref part="U$48" gate="G$1" pin="GND"/>
 <wire x1="678.18" y1="83.82" x2="678.18" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$50" gate="G$1" pin="GND"/>
-<pinref part="C14" gate="G$1" pin="P$2"/>
+<pinref part="C10" gate="G$1" pin="P$2"/>
 <wire x1="556.26" y1="111.76" x2="556.26" y2="109.22" width="0.1524" layer="91"/>
 </segment>
 <segment>
@@ -8421,23 +8421,23 @@ to 3h for Rprg = 47kΩ</text>
 <junction x="670.56" y="53.34"/>
 </segment>
 <segment>
-<pinref part="C15" gate="G$1" pin="2"/>
+<pinref part="C17" gate="G$1" pin="2"/>
 <pinref part="U$37" gate="G$1" pin="GND"/>
 <wire x1="728.98" y1="83.82" x2="728.98" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C16" gate="G$1" pin="P$2"/>
+<pinref part="C14" gate="G$1" pin="P$2"/>
 <pinref part="U$52" gate="G$1" pin="GND"/>
 </segment>
 </net>
 <net name="SPV_VCTRL2" class="0">
 <segment>
-<pinref part="C20" gate="G$1" pin="P$1"/>
+<pinref part="C8" gate="G$1" pin="P$1"/>
 <wire x1="162.56" y1="63.5" x2="162.56" y2="60.96" width="0.1524" layer="91"/>
-<pinref part="R3" gate="G$1" pin="2"/>
-<pinref part="R4" gate="G$1" pin="1"/>
+<pinref part="R8" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="63.5" x2="172.72" y2="63.5" width="0.1524" layer="91"/>
-<pinref part="U$38" gate="G$1" pin="VCTRL"/>
+<pinref part="U2" gate="G$1" pin="VCTRL"/>
 <wire x1="149.86" y1="63.5" x2="162.56" y2="63.5" width="0.1524" layer="91"/>
 <junction x="162.56" y="63.5"/>
 <junction x="172.72" y="63.5"/>
@@ -8446,34 +8446,34 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="SUPERVISOR_VCC" class="0">
 <segment>
-<pinref part="U$64" gate="G$1" pin="C"/>
-<pinref part="U$63" gate="G$1" pin="VDD"/>
+<pinref part="D3" gate="G$1" pin="C"/>
+<pinref part="U6" gate="G$1" pin="VDD"/>
 <wire x1="541.02" y1="134.62" x2="543.56" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="543.56" y1="134.62" x2="543.56" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="U$65" gate="G$1" pin="C"/>
+<pinref part="D4" gate="G$1" pin="C"/>
 <wire x1="543.56" y1="124.46" x2="543.56" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="541.02" y1="124.46" x2="543.56" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="U3" gate="A" pin="VCC"/>
+<pinref part="U7" gate="A" pin="VCC"/>
 <wire x1="571.5" y1="104.14" x2="566.42" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="566.42" y1="104.14" x2="566.42" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="566.42" y1="124.46" x2="556.26" y2="124.46" width="0.1524" layer="91"/>
 <junction x="543.56" y="124.46"/>
 <label x="546.1" y="124.46" size="1.778" layer="95"/>
-<pinref part="R9" gate="G$1" pin="2"/>
+<pinref part="R14" gate="G$1" pin="2"/>
 <wire x1="556.26" y1="124.46" x2="543.56" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="566.42" y1="124.46" x2="609.6" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="609.6" y1="124.46" x2="609.6" y2="119.38" width="0.1524" layer="91"/>
 <junction x="566.42" y="124.46"/>
 <pinref part="U$47" gate="G$1" pin="1"/>
 <junction x="609.6" y="124.46"/>
-<pinref part="C14" gate="G$1" pin="P$1"/>
+<pinref part="C10" gate="G$1" pin="P$1"/>
 <wire x1="556.26" y1="119.38" x2="556.26" y2="124.46" width="0.1524" layer="91"/>
 <junction x="556.26" y="124.46"/>
 </segment>
 </net>
 <net name="BATTERY_EN" class="0">
 <segment>
-<pinref part="U$61" gate="G$1" pin="EN"/>
+<pinref part="U5" gate="G$1" pin="EN"/>
 <wire x1="690.88" y1="99.06" x2="673.1" y2="99.06" width="0.1524" layer="91"/>
 <label x="673.1" y="99.06" size="1.778" layer="95"/>
 <pinref part="U$44" gate="G$1" pin="1"/>
@@ -8481,10 +8481,10 @@ to 3h for Rprg = 47kΩ</text>
 <junction x="673.1" y="99.06"/>
 </segment>
 <segment>
-<pinref part="U3" gate="A" pin="Y"/>
+<pinref part="U7" gate="A" pin="Y"/>
 <wire x1="607.06" y1="104.14" x2="609.6" y2="104.14" width="0.1524" layer="91"/>
 <label x="614.68" y="104.14" size="1.778" layer="95"/>
-<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="R14" gate="G$1" pin="1"/>
 <wire x1="609.6" y1="104.14" x2="632.46" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="609.6" y1="104.14" x2="609.6" y2="109.22" width="0.1524" layer="91"/>
 <junction x="609.6" y="104.14"/>
@@ -8492,17 +8492,17 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="TANK" class="0">
 <segment>
-<pinref part="U$62" gate="G$1" pin="VIN"/>
+<pinref part="U4" gate="G$1" pin="VIN"/>
 <wire x1="690.88" y1="132.08" x2="678.18" y2="132.08" width="0.1524" layer="91"/>
 <label x="673.1" y="132.08" size="1.778" layer="95"/>
-<pinref part="C13" gate="G$1" pin="P$1"/>
+<pinref part="C15" gate="G$1" pin="P$1"/>
 <wire x1="678.18" y1="132.08" x2="670.56" y2="132.08" width="0.1524" layer="91"/>
 <wire x1="678.18" y1="132.08" x2="678.18" y2="121.92" width="0.1524" layer="91"/>
 <junction x="678.18" y="132.08"/>
 </segment>
 <segment>
-<pinref part="U$65" gate="G$1" pin="A"/>
-<pinref part="U$63" gate="G$1" pin="SENSE"/>
+<pinref part="D4" gate="G$1" pin="A"/>
+<pinref part="U6" gate="G$1" pin="SENSE"/>
 <wire x1="535.94" y1="124.46" x2="533.4" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="533.4" y1="124.46" x2="533.4" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="533.4" y1="124.46" x2="515.62" y2="124.46" width="0.1524" layer="91"/>
@@ -8522,8 +8522,8 @@ to 3h for Rprg = 47kΩ</text>
 <label x="73.66" y="63.5" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U$51" gate="G$1" pin="VIN"/>
-<pinref part="U$51" gate="G$1" pin="VINSNS"/>
+<pinref part="U3" gate="G$1" pin="VIN"/>
+<pinref part="U3" gate="G$1" pin="VINSNS"/>
 <wire x1="350.52" y1="124.46" x2="337.82" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="337.82" y1="124.46" x2="299.72" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="299.72" y1="124.46" x2="287.02" y2="124.46" width="0.1524" layer="91"/>
@@ -8541,10 +8541,10 @@ to 3h for Rprg = 47kΩ</text>
 <pinref part="U$41" gate="G$1" pin="1"/>
 </segment>
 <segment>
-<pinref part="R14" gate="G$1" pin="2"/>
+<pinref part="R4" gate="G$1" pin="2"/>
 <wire x1="340.36" y1="157.48" x2="340.36" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="340.36" y1="162.56" x2="330.2" y2="162.56" width="0.1524" layer="91"/>
-<pinref part="R13" gate="G$1" pin="2"/>
+<pinref part="R3" gate="G$1" pin="2"/>
 <wire x1="330.2" y1="162.56" x2="307.34" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="330.2" y1="157.48" x2="330.2" y2="162.56" width="0.1524" layer="91"/>
 <junction x="330.2" y="162.56"/>
@@ -8553,28 +8553,28 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="1.8V" class="0">
 <segment>
-<pinref part="U$61" gate="G$1" pin="FB"/>
+<pinref part="U5" gate="G$1" pin="FB"/>
 <wire x1="716.28" y1="93.98" x2="728.98" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="728.98" y1="93.98" x2="739.14" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="739.14" y1="93.98" x2="739.14" y2="101.6" width="0.1524" layer="91"/>
-<pinref part="U$62" gate="G$1" pin="FB"/>
+<pinref part="U4" gate="G$1" pin="FB"/>
 <wire x1="739.14" y1="101.6" x2="739.14" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="739.14" y1="124.46" x2="716.28" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="C22" gate="G$1" pin="1"/>
+<pinref part="C18" gate="G$1" pin="1"/>
 <wire x1="739.14" y1="93.98" x2="739.14" y2="91.44" width="0.1524" layer="91"/>
 <junction x="739.14" y="93.98"/>
 <pinref part="U$66" gate="G$1" pin="1.8V"/>
 <wire x1="739.14" y1="124.46" x2="739.14" y2="132.08" width="0.1524" layer="91"/>
 <junction x="739.14" y="124.46"/>
-<pinref part="L1" gate="G$1" pin="2"/>
+<pinref part="L3" gate="G$1" pin="2"/>
 <wire x1="739.14" y1="132.08" x2="739.14" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="734.06" y1="132.08" x2="739.14" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="L8" gate="G$1" pin="2"/>
+<pinref part="L4" gate="G$1" pin="2"/>
 <wire x1="739.14" y1="101.6" x2="734.06" y2="101.6" width="0.1524" layer="91"/>
 <junction x="739.14" y="101.6"/>
 <junction x="739.14" y="132.08"/>
 <pinref part="U$42" gate="G$1" pin="1"/>
-<pinref part="C15" gate="G$1" pin="1"/>
+<pinref part="C17" gate="G$1" pin="1"/>
 <wire x1="728.98" y1="93.98" x2="728.98" y2="91.44" width="0.1524" layer="91"/>
 <junction x="728.98" y="93.98"/>
 </segment>
@@ -8587,8 +8587,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="TANK_BUCK_SW" class="0">
 <segment>
-<pinref part="U$62" gate="G$1" pin="SW"/>
-<pinref part="L1" gate="G$1" pin="1"/>
+<pinref part="U4" gate="G$1" pin="SW"/>
+<pinref part="L3" gate="G$1" pin="1"/>
 <wire x1="716.28" y1="132.08" x2="718.82" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="U$45" gate="G$1" pin="1"/>
 <junction x="718.82" y="132.08"/>
@@ -8596,8 +8596,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="BATTERY_BUCK_SW" class="0">
 <segment>
-<pinref part="L8" gate="G$1" pin="1"/>
-<pinref part="U$61" gate="G$1" pin="SW"/>
+<pinref part="L4" gate="G$1" pin="1"/>
+<pinref part="U5" gate="G$1" pin="SW"/>
 <wire x1="718.82" y1="101.6" x2="716.28" y2="101.6" width="0.1524" layer="91"/>
 <pinref part="U$46" gate="G$1" pin="1"/>
 <junction x="718.82" y="101.6"/>
@@ -8605,7 +8605,7 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="TANK_EN" class="0">
 <segment>
-<pinref part="U$62" gate="G$1" pin="EN"/>
+<pinref part="U4" gate="G$1" pin="EN"/>
 <wire x1="690.88" y1="129.54" x2="673.1" y2="129.54" width="0.1524" layer="91"/>
 <label x="673.1" y="129.54" size="1.778" layer="95"/>
 <pinref part="U$43" gate="G$1" pin="1"/>
@@ -8613,38 +8613,38 @@ to 3h for Rprg = 47kΩ</text>
 <junction x="673.1" y="129.54"/>
 </segment>
 <segment>
-<pinref part="U$63" gate="G$1" pin="!RESET"/>
-<pinref part="U3" gate="A" pin="A"/>
+<pinref part="U6" gate="G$1" pin="!RESET"/>
+<pinref part="U7" gate="A" pin="A"/>
 <wire x1="553.72" y1="99.06" x2="571.5" y2="99.06" width="0.1524" layer="91"/>
 <label x="556.26" y="99.06" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="BATTERY" class="0">
 <segment>
-<pinref part="U$61" gate="G$1" pin="VIN"/>
+<pinref part="U5" gate="G$1" pin="VIN"/>
 <wire x1="690.88" y1="101.6" x2="678.18" y2="101.6" width="0.1524" layer="91"/>
 <label x="673.1" y="101.6" size="1.778" layer="95"/>
-<pinref part="C12" gate="G$1" pin="P$1"/>
+<pinref part="C16" gate="G$1" pin="P$1"/>
 <wire x1="678.18" y1="101.6" x2="670.56" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="678.18" y1="101.6" x2="678.18" y2="91.44" width="0.1524" layer="91"/>
 <junction x="678.18" y="101.6"/>
 </segment>
 <segment>
-<pinref part="U$64" gate="G$1" pin="A"/>
+<pinref part="D3" gate="G$1" pin="A"/>
 <wire x1="535.94" y1="134.62" x2="515.62" y2="134.62" width="0.1524" layer="91"/>
 <label x="518.16" y="134.62" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U$51" gate="G$1" pin="VOUT"/>
+<pinref part="U3" gate="G$1" pin="VOUT"/>
 <wire x1="401.32" y1="124.46" x2="439.42" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="439.42" y1="124.46" x2="439.42" y2="121.92" width="0.1524" layer="91"/>
-<pinref part="U$51" gate="G$1" pin="VOSNS"/>
+<pinref part="U3" gate="G$1" pin="VOSNS"/>
 <wire x1="439.42" y1="121.92" x2="401.32" y2="121.92" width="0.1524" layer="91"/>
 <junction x="439.42" y="124.46"/>
 <label x="421.64" y="124.46" size="1.778" layer="95"/>
 <pinref part="JP5" gate="G$1" pin="1"/>
 <wire x1="439.42" y1="124.46" x2="444.5" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="C8" gate="G$1" pin="P$1"/>
+<pinref part="C12" gate="G$1" pin="P$1"/>
 <wire x1="444.5" y1="124.46" x2="459.74" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="444.5" y1="109.22" x2="444.5" y2="124.46" width="0.1524" layer="91"/>
 <junction x="444.5" y="124.46"/>
@@ -8653,8 +8653,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="LX1" class="0">
 <segment>
-<pinref part="L2" gate="G$1" pin="2"/>
-<pinref part="U$1" gate="G$1" pin="LX"/>
+<pinref part="L1" gate="G$1" pin="2"/>
+<pinref part="U1" gate="G$1" pin="LX"/>
 <wire x1="91.44" y1="124.46" x2="99.06" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="U$33" gate="G$1" pin="1"/>
 <junction x="91.44" y="124.46"/>
@@ -8662,8 +8662,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="LX2" class="0">
 <segment>
-<pinref part="L3" gate="G$1" pin="2"/>
-<pinref part="U$38" gate="G$1" pin="LX"/>
+<pinref part="L2" gate="G$1" pin="2"/>
+<pinref part="U2" gate="G$1" pin="LX"/>
 <wire x1="91.44" y1="68.58" x2="99.06" y2="68.58" width="0.1524" layer="91"/>
 <pinref part="U$34" gate="G$1" pin="1"/>
 <junction x="91.44" y="68.58"/>
@@ -8671,10 +8671,10 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="PV1" class="0">
 <segment>
-<pinref part="L2" gate="G$1" pin="1"/>
+<pinref part="L1" gate="G$1" pin="1"/>
 <wire x1="76.2" y1="124.46" x2="68.58" y2="124.46" width="0.1524" layer="91"/>
 <label x="60.96" y="124.46" size="1.778" layer="95"/>
-<pinref part="R11" gate="G$1" pin="1"/>
+<pinref part="R1" gate="G$1" pin="1"/>
 <wire x1="68.58" y1="124.46" x2="50.8" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="50.8" y1="124.46" x2="40.64" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="40.64" y1="124.46" x2="30.48" y2="124.46" width="0.1524" layer="91"/>
@@ -8685,12 +8685,12 @@ to 3h for Rprg = 47kΩ</text>
 <wire x1="68.58" y1="134.62" x2="68.58" y2="144.78" width="0.1524" layer="91"/>
 <wire x1="68.58" y1="144.78" x2="154.94" y2="144.78" width="0.1524" layer="91"/>
 <wire x1="154.94" y1="144.78" x2="154.94" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="XSHUT"/>
+<pinref part="U1" gate="G$1" pin="XSHUT"/>
 <wire x1="154.94" y1="134.62" x2="149.86" y2="134.62" width="0.1524" layer="91"/>
 <junction x="68.58" y="134.62"/>
-<pinref part="C5" gate="G$1" pin="P$1"/>
-<wire x1="50.8" y1="119.38" x2="50.8" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="C2" gate="G$1" pin="P$1"/>
+<wire x1="50.8" y1="119.38" x2="50.8" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="P$1"/>
 <wire x1="40.64" y1="119.38" x2="40.64" y2="124.46" width="0.1524" layer="91"/>
 <junction x="40.64" y="124.46"/>
 <junction x="50.8" y="124.46"/>
@@ -8699,20 +8699,20 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="MPPT-VOUT-2" class="0">
 <segment>
-<pinref part="U$38" gate="G$1" pin="VOUT"/>
+<pinref part="U2" gate="G$1" pin="VOUT"/>
 <pinref part="JP1" gate="G$1" pin="1"/>
 <wire x1="99.06" y1="63.5" x2="93.98" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="93.98" y1="63.5" x2="93.98" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$38" gate="G$1" pin="ICTRL+"/>
-<pinref part="U$38" gate="G$1" pin="ICTRL-"/>
+<pinref part="U2" gate="G$1" pin="ICTRL+"/>
+<pinref part="U2" gate="G$1" pin="ICTRL-"/>
 <wire x1="149.86" y1="73.66" x2="165.1" y2="73.66" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="73.66" x2="165.1" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="68.58" x2="149.86" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="73.66" x2="172.72" y2="73.66" width="0.1524" layer="91"/>
 <junction x="165.1" y="73.66"/>
-<pinref part="R4" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="2"/>
 <junction x="172.72" y="73.66"/>
 <wire x1="172.72" y1="73.66" x2="185.42" y2="73.66" width="0.1524" layer="91"/>
 <label x="157.48" y="73.66" size="1.778" layer="95"/>
@@ -8720,32 +8720,32 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="MPP-SET2" class="0">
 <segment>
-<pinref part="C3" gate="G$1" pin="P$2"/>
-<pinref part="U$38" gate="G$1" pin="MPP-SET"/>
+<pinref part="C6" gate="G$1" pin="P$2"/>
+<pinref part="U2" gate="G$1" pin="MPP-SET"/>
 <wire x1="83.82" y1="78.74" x2="99.06" y2="78.74" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="78.74" x2="83.82" y2="83.82" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="83.82" x2="86.36" y2="83.82" width="0.1524" layer="91"/>
 <junction x="83.82" y="78.74"/>
 <wire x1="81.28" y1="78.74" x2="83.82" y2="78.74" width="0.1524" layer="91"/>
-<pinref part="R10" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="MPPT-VOUT-1" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="VOUT"/>
+<pinref part="U1" gate="G$1" pin="VOUT"/>
 <pinref part="JP2" gate="G$1" pin="1"/>
 <wire x1="99.06" y1="119.38" x2="93.98" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="93.98" y1="119.38" x2="93.98" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$1" gate="G$1" pin="ICTRL+"/>
+<pinref part="U1" gate="G$1" pin="ICTRL+"/>
 <wire x1="149.86" y1="129.54" x2="165.1" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="ICTRL-"/>
+<pinref part="U1" gate="G$1" pin="ICTRL-"/>
 <wire x1="149.86" y1="124.46" x2="165.1" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="124.46" x2="165.1" y2="129.54" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="129.54" x2="172.72" y2="129.54" width="0.1524" layer="91"/>
 <junction x="165.1" y="129.54"/>
-<pinref part="R2" gate="G$1" pin="2"/>
+<pinref part="R5" gate="G$1" pin="2"/>
 <junction x="172.72" y="129.54"/>
 <wire x1="172.72" y1="129.54" x2="185.42" y2="129.54" width="0.1524" layer="91"/>
 <label x="157.48" y="129.54" size="1.778" layer="95"/>
@@ -8753,14 +8753,14 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="PV2" class="0">
 <segment>
-<pinref part="U$38" gate="G$1" pin="XSHUT"/>
+<pinref part="U2" gate="G$1" pin="XSHUT"/>
 <wire x1="149.86" y1="78.74" x2="154.94" y2="78.74" width="0.1524" layer="91"/>
 <wire x1="154.94" y1="78.74" x2="154.94" y2="88.9" width="0.1524" layer="91"/>
 <wire x1="154.94" y1="88.9" x2="68.58" y2="88.9" width="0.1524" layer="91"/>
-<pinref part="L3" gate="G$1" pin="1"/>
+<pinref part="L2" gate="G$1" pin="1"/>
 <wire x1="76.2" y1="68.58" x2="68.58" y2="68.58" width="0.1524" layer="91"/>
 <label x="60.96" y="68.58" size="1.778" layer="95"/>
-<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <wire x1="68.58" y1="68.58" x2="50.8" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="50.8" y1="68.58" x2="40.64" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="40.64" y1="68.58" x2="30.48" y2="68.58" width="0.1524" layer="91"/>
@@ -8770,9 +8770,9 @@ to 3h for Rprg = 47kΩ</text>
 <pinref part="JP4" gate="G$1" pin="1"/>
 <wire x1="68.58" y1="88.9" x2="68.58" y2="78.74" width="0.1524" layer="91"/>
 <junction x="68.58" y="78.74"/>
-<pinref part="C7" gate="G$1" pin="P$1"/>
+<pinref part="C4" gate="G$1" pin="P$1"/>
 <wire x1="50.8" y1="63.5" x2="50.8" y2="68.58" width="0.1524" layer="91"/>
-<pinref part="C6" gate="G$1" pin="P$1"/>
+<pinref part="C3" gate="G$1" pin="P$1"/>
 <wire x1="40.64" y1="63.5" x2="40.64" y2="68.58" width="0.1524" layer="91"/>
 <junction x="40.64" y="68.58"/>
 <junction x="50.8" y="68.58"/>
@@ -8781,22 +8781,22 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="N$1" class="0">
 <segment>
-<pinref part="U$1" gate="G$1" pin="MPP-SET"/>
+<pinref part="U1" gate="G$1" pin="MPP-SET"/>
 <wire x1="83.82" y1="134.62" x2="99.06" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="C4" gate="G$1" pin="P$2"/>
+<pinref part="C5" gate="G$1" pin="P$2"/>
 <wire x1="86.36" y1="139.7" x2="83.82" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="139.7" x2="83.82" y2="134.62" width="0.1524" layer="91"/>
 <junction x="83.82" y="134.62"/>
-<pinref part="R11" gate="G$1" pin="2"/>
+<pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="81.28" y1="134.62" x2="83.82" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="TH" class="0">
 <segment>
-<pinref part="R6" gate="G$1" pin="2"/>
-<pinref part="R5" gate="G$1" pin="1"/>
+<pinref part="R10" gate="G$1" pin="2"/>
+<pinref part="R11" gate="G$1" pin="1"/>
 <wire x1="381" y1="137.16" x2="383.54" y2="137.16" width="0.1524" layer="91"/>
-<pinref part="U$51" gate="G$1" pin="TH"/>
+<pinref part="U3" gate="G$1" pin="TH"/>
 <wire x1="383.54" y1="137.16" x2="386.08" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="383.54" y1="132.08" x2="383.54" y2="137.16" width="0.1524" layer="91"/>
 <junction x="383.54" y="137.16"/>
@@ -8805,8 +8805,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="VREF" class="0">
 <segment>
-<pinref part="R6" gate="G$1" pin="1"/>
-<pinref part="U$51" gate="G$1" pin="VREF"/>
+<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="U3" gate="G$1" pin="VREF"/>
 <wire x1="370.84" y1="137.16" x2="368.3" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="368.3" y1="137.16" x2="368.3" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="C9" gate="G$1" pin="P$2"/>
@@ -8817,8 +8817,8 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="RPRG" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="IPRG"/>
-<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="U3" gate="G$1" pin="IPRG"/>
+<pinref part="R12" gate="G$1" pin="2"/>
 <wire x1="401.32" y1="116.84" x2="429.26" y2="116.84" width="0.1524" layer="91"/>
 <wire x1="429.26" y1="116.84" x2="429.26" y2="111.76" width="0.1524" layer="91"/>
 <label x="421.64" y="116.84" size="1.778" layer="95"/>
@@ -8826,30 +8826,30 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="VPRE" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="VPRE"/>
+<pinref part="U3" gate="G$1" pin="VPRE"/>
 <wire x1="401.32" y1="111.76" x2="414.02" y2="111.76" width="0.1524" layer="91"/>
 <label x="406.4" y="111.76" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="IPRE" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="IPRE"/>
+<pinref part="U3" gate="G$1" pin="IPRE"/>
 <wire x1="401.32" y1="109.22" x2="414.02" y2="109.22" width="0.1524" layer="91"/>
 <label x="406.4" y="109.22" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="N$3" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="TPRG"/>
-<pinref part="C10" gate="G$1" pin="P$1"/>
+<pinref part="U3" gate="G$1" pin="TPRG"/>
+<pinref part="C13" gate="G$1" pin="P$1"/>
 <wire x1="350.52" y1="119.38" x2="312.42" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="312.42" y1="119.38" x2="312.42" y2="109.22" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="REND" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="IEND"/>
-<pinref part="R8" gate="G$1" pin="2"/>
+<pinref part="U3" gate="G$1" pin="IEND"/>
+<pinref part="R13" gate="G$1" pin="2"/>
 <wire x1="401.32" y1="119.38" x2="436.88" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="436.88" y1="119.38" x2="436.88" y2="111.76" width="0.1524" layer="91"/>
 <label x="421.64" y="119.38" size="1.778" layer="95"/>
@@ -8857,23 +8857,23 @@ to 3h for Rprg = 47kΩ</text>
 </net>
 <net name="SD" class="0">
 <segment>
-<pinref part="U$51" gate="G$1" pin="SD"/>
+<pinref part="U3" gate="G$1" pin="SD"/>
 <wire x1="350.52" y1="109.22" x2="337.82" y2="109.22" width="0.1524" layer="91"/>
 <wire x1="337.82" y1="109.22" x2="337.82" y2="106.68" width="0.1524" layer="91"/>
 <wire x1="332.74" y1="109.22" x2="337.82" y2="109.22" width="0.1524" layer="91"/>
 <junction x="337.82" y="109.22"/>
 <pinref part="JP6" gate="G$1" pin="2"/>
-<pinref part="R12" gate="G$1" pin="2"/>
+<pinref part="R9" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="SPV_VCTRL1" class="0">
 <segment>
-<pinref part="C1" gate="G$1" pin="P$1"/>
+<pinref part="C7" gate="G$1" pin="P$1"/>
 <wire x1="162.56" y1="119.38" x2="162.56" y2="116.84" width="0.1524" layer="91"/>
-<pinref part="R1" gate="G$1" pin="2"/>
-<pinref part="R2" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="R5" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="119.38" x2="172.72" y2="119.38" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="VCTRL"/>
+<pinref part="U1" gate="G$1" pin="VCTRL"/>
 <wire x1="149.86" y1="119.38" x2="162.56" y2="119.38" width="0.1524" layer="91"/>
 <junction x="162.56" y="119.38"/>
 <junction x="172.72" y="119.38"/>
@@ -8886,21 +8886,21 @@ to 3h for Rprg = 47kΩ</text>
 <wire x1="330.2" y1="137.16" x2="330.2" y2="129.54" width="0.1524" layer="91"/>
 <wire x1="330.2" y1="129.54" x2="342.9" y2="129.54" width="0.1524" layer="91"/>
 <wire x1="342.9" y1="129.54" x2="342.9" y2="111.76" width="0.1524" layer="91"/>
-<pinref part="U$51" gate="G$1" pin="ST1"/>
+<pinref part="U3" gate="G$1" pin="ST1"/>
 <wire x1="342.9" y1="111.76" x2="350.52" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$6" class="0">
 <segment>
 <pinref part="D1" gate="G$1" pin="A"/>
-<pinref part="R13" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="1"/>
 <wire x1="330.2" y1="144.78" x2="330.2" y2="147.32" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$8" class="0">
 <segment>
 <pinref part="D2" gate="G$1" pin="A"/>
-<pinref part="R14" gate="G$1" pin="1"/>
+<pinref part="R4" gate="G$1" pin="1"/>
 <wire x1="340.36" y1="144.78" x2="340.36" y2="147.32" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -8909,15 +8909,15 @@ to 3h for Rprg = 47kΩ</text>
 <pinref part="D2" gate="G$1" pin="C"/>
 <wire x1="340.36" y1="132.08" x2="340.36" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="345.44" y1="132.08" x2="340.36" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="U$51" gate="G$1" pin="ST2"/>
+<pinref part="U3" gate="G$1" pin="ST2"/>
 <wire x1="350.52" y1="114.3" x2="345.44" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="345.44" y1="114.3" x2="345.44" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
-<pinref part="U$63" gate="G$1" pin="CT"/>
-<pinref part="C16" gate="G$1" pin="P$1"/>
+<pinref part="U6" gate="G$1" pin="CT"/>
+<pinref part="C14" gate="G$1" pin="P$1"/>
 <wire x1="523.24" y1="93.98" x2="518.16" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="518.16" y1="93.98" x2="518.16" y2="88.9" width="0.1524" layer="91"/>
 </segment>
diff --git a/breakout-hardware/bristol_longshot.sch.pdf b/breakout-hardware/bristol_longshot.sch.pdf
new file mode 100644
index 0000000..6899aaf
Binary files /dev/null and b/breakout-hardware/bristol_longshot.sch.pdf differ