diff --git a/hardware/internal/bristol_longshot.brd b/hardware/internal/bristol_longshot.brd
index 420ad50..5b4f3a8 100644
--- a/hardware/internal/bristol_longshot.brd
+++ b/hardware/internal/bristol_longshot.brd
@@ -3285,18 +3285,18 @@ Covered vias can be set in Masks (Limit).
 </element>
 <element name="R1" library="microbuilder_v3" package="_0402" value="10kΩ" x="10.625" y="54.125" rot="R270"/>
 <element name="D2" library="led" package="CHIPLED_0603" value="GREEN" x="3.75" y="44.75" rot="R270"/>
-<element name="U$74" library="fbri" package="M05_SIDE" value="M05" x="12.125" y="52.5" rot="R180"/>
+<element name="J1" library="fbri" package="M05_SIDE" value="M05" x="12.125" y="52.5" rot="R180"/>
 <element name="C17" library="microbuilder_v3" package="_0402" value="100nF" x="9.875" y="55.125" rot="R270"/>
 <element name="R7" library="microbuilder_v3" package="_0402" value="10kΩ" x="4.25" y="51.75"/>
 <element name="R8" library="microbuilder_v3" package="_0402" value="22kΩ" x="4.25" y="50.75" rot="R180"/>
-<element name="U15" library="SparkFun-Sensors" package="BMP180" value="BMP180" x="6.5" y="54.25"/>
+<element name="U3" library="SparkFun-Sensors" package="BMP180" value="BMP180" x="6.5" y="54.25"/>
 <element name="C24" library="microbuilder_v3" package="_0402" value="100nF" x="7" y="56.75"/>
 <element name="C25" library="microbuilder_v3" package="_0402" value="4.7µF" x="2.875" y="51.25" rot="R90"/>
 <element name="R13" library="microbuilder_v3" package="_0402" value="1kΩ" x="4" y="55.125" rot="R90"/>
 <element name="R14" library="microbuilder_v3" package="_0402" value="1kΩ" x="3.125" y="55.125" rot="R90"/>
-<element name="U$18" library="fbri" package="0433AT62A0020E" value="0433AT62A0020E" x="4" y="15" rot="R180"/>
-<element name="U$19" library="fbri" package="BC-2001" value="BC-2001" x="7" y="46" rot="MR270"/>
-<element name="U$25" library="fbri" package="7M-XTAL" value="7M-XTAL" x="2.125" y="41.25" rot="R90"/>
+<element name="U5" library="fbri" package="0433AT62A0020E" value="0433AT62A0020E" x="4" y="15" rot="R180"/>
+<element name="J2" library="fbri" package="BC-2001" value="BC-2001" x="7" y="46" rot="MR270"/>
+<element name="U4" library="fbri" package="7M-XTAL" value="7M-XTAL" x="2.125" y="41.25" rot="R90"/>
 <element name="C9" library="microbuilder_v3" package="_0402" value="15pF" x="4.25" y="40" rot="R270"/>
 <element name="C10" library="microbuilder_v3" package="_0402" value="15pF" x="1.5" y="43.75"/>
 </elements>
@@ -3378,7 +3378,7 @@ Covered vias can be set in Masks (Limit).
 <contactref element="R1" pad="1"/>
 <via x="2" y="33.875" extent="1-16" drill="0.3"/>
 <via x="12" y="33.875" extent="1-16" drill="0.3"/>
-<contactref element="U$74" pad="$1"/>
+<contactref element="J1" pad="$1"/>
 <via x="13.25" y="41.875" extent="1-16" drill="0.3"/>
 <via x="11.125" y="45.375" extent="1-16" drill="0.3"/>
 <via x="12.625" y="48.125" extent="1-16" drill="0.3"/>
@@ -3395,10 +3395,10 @@ Covered vias can be set in Masks (Limit).
 <contactref element="R7" pad="1"/>
 <via x="4" y="49.375" extent="1-16" drill="0.3"/>
 <via x="6.5" y="54.75" extent="1-16" drill="0.3"/>
-<contactref element="U15" pad="7"/>
+<contactref element="U3" pad="7"/>
 <contactref element="C24" pad="2"/>
 <contactref element="C25" pad="2"/>
-<contactref element="U$19" pad="-VE"/>
+<contactref element="J2" pad="-VE"/>
 <via x="2.125" y="36.75" extent="1-16" drill="0.3"/>
 <via x="0.75" y="31.875" extent="1-16" drill="0.3"/>
 <via x="2" y="31.875" extent="1-16" drill="0.3"/>
@@ -3424,10 +3424,78 @@ Covered vias can be set in Masks (Limit).
 <via x="11.75" y="61.25" extent="1-16" drill="0.3"/>
 <contactref element="C10" pad="1"/>
 <contactref element="C9" pad="2"/>
+<wire x1="10.7086" y1="59.4646" x2="11.75" y2="61.25" width="0" layer="19" extent="1-1"/>
+<wire x1="10.0749" y1="57.375" x2="10.7086" y2="59.4646" width="0" layer="19" extent="1-1"/>
+<wire x1="11.25" y1="57.25" x2="10.0749" y2="57.375" width="0" layer="19" extent="1-1"/>
+<wire x1="10.75" y1="55.5" x2="11.25" y2="57.25" width="0" layer="19" extent="1-1"/>
+<wire x1="12.625" y1="55" x2="12.125" y2="55.04" width="0" layer="19" extent="1-1"/>
+<wire x1="10.625" y1="54.633" x2="10.633" y2="55.383" width="0" layer="19" extent="1-1"/>
+<wire x1="9.875" y1="54.617" x2="10.625" y2="54.633" width="0" layer="19" extent="1-1"/>
+<wire x1="8" y1="54.25" x2="9.875" y2="54.617" width="0" layer="19" extent="1-1"/>
+<wire x1="6.5" y1="54.75" x2="8" y2="54.25" width="0" layer="19" extent="1-1"/>
+<wire x1="7.508" y1="56.75" x2="6.5" y2="54.75" width="0" layer="19" extent="1-1"/>
+<wire x1="10" y1="51.125" x2="9.875" y2="54.617" width="0" layer="19" extent="1-1"/>
+<wire x1="8.875" y1="49.375" x2="10" y2="51.125" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="49.375" x2="5.125" y2="49.375" width="0" layer="19" extent="1-1"/>
+<wire x1="9.625" y1="45.875" x2="8.875" y2="46.875" width="0" layer="19" extent="16-16"/>
+<wire x1="6.625" y1="42.5" x2="6.625" y2="42.5" width="0" layer="19" extent="1-16"/>
+<wire x1="8.875" y1="43.5" x2="8.25" y2="43.375" width="0" layer="19" extent="16-16"/>
+<wire x1="8.875" y1="41.5" x2="7.875" y2="42.5" width="0" layer="19" extent="1-1"/>
+<wire x1="10" y1="40.5" x2="8.875" y2="40.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.117" y1="46.125" x2="9.625" y2="45.875" width="0" layer="19" extent="1-16"/>
+<wire x1="11.125" y1="45.375" x2="11.117" y2="46.125" width="0" layer="19" extent="1-1"/>
+<wire x1="6.375" y1="46.875" x2="7.625" y2="48.125" width="0" layer="19" extent="1-1"/>
+<wire x1="12.008" y1="40.5" x2="10" y2="40.5" width="0" layer="19" extent="1-1"/>
+<wire x1="12.008" y1="41.375" x2="12.008" y2="40.5" width="0" layer="19" extent="1-1"/>
+<wire x1="12.008" y1="42.25" x2="12.008" y2="41.375" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="41.875" x2="12.008" y2="42.25" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="39.875" x2="12.008" y2="40.5" width="0" layer="19" extent="1-1"/>
+<wire x1="12.008" y1="38.75" x2="13.25" y2="39.875" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="38" x2="12.008" y2="38.75" width="0" layer="19" extent="1-1"/>
+<wire x1="10.5" y1="37.75" x2="12.008" y2="38.75" width="0" layer="19" extent="1-1"/>
+<wire x1="8.75" y1="37.992" x2="10.5" y2="37.75" width="0" layer="19" extent="1-1"/>
+<wire x1="8" y1="37.75" x2="8.75" y2="37.992" width="0" layer="19" extent="1-1"/>
+<wire x1="6.6875" y1="38.6875" x2="8" y2="37.75" width="0" layer="19" extent="1-1"/>
+<wire x1="5" y1="38.75" x2="6.6875" y2="38.6875" width="0" layer="19" extent="1-1"/>
+<wire x1="5" y1="37.883" x2="5" y2="38.75" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="37.75" x2="5" y2="37.883" width="0" layer="19" extent="1-1"/>
+<wire x1="4.25" y1="39.492" x2="5" y2="38.75" width="0" layer="19" extent="1-1"/>
+<wire x1="3" y1="38.375" x2="4" y2="37.75" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="36.0625" x2="4" y2="37.75" width="0" layer="19" extent="1-1"/>
+<wire x1="5" y1="36.0625" x2="4" y2="36.0625" width="0" layer="19" extent="1-1"/>
+<wire x1="6.75" y1="36.0625" x2="5" y2="36.0625" width="0" layer="19" extent="1-1"/>
+<wire x1="8.75" y1="36.0625" x2="8" y2="37.75" width="0" layer="19" extent="1-1"/>
+<wire x1="2.125" y1="36.75" x2="3" y2="38.375" width="0" layer="19" extent="1-1"/>
+<wire x1="2.117" y1="35.875" x2="2.125" y2="36.75" width="0" layer="19" extent="1-1"/>
+<wire x1="0.75" y1="36" x2="2.117" y2="35.875" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="36" x2="13.25" y2="38" width="0" layer="19" extent="1-1"/>
+<wire x1="2" y1="33.875" x2="2.117" y2="35.875" width="0" layer="19" extent="1-1"/>
+<wire x1="2.117" y1="32.875" x2="2" y2="33.875" width="0" layer="19" extent="1-1"/>
+<wire x1="2" y1="31.875" x2="2.117" y2="32.875" width="0" layer="19" extent="1-1"/>
+<wire x1="0.75" y1="33.875" x2="2" y2="33.875" width="0" layer="19" extent="1-1"/>
+<wire x1="0.75" y1="31.875" x2="2" y2="31.875" width="0" layer="19" extent="1-1"/>
+<wire x1="12.133" y1="48.125" x2="10.125" y2="47.875" width="0" layer="19" extent="1-1"/>
+<wire x1="12.625" y1="48.125" x2="12.133" y2="48.125" width="0" layer="19" extent="1-1"/>
+<wire x1="10.625" y1="35.125" x2="8.75" y2="36.0625" width="0" layer="19" extent="1-1"/>
+<wire x1="10.625" y1="33.875" x2="10.625" y2="35.125" width="0" layer="19" extent="1-1"/>
+<wire x1="12" y1="33.875" x2="10.625" y2="33.875" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="33.875" x2="12" y2="33.875" width="0" layer="19" extent="1-1"/>
+<wire x1="13.25" y1="31.875" x2="13.25" y2="33.875" width="0" layer="19" extent="1-1"/>
+<wire x1="12" y1="31.875" x2="13.25" y2="31.875" width="0" layer="19" extent="1-1"/>
+<wire x1="10.625" y1="31.875" x2="12" y2="31.875" width="0" layer="19" extent="1-1"/>
+<wire x1="0.75" y1="38.375" x2="2.125" y2="36.75" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="46.875" x2="6.375" y2="46.875" width="0" layer="19" extent="1-1"/>
+<wire x1="3.742" y1="51.75" x2="4" y2="49.375" width="0" layer="19" extent="1-1"/>
+<wire x1="2.875" y1="51.758" x2="3.742" y2="51.75" width="0" layer="19" extent="1-1"/>
+<wire x1="2.875" y1="52.625" x2="2.875" y2="51.758" width="0" layer="19" extent="1-1"/>
+<wire x1="1" y1="54.25" x2="2.875" y2="52.625" width="0" layer="19" extent="1-1"/>
+<wire x1="0.875" y1="47.75" x2="4" y2="46.875" width="0" layer="19" extent="1-1"/>
+<wire x1="1" y1="44.625" x2="0.875" y2="47.75" width="0" layer="19" extent="1-1"/>
+<wire x1="0.992" y1="43.75" x2="1" y2="44.625" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U1" pad="32"/>
-<contactref element="U$74" pad="$4"/>
+<contactref element="J1" pad="$4"/>
 <wire x1="10.125" y1="49.875" x2="10.75" y2="49.875" width="0.15" layer="1"/>
 <wire x1="10.75" y1="49.875" x2="11" y2="50.125" width="0.15" layer="1"/>
 <wire x1="11" y1="50.125" x2="11" y2="50.5" width="0.15" layer="1"/>
@@ -3437,7 +3505,7 @@ Covered vias can be set in Masks (Limit).
 </signal>
 <signal name="SWDCLK">
 <contactref element="U1" pad="31"/>
-<contactref element="U$74" pad="$5"/>
+<contactref element="J1" pad="$5"/>
 <wire x1="10.125" y1="49.375" x2="11.125" y2="49.375" width="0.15" layer="1"/>
 <wire x1="11.125" y1="49.375" x2="11.5" y2="49.75" width="0.15" layer="1"/>
 <wire x1="11.5" y1="49.75" x2="11.915" y2="49.75" width="0.15" layer="1"/>
@@ -3460,7 +3528,7 @@ Covered vias can be set in Masks (Limit).
 <wire x1="12.625" y1="49" x2="13.5" y2="49" width="0.4" layer="16"/>
 <wire x1="13.5" y1="49" x2="13.5" y2="46.5" width="0.4" layer="16"/>
 <wire x1="13.5" y1="46.5" x2="13.125" y2="46.125" width="0.4" layer="16"/>
-<contactref element="U$74" pad="$3"/>
+<contactref element="J1" pad="$3"/>
 <via x="12.625" y="52.5" extent="1-16" drill="0.3"/>
 <wire x1="12.125" y1="52.5" x2="12.625" y2="52.5" width="0.4064" layer="1"/>
 <wire x1="12.625" y1="52.5" x2="13.5" y2="52.5" width="0.4" layer="16"/>
@@ -3488,14 +3556,14 @@ Covered vias can be set in Masks (Limit).
 <contactref element="R14" pad="2"/>
 <contactref element="R13" pad="2"/>
 <contactref element="C24" pad="1"/>
-<contactref element="U15" pad="2"/>
-<contactref element="U15" pad="3"/>
+<contactref element="U3" pad="2"/>
+<contactref element="U3" pad="3"/>
 <contactref element="C25" pad="1"/>
 <wire x1="5" y1="55.7" x2="4.067" y2="55.7" width="0.4" layer="1"/>
 <wire x1="4.067" y1="55.7" x2="4" y2="55.633" width="0.4" layer="1"/>
 <wire x1="4" y1="55.633" x2="3.125" y2="55.633" width="0.4" layer="1"/>
 <wire x1="5" y1="55.7" x2="6.5" y2="55.7" width="0.4" layer="1"/>
-<contactref element="U$19" pad="+VE1"/>
+<contactref element="J2" pad="+VE1"/>
 <wire x1="6.5" y1="55.7" x2="6.5" y2="56.742" width="0.4" layer="1"/>
 <wire x1="6.5" y1="56.742" x2="6.492" y2="56.75" width="0.4" layer="1"/>
 <wire x1="6.492" y1="56.75" x2="6.492" y2="58.442" width="0.4" layer="1"/>
@@ -3658,7 +3726,7 @@ Covered vias can be set in Masks (Limit).
 <signal name="ANT">
 <contactref element="L5" pad="1"/>
 <contactref element="C1" pad="1"/>
-<contactref element="U$18" pad="1"/>
+<contactref element="U5" pad="1"/>
 <wire x1="3.125" y1="33.867" x2="3.133" y2="33.859" width="0.4" layer="1"/>
 <wire x1="3.133" y1="33.859" x2="3.133" y2="32.875" width="0.4" layer="1"/>
 <wire x1="3.133" y1="32.875" x2="3.133" y2="28.367" width="0.8" layer="1"/>
@@ -3715,7 +3783,7 @@ Covered vias can be set in Masks (Limit).
 </signal>
 <signal name="RADIO_XIN">
 <contactref element="U2" pad="17"/>
-<contactref element="U$25" pad="1"/>
+<contactref element="U4" pad="1"/>
 <contactref element="C9" pad="1"/>
 <wire x1="5.905" y1="43" x2="4.75" y2="43" width="0.2" layer="1"/>
 <wire x1="4.75" y1="43" x2="4.25" y2="42.5" width="0.2" layer="1"/>
@@ -3734,7 +3802,7 @@ Covered vias can be set in Masks (Limit).
 <signal name="EXT!RESET">
 <contactref element="U8" pad="1"/>
 <contactref element="R1" pad="2"/>
-<contactref element="U$74" pad="$2"/>
+<contactref element="J1" pad="$2"/>
 <wire x1="10.7086" y1="60.7854" x2="9.6604" y2="60.7854" width="0.2" layer="1"/>
 <wire x1="9.6604" y1="60.7854" x2="9.125" y2="60.25" width="0.2" layer="1"/>
 <wire x1="9.125" y1="60.25" x2="9.125" y2="54.25" width="0.2" layer="1"/>
@@ -3771,7 +3839,7 @@ Covered vias can be set in Masks (Limit).
 </signal>
 <signal name="SDA">
 <contactref element="U1" pad="1"/>
-<contactref element="U15" pad="6"/>
+<contactref element="U3" pad="6"/>
 <contactref element="R13" pad="1"/>
 <wire x1="8.125" y1="52.75" x2="8.175" y2="52.8" width="0.2" layer="1"/>
 <wire x1="8.175" y1="52.8" x2="8" y2="52.8" width="0.2" layer="1"/>
@@ -3783,7 +3851,7 @@ Covered vias can be set in Masks (Limit).
 </signal>
 <signal name="SCL">
 <contactref element="U1" pad="2"/>
-<contactref element="U15" pad="5"/>
+<contactref element="U3" pad="5"/>
 <contactref element="R14" pad="1"/>
 <wire x1="8.875" y1="50.625" x2="8.875" y2="51.25" width="0.2" layer="1"/>
 <wire x1="8.875" y1="51.25" x2="8" y2="52.125" width="0.2" layer="1"/>
@@ -3804,10 +3872,10 @@ Covered vias can be set in Masks (Limit).
 <wire x1="9.008" y1="36.875" x2="9.625" y2="37.492" width="0.4" layer="1" curve="90"/>
 </signal>
 <signal name="+2">
-<contactref element="U$19" pad="+VE2"/>
+<contactref element="J2" pad="+VE2"/>
 </signal>
 <signal name="RADIO_XOUT">
-<contactref element="U$25" pad="3"/>
+<contactref element="U4" pad="3"/>
 <contactref element="U2" pad="16"/>
 <contactref element="C10" pad="2"/>
 <wire x1="5.905" y1="43.5" x2="4.625" y2="43.5" width="0.2" layer="1"/>
diff --git a/hardware/internal/bristol_longshot.sch b/hardware/internal/bristol_longshot.sch
index 41748e5..7f943fd 100644
--- a/hardware/internal/bristol_longshot.sch
+++ b/hardware/internal/bristol_longshot.sch
@@ -3460,7 +3460,6 @@ Typical applications:&lt;p&gt;
 <part name="U7" library="TPS3125" deviceset="TPS3123" device=""/>
 <part name="U$20" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$21" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="U$31" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U8" library="SN74LVC1G32DCKR" deviceset="SN74LVC1G32DCKR" device=""/>
 <part name="U$1" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$2" library="microbuilder_v3" deviceset="1.8V" device=""/>
@@ -3469,13 +3468,13 @@ Typical applications:&lt;p&gt;
 <part name="U$29" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="D2" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
 <part name="U$73" library="microbuilder_v3" deviceset="1.8V" device=""/>
-<part name="U$74" library="fbri" deviceset="M05" device=""/>
+<part name="J1" library="fbri" deviceset="M05" device=""/>
 <part name="C17" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="100nF"/>
 <part name="U$78" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
 <part name="R8" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="22kΩ"/>
 <part name="U$56" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="U15" library="SparkFun-Sensors" deviceset="BMP180" device=""/>
+<part name="U3" library="SparkFun-Sensors" deviceset="BMP180" device=""/>
 <part name="GND13" library="SparkFun" deviceset="GND" device=""/>
 <part name="C24" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="100nF"/>
 <part name="C25" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
@@ -3486,12 +3485,12 @@ Typical applications:&lt;p&gt;
 <part name="U$3" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$16" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$17" library="microbuilder_v3" deviceset="1.8V" device=""/>
-<part name="U$18" library="fbri" deviceset="0433AT62A0020E" device=""/>
-<part name="U$19" library="fbri" deviceset="BC-2001" device=""/>
+<part name="U5" library="fbri" deviceset="0433AT62A0020E" device=""/>
+<part name="J2" library="fbri" deviceset="BC-2001" device=""/>
 <part name="U$22" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$23" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$24" library="microbuilder_v3" deviceset="1.8V" device=""/>
-<part name="U$25" library="fbri" deviceset="7M-XTAL" device=""/>
+<part name="U4" library="fbri" deviceset="7M-XTAL" device=""/>
 <part name="C9" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="15pF"/>
 <part name="C10" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="15pF"/>
 <part name="U$27" library="microbuilder_v3" deviceset="GND" device=""/>
@@ -3575,7 +3574,6 @@ DOPO: 0x0)</text>
 <instance part="U7" gate="A" x="30.48" y="132.08" rot="MR0"/>
 <instance part="U$20" gate="G$1" x="12.7" y="142.24" rot="MR0"/>
 <instance part="U$21" gate="G$1" x="50.8" y="114.3"/>
-<instance part="U$31" gate="G$1" x="266.7" y="93.98"/>
 <instance part="U8" gate="A" x="91.44" y="139.7"/>
 <instance part="U$1" gate="G$1" x="71.12" y="114.3"/>
 <instance part="U$2" gate="G$1" x="71.12" y="147.32" rot="MR0"/>
@@ -3584,13 +3582,13 @@ DOPO: 0x0)</text>
 <instance part="U$29" gate="G$1" x="66.04" y="114.3"/>
 <instance part="D2" gate="G$1" x="208.28" y="109.22"/>
 <instance part="U$73" gate="G$1" x="208.28" y="116.84" rot="MR0"/>
-<instance part="U$74" gate="A" x="22.86" y="162.56"/>
+<instance part="J1" gate="A" x="22.86" y="162.56"/>
 <instance part="C17" gate="G$1" x="12.7" y="121.92"/>
 <instance part="U$78" gate="G$1" x="12.7" y="114.3"/>
 <instance part="R7" gate="G$1" x="236.22" y="121.92" rot="R90"/>
 <instance part="R8" gate="G$1" x="236.22" y="137.16" rot="R90"/>
 <instance part="U$56" gate="G$1" x="236.22" y="111.76"/>
-<instance part="U15" gate="G$1" x="327.66" y="40.64"/>
+<instance part="U3" gate="G$1" x="327.66" y="40.64"/>
 <instance part="GND13" gate="1" x="347.98" y="27.94"/>
 <instance part="C24" gate="G$1" x="358.14" y="33.02"/>
 <instance part="C25" gate="G$1" x="370.84" y="33.02"/>
@@ -3601,12 +3599,12 @@ DOPO: 0x0)</text>
 <instance part="U$3" gate="G$1" x="287.02" y="63.5" rot="MR0"/>
 <instance part="U$16" gate="G$1" x="294.64" y="63.5" rot="MR0"/>
 <instance part="U$17" gate="G$1" x="347.98" y="58.42" rot="MR0"/>
-<instance part="U$18" gate="G$1" x="259.08" y="129.54"/>
-<instance part="U$19" gate="G$1" x="33.02" y="86.36" rot="R270"/>
+<instance part="U5" gate="G$1" x="259.08" y="129.54"/>
+<instance part="J2" gate="G$1" x="33.02" y="86.36" rot="R270"/>
 <instance part="U$22" gate="G$1" x="33.02" y="99.06" rot="MR0"/>
 <instance part="U$23" gate="G$1" x="33.02" y="78.74"/>
 <instance part="U$24" gate="G$1" x="236.22" y="147.32" rot="MR0"/>
-<instance part="U$25" gate="G$1" x="287.02" y="142.24" rot="R90"/>
+<instance part="U4" gate="G$1" x="287.02" y="142.24" rot="R90"/>
 <instance part="C9" gate="G$1" x="279.4" y="134.62" rot="R270"/>
 <instance part="C10" gate="G$1" x="281.94" y="149.86" rot="R90"/>
 <instance part="U$27" gate="G$1" x="271.78" y="149.86" rot="R270"/>
@@ -3691,10 +3689,6 @@ DOPO: 0x0)</text>
 <wire x1="337.82" y1="96.52" x2="337.82" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$31" gate="G$1" pin="GND"/>
-<wire x1="266.7" y1="96.52" x2="266.7" y2="101.6" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="U$1" gate="G$1" pin="GND"/>
 <wire x1="73.66" y1="129.54" x2="71.12" y2="129.54" width="0.1524" layer="91"/>
 <wire x1="71.12" y1="129.54" x2="71.12" y2="116.84" width="0.1524" layer="91"/>
@@ -3706,7 +3700,7 @@ DOPO: 0x0)</text>
 <wire x1="66.04" y1="116.84" x2="66.04" y2="119.38" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$74" gate="A" pin="1"/>
+<pinref part="J1" gate="A" pin="1"/>
 <wire x1="27.94" y1="157.48" x2="30.48" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="U$6" gate="G$1" pin="GND"/>
 <wire x1="30.48" y1="157.48" x2="30.48" y2="154.94" width="0.1524" layer="91"/>
@@ -3722,7 +3716,7 @@ DOPO: 0x0)</text>
 <wire x1="236.22" y1="114.3" x2="236.22" y2="116.84" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U15" gate="G$1" pin="GND"/>
+<pinref part="U3" gate="G$1" pin="GND"/>
 <pinref part="GND13" gate="1" pin="GND"/>
 <wire x1="342.9" y1="35.56" x2="347.98" y2="35.56" width="0.1524" layer="91"/>
 <wire x1="347.98" y1="35.56" x2="347.98" y2="30.48" width="0.1524" layer="91"/>
@@ -3737,7 +3731,7 @@ DOPO: 0x0)</text>
 </segment>
 <segment>
 <pinref part="U$23" gate="G$1" pin="GND"/>
-<pinref part="U$19" gate="G$1" pin="-"/>
+<pinref part="J2" gate="G$1" pin="-"/>
 <wire x1="33.02" y1="81.28" x2="33.02" y2="82.55" width="0.1524" layer="91"/>
 </segment>
 <segment>
@@ -3760,7 +3754,7 @@ DOPO: 0x0)</text>
 <wire x1="116.84" y1="96.52" x2="83.82" y2="96.52" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$74" gate="A" pin="4"/>
+<pinref part="J1" gate="A" pin="4"/>
 <wire x1="27.94" y1="165.1" x2="45.72" y2="165.1" width="0.1524" layer="91"/>
 <label x="33.02" y="165.1" size="1.778" layer="95"/>
 </segment>
@@ -3774,7 +3768,7 @@ DOPO: 0x0)</text>
 <wire x1="119.38" y1="99.06" x2="83.82" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$74" gate="A" pin="5"/>
+<pinref part="J1" gate="A" pin="5"/>
 <wire x1="27.94" y1="167.64" x2="45.72" y2="167.64" width="0.1524" layer="91"/>
 <label x="33.02" y="167.64" size="1.778" layer="95"/>
 </segment>
@@ -3827,7 +3821,7 @@ DOPO: 0x0)</text>
 <wire x1="208.28" y1="114.3" x2="208.28" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$74" gate="A" pin="3"/>
+<pinref part="J1" gate="A" pin="3"/>
 <pinref part="U$4" gate="G$1" pin="1.8V"/>
 <wire x1="27.94" y1="162.56" x2="33.02" y2="162.56" width="0.1524" layer="91"/>
 </segment>
@@ -3842,7 +3836,7 @@ DOPO: 0x0)</text>
 <pinref part="U$16" gate="G$1" pin="1.8V"/>
 </segment>
 <segment>
-<pinref part="U15" gate="G$1" pin="VDD"/>
+<pinref part="U3" gate="G$1" pin="VDD"/>
 <wire x1="342.9" y1="45.72" x2="347.98" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="347.98" y1="45.72" x2="347.98" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="347.98" y1="40.64" x2="347.98" y2="45.72" width="0.1524" layer="91"/>
@@ -3853,13 +3847,13 @@ DOPO: 0x0)</text>
 <pinref part="C25" gate="G$1" pin="P$1"/>
 <wire x1="347.98" y1="45.72" x2="370.84" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="370.84" y1="45.72" x2="370.84" y2="38.1" width="0.1524" layer="91"/>
-<pinref part="U15" gate="G$1" pin="VDDIO"/>
+<pinref part="U3" gate="G$1" pin="VDDIO"/>
 <wire x1="342.9" y1="40.64" x2="347.98" y2="40.64" width="0.1524" layer="91"/>
 <junction x="347.98" y="40.64"/>
 <pinref part="U$17" gate="G$1" pin="1.8V"/>
 </segment>
 <segment>
-<pinref part="U$19" gate="G$1" pin="+"/>
+<pinref part="J2" gate="G$1" pin="+"/>
 <pinref part="U$22" gate="G$1" pin="1.8V"/>
 <wire x1="33.02" y1="90.17" x2="33.02" y2="96.52" width="0.1524" layer="91"/>
 </segment>
@@ -4090,13 +4084,10 @@ DOPO: 0x0)</text>
 <pinref part="C1" gate="G$1" pin="P$1"/>
 <wire x1="279.4" y1="111.76" x2="276.86" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="276.86" y1="111.76" x2="276.86" y2="106.68" width="0.1524" layer="91"/>
-<wire x1="259.08" y1="111.76" x2="266.7" y2="111.76" width="0.1524" layer="91"/>
 <label x="264.16" y="111.76" size="1.778" layer="95" ratio="11"/>
 <junction x="276.86" y="111.76"/>
-<wire x1="266.7" y1="111.76" x2="276.86" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="266.7" y1="106.68" x2="266.7" y2="111.76" width="0.1524" layer="91"/>
-<junction x="266.7" y="111.76"/>
-<pinref part="U$18" gate="G$1" pin="P$1"/>
+<wire x1="259.08" y1="111.76" x2="276.86" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="U5" gate="G$1" pin="P$1"/>
 <wire x1="259.08" y1="111.76" x2="259.08" y2="121.92" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -4172,7 +4163,7 @@ DOPO: 0x0)</text>
 <label x="327.66" y="139.7" size="1.778" layer="95"/>
 <wire x1="350.52" y1="139.7" x2="297.18" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="139.7" x2="297.18" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="U$25" gate="G$1" pin="1"/>
+<pinref part="U4" gate="G$1" pin="1"/>
 <wire x1="297.18" y1="134.62" x2="287.02" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="287.02" y1="134.62" x2="287.02" y2="137.16" width="0.1524" layer="91"/>
 <pinref part="C9" gate="G$1" pin="P$1"/>
@@ -4198,7 +4189,7 @@ DOPO: 0x0)</text>
 <wire x1="66.04" y1="129.54" x2="66.04" y2="137.16" width="0.1524" layer="91"/>
 <junction x="66.04" y="137.16"/>
 <label x="60.96" y="137.16" size="1.778" layer="95"/>
-<pinref part="U$74" gate="A" pin="2"/>
+<pinref part="J1" gate="A" pin="2"/>
 <wire x1="27.94" y1="160.02" x2="58.42" y2="160.02" width="0.1524" layer="91"/>
 <label x="33.02" y="160.02" size="1.778" layer="95"/>
 </segment>
@@ -4254,7 +4245,7 @@ DOPO: 0x0)</text>
 <label x="114.3" y="86.36" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U15" gate="G$1" pin="SDA"/>
+<pinref part="U3" gate="G$1" pin="SDA"/>
 <wire x1="312.42" y1="43.18" x2="294.64" y2="43.18" width="0.1524" layer="91"/>
 <label x="299.72" y="43.18" size="1.778" layer="95"/>
 <pinref part="R13" gate="G$1" pin="1"/>
@@ -4268,7 +4259,7 @@ DOPO: 0x0)</text>
 <label x="114.3" y="83.82" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U15" gate="G$1" pin="SCL"/>
+<pinref part="U3" gate="G$1" pin="SCL"/>
 <wire x1="312.42" y1="38.1" x2="287.02" y2="38.1" width="0.1524" layer="91"/>
 <label x="299.72" y="38.1" size="1.778" layer="95"/>
 <pinref part="R14" gate="G$1" pin="1"/>
@@ -4291,7 +4282,7 @@ DOPO: 0x0)</text>
 </net>
 <net name="RADIO_XOUT" class="0">
 <segment>
-<pinref part="U$25" gate="G$1" pin="2"/>
+<pinref part="U4" gate="G$1" pin="2"/>
 <wire x1="287.02" y1="147.32" x2="287.02" y2="149.86" width="0.1524" layer="91"/>
 <wire x1="287.02" y1="149.86" x2="297.18" y2="149.86" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="149.86" x2="297.18" y2="142.24" width="0.1524" layer="91"/>