diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -6,18 +6,18 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="4" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="0.25" altunitdist="mil" altunit="mil"/>
+<grid distance="12.5" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="0.25" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -157,6 +157,7 @@
 <text x="19.9136" y="6.8072" size="0.8128" layer="22" rot="MR90">GND</text>
 <text x="17.3736" y="6.8072" size="0.8128" layer="22" rot="MR90">TX</text>
 <text x="14.8336" y="6.8072" size="0.8128" layer="22" rot="MR90">RX</text>
+<text x="-17.4625" y="42.8625" size="1.778" layer="21">Could shift headers to the right to keep them away from the ICSP connector</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -285,92 +286,6 @@ Basic SMA packaged diode. Good for rever
 <text x="-2.286" y="1.651" size="0.4064" layer="25">&gt;NAME</text>
 <text x="0.254" y="1.651" size="0.4064" layer="27">&gt;VALUE</text>
 </package>
-<package name="1X10_LOCK">
-<wire x1="14.605" y1="1.27" x2="15.875" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="15.875" y1="1.27" x2="16.51" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="16.51" y1="-0.635" x2="15.875" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="11.43" y1="0.635" x2="12.065" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="12.065" y1="1.27" x2="13.335" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="13.335" y1="1.27" x2="13.97" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="13.97" y1="-0.635" x2="13.335" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="13.335" y1="-1.27" x2="12.065" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="12.065" y1="-1.27" x2="11.43" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="14.605" y1="1.27" x2="13.97" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="13.97" y1="-0.635" x2="14.605" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="15.875" y1="-1.27" x2="14.605" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="6.985" y1="1.27" x2="8.255" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="8.255" y1="1.27" x2="8.89" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="8.89" y1="-0.635" x2="8.255" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="8.89" y1="0.635" x2="9.525" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="9.525" y1="1.27" x2="10.795" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="10.795" y1="1.27" x2="11.43" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="11.43" y1="-0.635" x2="10.795" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="10.795" y1="-1.27" x2="9.525" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="9.525" y1="-1.27" x2="8.89" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="3.81" y1="0.635" x2="4.445" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="4.445" y1="1.27" x2="5.715" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="5.715" y1="1.27" x2="6.35" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="-0.635" x2="5.715" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="5.715" y1="-1.27" x2="4.445" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="4.445" y1="-1.27" x2="3.81" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="6.985" y1="1.27" x2="6.35" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="6.35" y1="-0.635" x2="6.985" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="8.255" y1="-1.27" x2="6.985" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="-0.635" y1="1.27" x2="0.635" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="0.635" y1="1.27" x2="1.27" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="1.27" y1="-0.635" x2="0.635" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="1.27" y1="0.635" x2="1.905" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="1.905" y1="1.27" x2="3.175" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="3.175" y1="1.27" x2="3.81" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="3.81" y1="-0.635" x2="3.175" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="3.175" y1="-1.27" x2="1.905" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="1.905" y1="-1.27" x2="1.27" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="-1.27" y1="0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="-0.635" y1="1.27" x2="-1.27" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="-1.27" y1="-0.635" x2="-0.635" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="0.635" y1="-1.27" x2="-0.635" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="17.145" y1="1.27" x2="18.415" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="18.415" y1="1.27" x2="19.05" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="19.05" y1="-0.635" x2="18.415" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="17.145" y1="1.27" x2="16.51" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="16.51" y1="-0.635" x2="17.145" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="18.415" y1="-1.27" x2="17.145" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="19.685" y1="1.27" x2="20.955" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="20.955" y1="1.27" x2="21.59" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="21.59" y1="-0.635" x2="20.955" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="19.685" y1="1.27" x2="19.05" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="19.05" y1="-0.635" x2="19.685" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="20.955" y1="-1.27" x2="19.685" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="22.225" y1="1.27" x2="23.495" y2="1.27" width="0.2032" layer="21"/>
-<wire x1="23.495" y1="1.27" x2="24.13" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="24.13" y1="0.635" x2="24.13" y2="-0.635" width="0.2032" layer="21"/>
-<wire x1="24.13" y1="-0.635" x2="23.495" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="22.225" y1="1.27" x2="21.59" y2="0.635" width="0.2032" layer="21"/>
-<wire x1="21.59" y1="-0.635" x2="22.225" y2="-1.27" width="0.2032" layer="21"/>
-<wire x1="23.495" y1="-1.27" x2="22.225" y2="-1.27" width="0.2032" layer="21"/>
-<pad name="1" x="0" y="0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="2" x="2.54" y="-0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="3" x="5.08" y="0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="4" x="7.62" y="-0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="5" x="10.16" y="0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="6" x="12.7" y="-0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="7" x="15.24" y="0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="8" x="17.78" y="-0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="9" x="20.32" y="0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<pad name="10" x="22.86" y="-0.127" drill="1.016" diameter="1.8796" rot="R90"/>
-<text x="-1.3462" y="1.8288" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-1.27" y="-3.175" size="1.27" layer="27">&gt;VALUE</text>
-<rectangle x1="14.986" y1="-0.254" x2="15.494" y2="0.254" layer="51"/>
-<rectangle x1="12.446" y1="-0.254" x2="12.954" y2="0.254" layer="51"/>
-<rectangle x1="9.906" y1="-0.254" x2="10.414" y2="0.254" layer="51"/>
-<rectangle x1="7.366" y1="-0.254" x2="7.874" y2="0.254" layer="51"/>
-<rectangle x1="4.826" y1="-0.254" x2="5.334" y2="0.254" layer="51"/>
-<rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
-<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
-<rectangle x1="17.526" y1="-0.254" x2="18.034" y2="0.254" layer="51"/>
-<rectangle x1="20.066" y1="-0.254" x2="20.574" y2="0.254" layer="51"/>
-<rectangle x1="22.606" y1="-0.254" x2="23.114" y2="0.254" layer="51"/>
-</package>
 <package name="CRYSTAL-SMD-5X3">
 <wire x1="-0.6" y1="1.6" x2="0.6" y2="1.6" width="0.2032" layer="21"/>
 <wire x1="2.5" y1="0.3" x2="2.5" y2="-0.3" width="0.2032" layer="21"/>
@@ -515,6 +430,34 @@ Basic SMA packaged diode. Good for rever
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 <rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
 </package>
+<package name="1X10-2MM">
+<wire x1="-1.25" y1="1.25" x2="19.25" y2="1.25" width="0.2032" layer="21"/>
+<wire x1="19.25" y1="-1.25" x2="-1.25" y2="-1.25" width="0.2032" layer="21"/>
+<wire x1="-1.25" y1="1.25" x2="-1.25" y2="-1.25" width="0.2032" layer="21"/>
+<wire x1="19.25" y1="1.25" x2="19.25" y2="-1.25" width="0.2032" layer="21"/>
+<pad name="1" x="0" y="0" drill="0.8" shape="square" rot="R90"/>
+<pad name="2" x="2" y="0" drill="0.8" rot="R90"/>
+<pad name="3" x="4" y="0" drill="0.8" rot="R90"/>
+<pad name="4" x="6" y="0" drill="0.8" rot="R90"/>
+<pad name="5" x="8" y="0" drill="0.8" rot="R90"/>
+<pad name="6" x="10" y="0" drill="0.8" rot="R90"/>
+<pad name="7" x="12" y="0" drill="0.8" rot="R90"/>
+<pad name="8" x="14" y="0" drill="0.8" rot="R90"/>
+<pad name="9" x="16" y="0" drill="0.8" rot="R90"/>
+<pad name="10" x="18" y="0" drill="0.8" rot="R90"/>
+<text x="-1.3462" y="1.8288" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-1.27" y="-3.175" size="1.27" layer="27">&gt;VALUE</text>
+<rectangle x1="3.746" y1="-0.254" x2="4.254" y2="0.254" layer="51"/>
+<rectangle x1="1.746" y1="-0.254" x2="2.254" y2="0.254" layer="51"/>
+<rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
+<rectangle x1="5.746" y1="-0.254" x2="6.254" y2="0.254" layer="51"/>
+<rectangle x1="7.746" y1="-0.254" x2="8.254" y2="0.254" layer="51"/>
+<rectangle x1="9.746" y1="-0.254" x2="10.254" y2="0.254" layer="51"/>
+<rectangle x1="11.746" y1="-0.254" x2="12.254" y2="0.254" layer="51"/>
+<rectangle x1="13.746" y1="-0.254" x2="14.254" y2="0.254" layer="51"/>
+<rectangle x1="15.746" y1="-0.254" x2="16.254" y2="0.254" layer="51"/>
+<rectangle x1="17.746" y1="-0.254" x2="18.254" y2="0.254" layer="51"/>
+</package>
 </packages>
 </library>
 <library name="atmel">
@@ -18254,20 +18197,6 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="18.034" y="31.242" size="1.27" layer="25" rot="R270"/>
 <attribute name="VALUE" x="11.684" y="31.242" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="17.78" y="36.83" locked="yes" smashed="yes">
-<attribute name="NAME" x="12.573" y="36.322" size="1.27" layer="25" ratio="10"/>
-<attribute name="VALUE" x="16.51" y="33.655" size="1.27" layer="27"/>
-<attribute name="OC_NEWARK" value="unknown" x="17.78" y="36.83" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="17.78" y="36.83" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="" x="17.78" y="36.83" size="1.778" layer="27" display="off"/>
-</element>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="17.78" y="2.54" locked="yes" smashed="yes">
-<attribute name="NAME" x="12.7762" y="2.032" size="1.27" layer="25" ratio="10"/>
-<attribute name="VALUE" x="16.51" y="-0.635" size="1.27" layer="27"/>
-<attribute name="OC_NEWARK" value="unknown" x="17.78" y="2.54" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="17.78" y="2.54" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="" x="17.78" y="2.54" size="1.778" layer="27" display="off"/>
-</element>
 <element name="C_CRYS2" library="SparkFun" package="0603-CAP" value="18pf" x="17.018" y="8.7884" smashed="yes" rot="R90">
 <attribute name="OC_NEWARK" value="unknown" x="17.018" y="8.7884" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MF" value="" x="17.018" y="8.7884" size="1.778" layer="27" rot="R90" display="off"/>
@@ -18497,6 +18426,8 @@ Please make sure your boards conform to 
 <element name="U$9" library="SeniorDesign" package="CU" value="" x="8.4328" y="24.6888" rot="R270"/>
 <element name="U$4" library="SeniorDesign" package="SLAVE-LOGO-SILK" value="" x="32.258" y="15.24" rot="MR0"/>
 <element name="JP4" library="SparkFun" package="1X04" value="" x="15.24" y="5.4864"/>
+<element name="JP3" library="SparkFun" package="1X10-2MM" value="M102MM" x="17.78" y="36.83"/>
+<element name="JP5" library="SparkFun" package="1X10-2MM" value="M102MM" x="17.78" y="2.54"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -18527,7 +18458,6 @@ Please make sure your boards conform to 
 <contactref element="U$1" pad="10"/>
 <contactref element="ROTARY_DIP" pad="C2"/>
 <contactref element="ROTARY_DIP" pad="C1"/>
-<contactref element="JP1" pad="1"/>
 <contactref element="ASSOC" pad="C"/>
 <contactref element="Q2" pad="E"/>
 <contactref element="R_HEAT" pad="1"/>
@@ -18541,7 +18471,6 @@ Please make sure your boards conform to 
 <contactref element="C19" pad="2"/>
 <wire x1="51.054" y1="3.6268" x2="51.054" y2="7.094" width="0.8128" layer="1"/>
 <wire x1="51.054" y1="7.094" x2="51.392" y2="7.432" width="0.8128" layer="1"/>
-<wire x1="57.774" y1="7.3652" x2="57.824" y2="7.4168" width="0.8128" layer="1"/>
 <wire x1="51.442" y1="7.482" x2="51.392" y2="7.432" width="0.8128" layer="1"/>
 <wire x1="25.273" y1="23.707" x2="25.273" y2="28.741" width="0.4064" layer="1"/>
 <wire x1="25.273" y1="28.741" x2="24.13" y2="29.884" width="0.4064" layer="1"/>
@@ -18551,7 +18480,6 @@ Please make sure your boards conform to 
 <wire x1="51.0032" y1="3.576" x2="51.054" y2="3.6268" width="0.6096" layer="1"/>
 <wire x1="37.934" y1="24.1808" x2="37.934" y2="22.098" width="0.4064" layer="1"/>
 <wire x1="37.934" y1="22.098" x2="37.934" y2="20.1168" width="0.4064" layer="1"/>
-<wire x1="45.1104" y1="34.4043" x2="45.5803" y2="34.4805" width="0.4064" layer="1"/>
 <polygon width="0.4064" layer="16" isolate="0.254">
 <vertex x="-2.4384" y="42.2656"/>
 <vertex x="-2.4384" y="-2.4384"/>
@@ -18573,7 +18501,6 @@ Please make sure your boards conform to 
 <wire x1="26.1112" y1="12.0688" x2="26.073" y2="12.107" width="0.4064" layer="1"/>
 <wire x1="14.2548" y1="28.6512" x2="14.204" y2="28.702" width="0.4064" layer="1"/>
 <wire x1="54.3814" y1="34.4043" x2="45.1104" y2="34.4043" width="0.4064" layer="1"/>
-<wire x1="54.3814" y1="34.4043" x2="54.7243" y2="34.4805" width="0.4064" layer="1"/>
 <wire x1="55.626" y1="26.416" x2="55.4736" y2="26.416" width="0.8128" layer="1"/>
 <wire x1="55.4736" y1="26.416" x2="55.4736" y2="27.0256" width="0.8128" layer="1"/>
 <wire x1="55.4736" y1="27.0256" x2="53.026" y2="27.0256" width="0.8128" layer="1"/>
@@ -18594,11 +18521,12 @@ Please make sure your boards conform to 
 <via x="33.8328" y="13.1064" extent="1-16" drill="0.254"/>
 <contactref element="C6" pad="2"/>
 <contactref element="C3" pad="2"/>
-<via x="21.9456" y="8.5344" extent="1-16" drill="0.254"/>
+<via x="21.9456" y="7.8994" extent="1-16" drill="0.254"/>
 <via x="26.8224" y="18.796" extent="1-16" drill="0.254"/>
 <contactref element="R4" pad="1"/>
 <contactref element="JP4" pad="3"/>
 <via x="1.1176" y="23.4696" extent="1-16" drill="0.254"/>
+<contactref element="JP5" pad="1"/>
 </signal>
 <signal name="VCC">
 <contactref element="IC1" pad="38"/>
@@ -18615,13 +18543,11 @@ Please make sure your boards conform to 
 <contactref element="R_SDA" pad="2"/>
 <contactref element="R_SCL" pad="2"/>
 <contactref element="ICSP" pad="2"/>
-<contactref element="JP1" pad="3"/>
 <contactref element="U$1" pad="1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="TEMP" pad="1"/>
 <contactref element="C19" pad="1"/>
-<wire x1="59.574" y1="7.3652" x2="59.524" y2="7.4168" width="0.8128" layer="1"/>
 <wire x1="60.888" y1="16.002" x2="60.888" y2="14.66" width="0.8128" layer="1"/>
 <via x="57.912" y="16.002" extent="1-16" drill="0.762"/>
 <wire x1="57.912" y1="16.002" x2="60.888" y2="16.002" width="0.8128" layer="1"/>
@@ -18646,39 +18572,33 @@ Please make sure your boards conform to 
 <wire x1="52.1462" y1="24.511" x2="51.4096" y2="23.7744" width="0.4064" layer="1"/>
 <via x="51.4096" y="23.7744" extent="1-16" drill="0.254"/>
 <wire x1="15.328" y1="20.066" x2="15.328" y2="20.232" width="0.4064" layer="1"/>
-<wire x1="15.328" y1="20.232" x2="14.0208" y2="21.5392" width="0.4064" layer="1"/>
-<wire x1="14.0208" y1="21.5392" x2="13.8176" y2="21.756" width="0.4064" layer="1"/>
-<wire x1="13.8176" y1="21.756" x2="13.628" y2="22.1488" width="0.4064" layer="1"/>
+<wire x1="15.328" y1="20.232" x2="13.4112" y2="22.1488" width="0.4064" layer="1"/>
 <wire x1="9.3472" y1="32.004" x2="11.3792" y2="29.972" width="0.4064" layer="1"/>
 <wire x1="11.3792" y1="29.972" x2="11.3792" y2="29.8568" width="0.4064" layer="1"/>
 <wire x1="11.3792" y1="29.8568" x2="11.684" y2="29.552" width="0.4064" layer="1"/>
 <wire x1="25.1968" y1="12.1832" x2="25.1968" y2="15.748" width="0.4064" layer="1"/>
 <wire x1="25.1968" y1="15.748" x2="26.0096" y2="16.5608" width="0.4064" layer="1"/>
-<wire x1="16.6498" y1="18.707" x2="15.748" y2="19.6088" width="0.4064" layer="1"/>
-<wire x1="15.748" y1="19.6088" x2="15.4432" y2="19.9508" width="0.4064" layer="1"/>
+<wire x1="16.6498" y1="18.707" x2="15.3416" y2="20.0152" width="0.4064" layer="1"/>
 <wire x1="15.4432" y1="19.9508" x2="15.328" y2="20.066" width="0.4064" layer="1"/>
 <wire x1="19.473" y1="18.707" x2="16.6498" y2="18.707" width="0.4064" layer="1"/>
-<wire x1="15.748" y1="19.6088" x2="15.3416" y2="20.0152" width="0.4064" layer="1"/>
 <wire x1="15.3416" y1="20.0152" x2="15.3416" y2="20.2184" width="0.4064" layer="1"/>
-<wire x1="15.3416" y1="20.2184" x2="13.4112" y2="22.1488" width="0.4064" layer="1"/>
+<wire x1="15.3416" y1="20.2184" x2="15.328" y2="20.232" width="0.4064" layer="1"/>
 <wire x1="13.4112" y1="22.1488" x2="13.3096" y2="22.1488" width="0.4064" layer="1"/>
 <wire x1="13.3096" y1="22.1488" x2="12.8016" y2="22.6568" width="0.4064" layer="1"/>
 <wire x1="12.8016" y1="22.6568" x2="3.2512" y2="22.6568" width="0.4064" layer="1"/>
 <wire x1="3.2512" y1="22.6568" x2="1.016" y2="24.892" width="0.4064" layer="1"/>
 <wire x1="1.016" y1="24.892" x2="1.016" y2="28.448" width="0.4064" layer="1"/>
 <wire x1="1.016" y1="28.448" x2="2.032" y2="29.464" width="0.4064" layer="1"/>
-<wire x1="2.032" y1="29.464" x2="2.6416" y2="29.972" width="0.4064" layer="1"/>
-<wire x1="2.6416" y1="29.972" x2="2.794" y2="29.8196" width="0.4064" layer="1"/>
 <wire x1="57.912" y1="16.002" x2="57.912" y2="9.537" width="0.8128" layer="16"/>
 <wire x1="57.912" y1="16.002" x2="56.8452" y2="16.002" width="0.4064" layer="16"/>
 <wire x1="56.8452" y1="16.002" x2="49.784" y2="23.0632" width="0.4064" layer="16"/>
 <wire x1="51.4096" y1="23.7744" x2="50.4952" y2="23.7744" width="0.4064" layer="16"/>
 <wire x1="50.4952" y1="23.7744" x2="49.784" y2="23.0632" width="0.4064" layer="16"/>
-<wire x1="6.096" y1="19.812" x2="1.0668" y2="24.8412" width="0.4064" layer="16"/>
-<wire x1="1.0668" y1="24.8412" x2="1.0668" y2="28.4988" width="0.4064" layer="16"/>
+<wire x1="6.096" y1="19.812" x2="1.0668" y2="24.8412" width="0.6096" layer="16"/>
+<wire x1="1.0668" y1="24.8412" x2="1.0668" y2="28.4988" width="0.6096" layer="16"/>
 <wire x1="1.0668" y1="28.4988" x2="1.1176" y2="28.5496" width="0.4064" layer="16"/>
 <wire x1="1.1176" y1="28.5496" x2="1.16256875" y2="28.5496" width="0.4064" layer="16"/>
-<wire x1="1.16256875" y1="28.5496" x2="2.301821875" y2="29.688853125" width="0.4064" layer="16"/>
+<wire x1="1.16256875" y1="28.5496" x2="2.301821875" y2="29.688853125" width="0.6096" layer="16"/>
 <wire x1="2.301821875" y1="29.688853125" x2="2.663253125" y2="29.688853125" width="0.4064" layer="16"/>
 <wire x1="2.663253125" y1="29.688853125" x2="2.794" y2="29.8196" width="0.4064" layer="16"/>
 <wire x1="36.234" y1="24.1808" x2="36.234" y2="24.3468" width="0.4064" layer="1"/>
@@ -18691,17 +18611,10 @@ Please make sure your boards conform to 
 <wire x1="60.888" y1="14.66" x2="60.3504" y2="14.66" width="0.8128" layer="1"/>
 <wire x1="60.3504" y1="14.66" x2="60.3504" y2="9.2456" width="0.8128" layer="1"/>
 <wire x1="60.3504" y1="9.2456" x2="60.1248" y2="9.2456" width="0.8128" layer="1"/>
-<wire x1="60.1248" y1="9.2456" x2="60.1248" y2="9.4488" width="0.8128" layer="1"/>
 <wire x1="59.574" y1="7.3652" x2="59.5876" y2="7.3652" width="0.4064" layer="1"/>
-<wire x1="60.1472" y1="9.1216" x2="60.1248" y2="9.4488" width="0.4064" layer="1"/>
-<wire x1="60.1472" y1="8.0264" x2="60.1472" y2="9.3248" width="0.4064" layer="1"/>
-<wire x1="60.1472" y1="9.3248" x2="60.1248" y2="9.4488" width="0.4064" layer="1"/>
 <wire x1="60.1472" y1="8.0264" x2="60.1336" y2="8.0264" width="0.4064" layer="1"/>
 <wire x1="60.1336" y1="8.0264" x2="59.524" y2="7.4168" width="0.4064" layer="1"/>
 <wire x1="57.912" y1="9.537" x2="55.56" y2="7.185" width="0.8128" layer="16"/>
-<wire x1="22.86" y1="2.667" x2="22.86" y2="2.032" width="0.6096" layer="16"/>
-<wire x1="22.86" y1="2.032" x2="24.0792" y2="0.8128" width="0.6096" layer="16"/>
-<wire x1="24.0792" y1="0.8128" x2="52.324" y2="0.8128" width="0.6096" layer="16"/>
 <wire x1="52.324" y1="0.8128" x2="55.5752" y2="4.064" width="0.6096" layer="16"/>
 <wire x1="55.5752" y1="4.064" x2="55.5752" y2="7.185" width="0.6096" layer="16"/>
 <wire x1="55.5752" y1="7.185" x2="55.5752" y2="7.2136" width="0.6096" layer="16"/>
@@ -18715,29 +18628,41 @@ Please make sure your boards conform to 
 <wire x1="43.2816" y1="25.0952" x2="43.688" y2="24.6888" width="0.4064" layer="1"/>
 <via x="43.688" y="24.6888" extent="1-16" drill="0.254"/>
 <wire x1="43.688" y1="24.6888" x2="48.1584" y2="24.6888" width="0.4064" layer="16"/>
-<wire x1="6.096" y1="19.812" x2="6.096" y2="6.9088" width="0.4064" layer="16"/>
-<wire x1="6.096" y1="6.9088" x2="10.0584" y2="2.9464" width="0.4064" layer="16"/>
-<wire x1="10.0584" y1="2.9464" x2="14.4272" y2="2.9464" width="0.4064" layer="16"/>
+<wire x1="6.096" y1="19.812" x2="6.096" y2="6.9088" width="0.6096" layer="16"/>
 <contactref element="JP4" pad="4"/>
-<wire x1="22.86" y1="2.667" x2="21.1074" y2="0.9144" width="0.4064" layer="16"/>
-<wire x1="21.1074" y1="0.9144" x2="16.4592" y2="0.9144" width="0.4064" layer="16"/>
-<wire x1="16.4592" y1="0.9144" x2="14.4272" y2="2.9464" width="0.4064" layer="16"/>
-<wire x1="22.86" y1="2.667" x2="22.86" y2="5.4864" width="0.4064" layer="16"/>
+<contactref element="JP5" pad="3"/>
+<wire x1="21.7424" y1="2.5024" x2="21.78" y2="2.54" width="0.4064" layer="16"/>
+<wire x1="21.78" y1="2.54" x2="21.78" y2="4.4064" width="0.4064" layer="16"/>
+<wire x1="21.78" y1="4.4064" x2="22.86" y2="5.4864" width="0.4064" layer="16"/>
+<wire x1="52.324" y1="0.8128" x2="21.78" y2="0.8128" width="0.6096" layer="16"/>
+<wire x1="21.78" y1="0.8128" x2="21.78" y2="2.54" width="0.6096" layer="16"/>
+<wire x1="21.78" y1="0.8128" x2="12.192" y2="0.8128" width="0.6096" layer="16"/>
+<wire x1="12.192" y1="0.8128" x2="6.096" y2="6.9088" width="0.6096" layer="16"/>
+<wire x1="13.628" y1="22.1488" x2="13.4112" y2="22.1488" width="0.4064" layer="1"/>
+<wire x1="2.032" y1="29.464" x2="2.4384" y2="29.464" width="0.4064" layer="1"/>
+<wire x1="2.4384" y1="29.464" x2="2.794" y2="29.8196" width="0.4064" layer="1"/>
+<wire x1="60.1472" y1="8.0264" x2="60.1472" y2="9.4264" width="0.4064" layer="1"/>
+<wire x1="60.1472" y1="9.4264" x2="60.1248" y2="9.4488" width="0.4064" layer="1"/>
+<wire x1="15.328" y1="20.066" x2="15.328" y2="20.0288" width="0.4064" layer="1"/>
+<wire x1="15.328" y1="20.0288" x2="15.3416" y2="20.0152" width="0.4064" layer="1"/>
+<wire x1="59.524" y1="7.4168" x2="59.536" y2="7.4168" width="0.4064" layer="1"/>
+<wire x1="59.536" y1="7.4168" x2="59.5876" y2="7.3652" width="0.4064" layer="1"/>
+<wire x1="60.1248" y1="9.2456" x2="60.1248" y2="9.4488" width="0.4064" layer="1"/>
 </signal>
 <signal name="RESET">
 <contactref element="R1" pad="2"/>
 <contactref element="IC1" pad="4"/>
 <contactref element="ICSP" pad="5"/>
 <wire x1="19.473" y1="19.507" x2="17.7802" y2="19.507" width="0.4064" layer="1"/>
-<wire x1="17.7802" y1="19.507" x2="15.6464" y2="21.6408" width="0.4064" layer="1"/>
-<wire x1="15.6464" y1="21.6408" x2="15.4432" y2="21.8304" width="0.4064" layer="1"/>
-<wire x1="15.4432" y1="21.8304" x2="15.328" y2="22.1488" width="0.4064" layer="1"/>
+<wire x1="17.7802" y1="19.507" x2="15.3289" y2="21.9583" width="0.4064" layer="1"/>
 <wire x1="15.328" y1="22.1488" x2="15.328" y2="22.264" width="0.4064" layer="1"/>
 <wire x1="15.328" y1="22.264" x2="14.1224" y2="23.4696" width="0.4064" layer="1"/>
 <wire x1="14.1224" y1="23.4696" x2="7.9248" y2="23.4696" width="0.4064" layer="1"/>
 <via x="7.9248" y="23.4696" extent="1-16" drill="0.254"/>
 <wire x1="7.9248" y1="23.4696" x2="7.9248" y2="27.2288" width="0.4064" layer="16"/>
 <wire x1="7.9248" y1="27.2288" x2="7.874" y2="27.2796" width="0.4064" layer="16"/>
+<wire x1="15.3289" y1="21.9583" x2="15.3289" y2="22.1479" width="0.4064" layer="1"/>
+<wire x1="15.3289" y1="22.1479" x2="15.328" y2="22.1488" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="BATT" pad="1"/>
@@ -18749,7 +18674,6 @@ Please make sure your boards conform to 
 <contactref element="Q6" pad="2"/>
 <contactref element="3.3V_SWITCHING" pad="8"/>
 <contactref element="3.3V_SWITCHING" pad="7"/>
-<contactref element="JP1" pad="2"/>
 <contactref element="R10" pad="2"/>
 <contactref element="Q1" pad="2"/>
 <wire x1="51.392" y1="9.332" x2="53.782" y2="9.332" width="0.8128" layer="1"/>
@@ -18758,8 +18682,8 @@ Please make sure your boards conform to 
 <wire x1="62.23" y1="25.8064" x2="61.087" y2="26.9494" width="0.8128" layer="1"/>
 <wire x1="61.087" y1="26.9494" x2="60.96" y2="27.0764" width="0.8128" layer="1"/>
 <wire x1="60.96" y1="27.0764" x2="58.353" y2="27.0764" width="0.8128" layer="1"/>
-<wire x1="42.9616" y1="8.652" x2="42.9616" y2="6.196" width="0.6096" layer="1"/>
-<wire x1="42.9616" y1="6.196" x2="42.6584" y2="6.35" width="0.6096" layer="1"/>
+<wire x1="42.9616" y1="8.652" x2="42.9616" y2="6.35" width="0.6096" layer="1"/>
+<wire x1="42.9616" y1="6.35" x2="42.9616" y2="6.196" width="0.6096" layer="1"/>
 <wire x1="42.9616" y1="8.652" x2="46.498" y2="8.652" width="0.6096" layer="1"/>
 <wire x1="46.498" y1="8.652" x2="47.498" y2="9.652" width="0.6096" layer="1"/>
 <wire x1="47.498" y1="9.652" x2="51.072" y2="9.652" width="0.6096" layer="1"/>
@@ -18769,10 +18693,8 @@ Please make sure your boards conform to 
 <wire x1="55.372" y1="11.176" x2="55.372" y2="17.272" width="0.8128" layer="1"/>
 <wire x1="55.372" y1="17.272" x2="56.896" y2="18.796" width="0.8128" layer="1"/>
 <wire x1="56.896" y1="18.796" x2="60.452" y2="18.796" width="0.8128" layer="1"/>
-<wire x1="58.353" y1="27.0764" x2="58.226" y2="27.051" width="0.4064" layer="1"/>
-<wire x1="20.32" y1="2.413" x2="20.32" y2="1.4224" width="0.6096" layer="1"/>
-<wire x1="20.32" y1="1.4224" x2="20.9296" y2="0.8128" width="0.6096" layer="1"/>
-<wire x1="20.9296" y1="0.8128" x2="41.8592" y2="0.8128" width="0.6096" layer="1"/>
+<wire x1="19.8374" y1="2.54" x2="21.5646" y2="0.8128" width="0.6096" layer="1"/>
+<wire x1="21.5646" y1="0.8128" x2="41.8592" y2="0.8128" width="0.6096" layer="1"/>
 <wire x1="41.8592" y1="0.8128" x2="42.672" y2="1.6256" width="0.6096" layer="1"/>
 <wire x1="42.672" y1="1.6256" x2="42.672" y2="6.3364" width="0.6096" layer="1"/>
 <wire x1="42.672" y1="6.3364" x2="42.6584" y2="6.35" width="0.6096" layer="1"/>
@@ -18783,15 +18705,20 @@ Please make sure your boards conform to 
 <wire x1="61.1408" y1="29.3624" x2="61.1408" y2="27.0032" width="0.6096" layer="1"/>
 <wire x1="61.1408" y1="27.0032" x2="61.087" y2="26.9494" width="0.6096" layer="1"/>
 <contactref element="R3" pad="2"/>
-<wire x1="35.8276" y1="32.1056" x2="35.9664" y2="32.3088" width="0.4064" layer="1"/>
 <via x="35.8648" y="33.1216" extent="1-16" drill="0.254"/>
 <wire x1="36.9824" y1="34.2392" x2="55.372" y2="34.2392" width="0.4064" layer="16"/>
-<wire x1="35.8648" y1="33.1216" x2="35.8276" y2="32.9828" width="0.4064" layer="1"/>
-<wire x1="35.8276" y1="32.9828" x2="35.8276" y2="32.1056" width="0.4064" layer="1"/>
+<wire x1="35.8276" y1="33.0844" x2="35.8276" y2="32.1056" width="0.4064" layer="1"/>
 <wire x1="55.372" y1="34.2392" x2="60.2488" y2="29.3624" width="0.4064" layer="16"/>
 <via x="60.2488" y="29.3624" extent="1-16" drill="0.254"/>
 <wire x1="60.2488" y1="29.3624" x2="61.1408" y2="29.3624" width="0.4064" layer="1"/>
 <wire x1="35.8648" y1="33.1216" x2="36.9824" y2="34.2392" width="0.4064" layer="16"/>
+<contactref element="JP5" pad="2"/>
+<wire x1="19.78" y1="2.54" x2="19.8374" y2="2.54" width="0.6096" layer="1"/>
+<wire x1="42.672" y1="6.3364" x2="42.948" y2="6.3364" width="0.4064" layer="1"/>
+<wire x1="42.948" y1="6.3364" x2="42.9616" y2="6.35" width="0.4064" layer="1"/>
+<wire x1="58.226" y1="27.051" x2="58.3276" y2="27.051" width="0.4064" layer="1"/>
+<wire x1="58.3276" y1="27.051" x2="58.353" y2="27.0764" width="0.4064" layer="1"/>
+<wire x1="35.8276" y1="33.0844" x2="35.8648" y2="33.1216" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="R2" pad="2"/>
@@ -18832,7 +18759,6 @@ Please make sure your boards conform to 
 </signal>
 <signal name="SDA">
 <contactref element="IC1" pad="20"/>
-<contactref element="JP2" pad="2"/>
 <contactref element="TEMP" pad="5"/>
 <contactref element="R_SDA" pad="1"/>
 <wire x1="16.794" y1="29.652" x2="16.4744" y2="29.652" width="0.4064" layer="1"/>
@@ -18840,7 +18766,6 @@ Please make sure your boards conform to 
 <wire x1="16.0528" y1="30.0736" x2="16.0528" y2="32.1428" width="0.4064" layer="1"/>
 <wire x1="16.0528" y1="32.1428" x2="17.272" y2="33.362" width="0.4064" layer="1"/>
 <wire x1="17.272" y1="33.362" x2="17.272" y2="33.655" width="0.4064" layer="1"/>
-<wire x1="17.272" y1="33.655" x2="20.32" y2="36.703" width="0.4064" layer="1"/>
 <wire x1="16.794" y1="29.652" x2="18.1712" y2="29.652" width="0.4064" layer="1"/>
 <wire x1="18.1712" y1="29.652" x2="18.8976" y2="30.3784" width="0.4064" layer="1"/>
 <via x="18.8976" y="30.3784" extent="1-16" drill="0.254"/>
@@ -18856,21 +18781,21 @@ Please make sure your boards conform to 
 <via x="27.6352" y="14.3256" extent="1-16" drill="0.254"/>
 <wire x1="27.6352" y1="14.3256" x2="27.6352" y2="12.1448" width="0.4064" layer="1"/>
 <wire x1="27.6352" y1="12.1448" x2="27.673" y2="12.107" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="2"/>
+<wire x1="17.272" y1="33.655" x2="19.78" y2="36.163" width="0.4064" layer="1"/>
+<wire x1="19.78" y1="36.163" x2="19.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="SCL">
 <contactref element="IC1" pad="19"/>
-<contactref element="JP2" pad="1"/>
 <contactref element="TEMP" pad="4"/>
 <contactref element="R_SCL" pad="1"/>
 <wire x1="13.9192" y1="33.362" x2="14.185" y2="33.362" width="0.4064" layer="1"/>
-<wire x1="14.185" y1="33.362" x2="17.78" y2="36.957" width="0.4064" layer="1"/>
 <wire x1="16.794" y1="27.752" x2="16.5456" y2="27.752" width="0.4064" layer="1"/>
-<wire x1="15.24" y1="32.1056" x2="14.4272" y2="32.9184" width="0.4064" layer="1"/>
-<wire x1="14.4272" y1="32.9184" x2="13.9564" y2="33.3248" width="0.4064" layer="1"/>
 <wire x1="13.9564" y1="33.3248" x2="13.9192" y2="33.362" width="0.4064" layer="1"/>
 <wire x1="15.24" y1="29.306" x2="16.794" y2="27.752" width="0.4064" layer="1"/>
-<wire x1="15.24" y1="32.1056" x2="15.24" y2="29.306" width="0.4064" layer="1"/>
 <via x="18.8976" y="29.1592" extent="1-16" drill="0.254"/>
+<wire x1="15.24" y1="34.29" x2="15.24" y2="33.3375" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="33.3375" x2="15.24" y2="29.306" width="0.4064" layer="1"/>
 <wire x1="18.8976" y1="29.1592" x2="30.0736" y2="29.1592" width="0.4064" layer="16"/>
 <via x="30.0736" y="29.1592" extent="1-16" drill="0.254"/>
 <wire x1="30.0736" y1="29.1592" x2="30.2768" y2="28.956" width="0.4064" layer="1"/>
@@ -18885,87 +18810,82 @@ Please make sure your boards conform to 
 <wire x1="26.8224" y1="14.5288" x2="26.8224" y2="12.5984" width="0.4064" layer="1"/>
 <wire x1="26.8224" y1="12.5984" x2="26.873" y2="12.5984" width="0.4064" layer="1"/>
 <wire x1="26.873" y1="12.5984" x2="26.873" y2="12.107" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="1"/>
+<wire x1="17.78" y1="36.83" x2="15.24" y2="34.29" width="0.4064" layer="1"/>
+<wire x1="14.185" y1="33.362" x2="14.2095" y2="33.3375" width="0.4064" layer="1"/>
+<wire x1="14.2095" y1="33.3375" x2="15.24" y2="33.3375" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA0">
 <contactref element="IC1" pad="37"/>
-<contactref element="JP2" pad="3"/>
-<wire x1="22.86" y1="36.957" x2="22.86" y2="36.83" width="0.3048" layer="1"/>
-<wire x1="22.86" y1="36.83" x2="26.924" y2="32.766" width="0.4064" layer="1"/>
-<wire x1="26.924" y1="32.766" x2="26.924" y2="23.758" width="0.4064" layer="1"/>
+<wire x1="26.924" y1="31.686" x2="26.924" y2="23.758" width="0.4064" layer="1"/>
 <wire x1="26.924" y1="23.758" x2="26.873" y2="23.707" width="0.3048" layer="1"/>
+<contactref element="JP3" pad="3"/>
+<wire x1="26.924" y1="31.686" x2="21.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA1">
 <contactref element="IC1" pad="36"/>
-<contactref element="JP2" pad="4"/>
-<wire x1="27.673" y1="23.707" x2="27.673" y2="34.43" width="0.4064" layer="1"/>
-<wire x1="27.673" y1="34.43" x2="25.4" y2="36.703" width="0.4064" layer="1"/>
+<wire x1="27.673" y1="23.707" x2="27.673" y2="32.937" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="4"/>
+<wire x1="27.673" y1="32.937" x2="23.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA2">
 <contactref element="IC1" pad="35"/>
-<contactref element="JP2" pad="5"/>
-<wire x1="28.473" y1="23.707" x2="28.473" y2="36.424" width="0.4064" layer="1"/>
-<wire x1="28.473" y1="36.424" x2="27.94" y2="36.957" width="0.4064" layer="1"/>
+<wire x1="28.473" y1="23.707" x2="28.473" y2="34.137" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="5"/>
+<wire x1="28.473" y1="34.137" x2="25.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA3">
 <contactref element="IC1" pad="34"/>
-<contactref element="JP2" pad="6"/>
-<wire x1="29.273" y1="23.707" x2="29.273" y2="34.4546" width="0.4064" layer="1"/>
-<wire x1="29.273" y1="34.4546" x2="30.48" y2="35.6616" width="0.4064" layer="1"/>
-<wire x1="30.48" y1="35.6616" x2="30.48" y2="36.703" width="0.4064" layer="1"/>
+<wire x1="29.273" y1="23.707" x2="29.273" y2="35.337" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="6"/>
+<wire x1="29.273" y1="35.337" x2="27.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA4">
 <contactref element="IC1" pad="33"/>
-<contactref element="JP2" pad="7"/>
 <wire x1="31.073" y1="21.907" x2="31.8638" y2="21.907" width="0.4064" layer="1"/>
 <wire x1="31.8638" y1="21.907" x2="32.2072" y2="22.2504" width="0.4064" layer="1"/>
-<wire x1="32.2072" y1="22.2504" x2="32.2072" y2="34.7472" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="35.56" x2="33.02" y2="36.957" width="0.4064" layer="1"/>
-<wire x1="32.2072" y1="34.7472" x2="33.02" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="32.2072" y1="22.2504" x2="32.2072" y2="34.4297" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="7"/>
+<wire x1="32.2072" y1="34.4297" x2="29.8069" y2="36.83" width="0.4064" layer="1"/>
+<wire x1="29.8069" y1="36.83" x2="29.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA5">
 <contactref element="IC1" pad="32"/>
-<contactref element="JP2" pad="8"/>
 <wire x1="31.073" y1="21.107" x2="32.1814" y2="21.107" width="0.4064" layer="1"/>
 <wire x1="32.1814" y1="21.107" x2="33.02" y2="21.9456" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="21.9456" x2="33.02" y2="34.3408" width="0.4064" layer="1"/>
-<wire x1="35.56" y1="35.56" x2="35.56" y2="36.703" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="34.3408" x2="33.9344" y2="35.2552" width="0.4064" layer="1"/>
-<wire x1="33.9344" y1="35.2552" x2="35.2552" y2="35.2552" width="0.4064" layer="1"/>
-<wire x1="35.2552" y1="35.2552" x2="35.56" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="33.02" y1="21.9456" x2="33.02" y2="35.59" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="8"/>
+<wire x1="33.02" y1="35.59" x2="31.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA6">
 <contactref element="IC1" pad="31"/>
-<contactref element="JP2" pad="9"/>
-<wire x1="38.1" y1="36.957" x2="38.1" y2="35.56" width="0.4064" layer="1"/>
 <wire x1="31.073" y1="20.307" x2="32.499" y2="20.307" width="0.4064" layer="1"/>
 <wire x1="32.499" y1="20.307" x2="33.8328" y2="21.6408" width="0.4064" layer="1"/>
-<wire x1="33.8328" y1="21.6408" x2="33.8328" y2="33.9344" width="0.4064" layer="1"/>
-<wire x1="33.8328" y1="33.9344" x2="34.4424" y2="34.544" width="0.4064" layer="1"/>
-<wire x1="34.4424" y1="34.544" x2="37.084" y2="34.544" width="0.4064" layer="1"/>
-<wire x1="37.084" y1="34.544" x2="38.1" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="33.8328" y1="21.6408" x2="33.8328" y2="36.7772" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="9"/>
+<wire x1="33.8328" y1="36.7772" x2="33.78" y2="36.83" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA7">
 <contactref element="IC1" pad="30"/>
-<contactref element="JP2" pad="10"/>
-<wire x1="40.64" y1="36.703" x2="40.64" y2="35.56" width="0.4064" layer="1"/>
 <wire x1="31.073" y1="19.507" x2="32.9182" y2="19.507" width="0.4064" layer="1"/>
 <wire x1="32.9182" y1="19.507" x2="34.6456" y2="21.2344" width="0.4064" layer="1"/>
-<wire x1="34.6456" y1="21.2344" x2="34.6456" y2="33.528" width="0.4064" layer="1"/>
-<wire x1="34.6456" y1="33.528" x2="34.9504" y2="33.8328" width="0.4064" layer="1"/>
-<wire x1="34.9504" y1="33.8328" x2="37.4904" y2="33.8328" width="0.4064" layer="1"/>
-<wire x1="37.4904" y1="33.8328" x2="38.9128" y2="33.8328" width="0.4064" layer="1"/>
-<wire x1="38.9128" y1="33.8328" x2="40.64" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="34.6456" y1="21.2344" x2="34.6456" y2="33.8455" width="0.4064" layer="1"/>
+<wire x1="34.6456" y1="33.8455" x2="34.6329" y2="33.8328" width="0.4064" layer="1"/>
+<wire x1="34.6329" y1="33.8328" x2="37.4904" y2="33.8328" width="0.4064" layer="1"/>
 <contactref element="R3" pad="1"/>
 <contactref element="R4" pad="2"/>
-<wire x1="37.5276" y1="30.5816" x2="37.4904" y2="30.7204" width="0.4064" layer="1"/>
 <wire x1="37.4904" y1="30.7204" x2="37.4904" y2="32.1056" width="0.4064" layer="1"/>
 <wire x1="37.4904" y1="32.1056" x2="37.4904" y2="33.8328" width="0.4064" layer="1"/>
 <wire x1="37.5276" y1="32.1056" x2="37.4904" y2="32.1056" width="0.4064" layer="1"/>
+<contactref element="JP3" pad="10"/>
+<wire x1="34.6329" y1="33.8328" x2="34.6329" y2="35.6829" width="0.4064" layer="1"/>
+<wire x1="34.6329" y1="35.6829" x2="35.78" y2="36.83" width="0.4064" layer="1"/>
+<wire x1="37.4904" y1="30.7204" x2="37.5276" y2="30.6832" width="0.4064" layer="1"/>
+<wire x1="37.5276" y1="30.6832" x2="37.5276" y2="30.5816" width="0.4064" layer="1"/>
 </signal>
 <signal name="SCK">
 <contactref element="IC1" pad="3"/>
 <contactref element="ICSP" pad="3"/>
-<contactref element="JP1" pad="6"/>
 <wire x1="19.473" y1="20.307" x2="18.0978" y2="20.307" width="0.4064" layer="1"/>
 <wire x1="18.0978" y1="20.307" x2="16.3576" y2="22.0472" width="0.4064" layer="1"/>
 <wire x1="16.3576" y1="22.0472" x2="16.3576" y2="23.2664" width="0.4064" layer="1"/>
@@ -18978,14 +18898,15 @@ Please make sure your boards conform to 
 <wire x1="20.333" y1="20.307" x2="21.844" y2="18.796" width="0.4064" layer="1"/>
 <wire x1="21.844" y1="18.796" x2="24.7904" y2="18.796" width="0.4064" layer="1"/>
 <via x="24.7904" y="18.796" extent="1-16" drill="0.254"/>
-<wire x1="24.7904" y1="18.796" x2="24.7904" y2="12.3952" width="0.4064" layer="16"/>
-<wire x1="30.48" y1="2.413" x2="30.48" y2="6.7056" width="0.4064" layer="16"/>
-<wire x1="30.48" y1="6.7056" x2="24.7904" y2="12.3952" width="0.4064" layer="16"/>
+<wire x1="24.7904" y1="18.796" x2="24.7904" y2="8.8646" width="0.4064" layer="16"/>
+<contactref element="JP5" pad="6"/>
+<wire x1="24.7904" y1="8.8646" x2="27.6225" y2="6.0325" width="0.4064" layer="16"/>
+<wire x1="27.6225" y1="6.0325" x2="27.6225" y2="2.6975" width="0.4064" layer="16"/>
+<wire x1="27.6225" y1="2.6975" x2="27.78" y2="2.54" width="0.4064" layer="16"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
 <contactref element="ICSP" pad="1"/>
-<contactref element="JP1" pad="5"/>
 <wire x1="19.473" y1="21.107" x2="18.3138" y2="21.107" width="0.4064" layer="1"/>
 <wire x1="18.3138" y1="21.107" x2="17.0688" y2="22.352" width="0.4064" layer="1"/>
 <wire x1="17.0688" y1="22.352" x2="17.0688" y2="23.5712" width="0.4064" layer="1"/>
@@ -18996,15 +18917,16 @@ Please make sure your boards conform to 
 <wire x1="20.4474" y1="21.107" x2="21.7424" y2="19.812" width="0.4064" layer="1"/>
 <wire x1="21.7424" y1="19.812" x2="23.6728" y2="19.812" width="0.4064" layer="1"/>
 <via x="23.6728" y="19.812" extent="1-16" drill="0.254"/>
-<wire x1="23.6728" y1="19.812" x2="23.6728" y2="10.9728" width="0.4064" layer="16"/>
+<wire x1="23.6728" y1="19.812" x2="23.6728" y2="8.7122" width="0.4064" layer="16"/>
 <wire x1="4.9784" y1="25.0952" x2="2.794" y2="27.2796" width="0.4064" layer="1"/>
-<wire x1="27.94" y1="2.667" x2="27.94" y2="6.7056" width="0.4064" layer="16"/>
-<wire x1="27.94" y1="6.7056" x2="23.6728" y2="10.9728" width="0.4064" layer="16"/>
+<contactref element="JP5" pad="5"/>
+<wire x1="23.6728" y1="8.7122" x2="25.7175" y2="6.6675" width="0.4064" layer="16"/>
+<wire x1="25.7175" y1="6.6675" x2="25.7175" y2="2.4775" width="0.4064" layer="16"/>
+<wire x1="25.7175" y1="2.4775" x2="25.78" y2="2.54" width="0.4064" layer="16"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="1"/>
 <contactref element="ICSP" pad="4"/>
-<contactref element="JP1" pad="4"/>
 <wire x1="19.473" y1="21.907" x2="18.5298" y2="21.907" width="0.4064" layer="1"/>
 <wire x1="18.5298" y1="21.907" x2="17.78" y2="22.6568" width="0.4064" layer="1"/>
 <wire x1="17.78" y1="22.6568" x2="17.78" y2="23.876" width="0.4064" layer="1"/>
@@ -19017,11 +18939,11 @@ Please make sure your boards conform to 
 <wire x1="20.5618" y1="21.907" x2="21.6408" y2="20.828" width="0.4064" layer="1"/>
 <wire x1="21.6408" y1="20.828" x2="22.5552" y2="20.828" width="0.4064" layer="1"/>
 <via x="22.5552" y="20.828" extent="1-16" drill="0.254"/>
-<wire x1="22.5552" y1="20.828" x2="22.5552" y2="11.8872" width="0.4064" layer="16"/>
-<wire x1="22.5552" y1="11.8872" x2="22.5552" y2="11.3792" width="0.4064" layer="16"/>
-<wire x1="25.4" y1="2.413" x2="25.4" y2="6.7056" width="0.4064" layer="16"/>
-<wire x1="25.4" y1="6.7056" x2="22.5552" y2="9.5504" width="0.4064" layer="16"/>
-<wire x1="22.5552" y1="9.5504" x2="22.5552" y2="11.3792" width="0.4064" layer="16"/>
+<wire x1="22.5552" y1="20.828" x2="22.5552" y2="8.5979" width="0.4064" layer="16"/>
+<wire x1="24.765" y1="6.3881" x2="22.5552" y2="8.5979" width="0.4064" layer="16"/>
+<contactref element="JP5" pad="4"/>
+<wire x1="24.765" y1="6.3881" x2="24.765" y2="3.525" width="0.4064" layer="16"/>
+<wire x1="24.765" y1="3.525" x2="23.78" y2="2.54" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$10">
 <contactref element="Y2" pad="3"/>
@@ -19111,55 +19033,60 @@ Please make sure your boards conform to 
 </signal>
 <signal name="PD7">
 <contactref element="IC1" pad="16"/>
-<contactref element="JP1" pad="10"/>
 <wire x1="24.473" y1="12.107" x2="24.473" y2="10.8838" width="0.4064" layer="1"/>
-<wire x1="24.473" y1="10.8838" x2="26.2128" y2="9.144" width="0.4064" layer="1"/>
-<wire x1="26.2128" y1="9.144" x2="35.3568" y2="9.144" width="0.4064" layer="1"/>
-<wire x1="40.64" y1="2.413" x2="40.64" y2="3.8608" width="0.4064" layer="1"/>
-<wire x1="40.64" y1="3.8608" x2="35.3568" y2="9.144" width="0.4064" layer="1"/>
+<wire x1="24.473" y1="10.8838" x2="29.0703" y2="6.2865" width="0.4064" layer="1"/>
+<wire x1="29.0703" y1="6.2865" x2="33.655" y2="6.2865" width="0.4064" layer="1"/>
+<contactref element="JP5" pad="10"/>
+<wire x1="35.78" y1="2.54" x2="35.78" y2="4.1615" width="0.4064" layer="1"/>
+<wire x1="35.78" y1="4.1615" x2="33.655" y2="6.2865" width="0.4064" layer="1"/>
 </signal>
 <signal name="PD6">
 <contactref element="IC1" pad="15"/>
-<contactref element="JP1" pad="9"/>
 <wire x1="23.673" y1="12.107" x2="23.673" y2="10.4646" width="0.4064" layer="1"/>
-<wire x1="23.673" y1="10.4646" x2="25.8064" y2="8.3312" width="0.4064" layer="1"/>
-<wire x1="25.8064" y1="8.3312" x2="33.6296" y2="8.3312" width="0.4064" layer="1"/>
-<wire x1="38.1" y1="2.667" x2="38.1" y2="3.8608" width="0.4064" layer="1"/>
-<wire x1="38.1" y1="3.8608" x2="33.6296" y2="8.3312" width="0.4064" layer="1"/>
+<wire x1="23.673" y1="10.4646" x2="28.6639" y2="5.4737" width="0.4064" layer="1"/>
+<wire x1="28.6639" y1="5.4737" x2="32.7025" y2="5.4737" width="0.4064" layer="1"/>
+<contactref element="JP5" pad="9"/>
+<wire x1="33.78" y1="2.54" x2="33.78" y2="4.3962" width="0.4064" layer="1"/>
+<wire x1="33.78" y1="4.3962" x2="32.7025" y2="5.4737" width="0.4064" layer="1"/>
 </signal>
 <signal name="PD5">
 <contactref element="IC1" pad="14"/>
-<contactref element="JP1" pad="8"/>
 <wire x1="22.873" y1="12.107" x2="22.873" y2="10.0454" width="0.4064" layer="1"/>
-<wire x1="22.873" y1="10.0454" x2="25.4" y2="7.5184" width="0.4064" layer="1"/>
-<wire x1="25.4" y1="7.5184" x2="31.9024" y2="7.5184" width="0.4064" layer="1"/>
-<wire x1="35.56" y1="2.413" x2="35.56" y2="3.8608" width="0.4064" layer="1"/>
-<wire x1="35.56" y1="3.8608" x2="31.9024" y2="7.5184" width="0.4064" layer="1"/>
+<wire x1="22.873" y1="10.0454" x2="28.2575" y2="4.6609" width="0.4064" layer="1"/>
+<wire x1="28.2575" y1="4.6609" x2="31.4325" y2="4.6609" width="0.4064" layer="1"/>
+<contactref element="JP5" pad="8"/>
+<wire x1="31.78" y1="2.54" x2="31.78" y2="4.3134" width="0.4064" layer="1"/>
+<wire x1="31.78" y1="4.3134" x2="31.4325" y2="4.6609" width="0.4064" layer="1"/>
 </signal>
 <signal name="PD4">
 <contactref element="IC1" pad="13"/>
-<contactref element="JP1" pad="7"/>
 <wire x1="22.073" y1="12.107" x2="22.073" y2="9.6262" width="0.4064" layer="1"/>
-<wire x1="22.073" y1="9.6262" x2="24.9936" y2="6.7056" width="0.4064" layer="1"/>
-<wire x1="24.9936" y1="6.7056" x2="30.1752" y2="6.7056" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="2.667" x2="33.02" y2="3.8608" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="3.8608" x2="30.1752" y2="6.7056" width="0.4064" layer="1"/>
+<wire x1="22.073" y1="9.6262" x2="27.8511" y2="3.8481" width="0.4064" layer="1"/>
+<wire x1="27.8511" y1="3.8481" x2="29.21" y2="3.8481" width="0.4064" layer="1"/>
+<contactref element="JP5" pad="7"/>
+<wire x1="29.78" y1="2.54" x2="29.78" y2="3.2781" width="0.4064" layer="1"/>
+<wire x1="29.78" y1="3.2781" x2="29.21" y2="3.8481" width="0.4064" layer="1"/>
 </signal>
 <signal name="DIP1">
 <contactref element="ROTARY_DIP" pad="2"/>
 <wire x1="32.4104" y1="21.7424" x2="36.6776" y2="26.0096" width="0.4064" layer="16"/>
 <via x="36.6776" y="26.0096" extent="1-16" drill="0.254"/>
 <wire x1="36.6776" y1="26.0096" x2="43.7896" y2="33.1216" width="0.4064" layer="1"/>
-<wire x1="43.7896" y1="33.1216" x2="52.7304" y2="33.1216" width="0.4064" layer="1"/>
+<wire x1="43.7896" y1="33.1216" x2="52.07" y2="33.1216" width="0.4064" layer="1"/>
+<wire x1="52.07" y1="33.1216" x2="52.7304" y2="33.1216" width="0.4064" layer="1"/>
 <wire x1="52.7304" y1="33.1216" x2="53.5432" y2="32.3088" width="0.4064" layer="1"/>
 <wire x1="53.5432" y1="32.3088" x2="53.9877" y2="32.3088" width="0.4064" layer="1"/>
-<wire x1="53.9877" y1="32.3088" x2="54.3814" y2="31.8643" width="0.4064" layer="1"/>
 <contactref element="IC1" pad="22"/>
 <wire x1="32.4104" y1="21.7424" x2="32.4104" y2="17.0688" width="0.4064" layer="16"/>
 <wire x1="32.4104" y1="17.0688" x2="29.2608" y2="13.9192" width="0.4064" layer="16"/>
 <via x="29.2608" y="13.9192" extent="1-16" drill="0.254"/>
 <wire x1="29.2608" y1="13.9192" x2="29.2608" y2="12.1192" width="0.4064" layer="1"/>
 <wire x1="29.2608" y1="12.1192" x2="29.273" y2="12.107" width="0.4064" layer="1"/>
+<wire x1="53.34" y1="31.75" x2="54.61" y2="31.75" width="0.254" layer="1"/>
+<wire x1="52.07" y1="33.02" x2="53.34" y2="31.75" width="0.254" layer="1"/>
+<wire x1="52.07" y1="33.02" x2="52.07" y2="33.1216" width="0.254" layer="1"/>
+<wire x1="54.3814" y1="31.8643" x2="54.4957" y2="31.8643" width="0.6096" layer="1"/>
+<wire x1="54.4957" y1="31.8643" x2="54.61" y2="31.75" width="0.6096" layer="1"/>
 </signal>
 <signal name="DIP3">
 <contactref element="ROTARY_DIP" pad="8"/>
@@ -19171,7 +19098,6 @@ Please make sure your boards conform to 
 <wire x1="47.752" y1="31.8008" x2="51.816" y2="31.8008" width="0.4064" layer="1"/>
 <wire x1="51.816" y1="31.8008" x2="53.34" y2="30.2768" width="0.4064" layer="1"/>
 <wire x1="53.34" y1="30.2768" x2="55.7784" y2="30.2768" width="0.4064" layer="1"/>
-<wire x1="54.6989" y1="36.6776" x2="54.3814" y2="36.9443" width="0.4064" layer="1"/>
 <wire x1="55.7784" y1="30.2768" x2="56.2864" y2="30.7848" width="0.4064" layer="1"/>
 <wire x1="56.2864" y1="35.56" x2="54.9656" y2="36.8808" width="0.4064" layer="1"/>
 <contactref element="IC1" pad="24"/>
@@ -19182,6 +19108,8 @@ Please make sure your boards conform to 
 <wire x1="54.6989" y1="36.6776" x2="54.9656" y2="36.6776" width="0.4064" layer="1"/>
 <wire x1="54.9656" y1="36.6776" x2="54.9656" y2="36.8808" width="0.4064" layer="1"/>
 <wire x1="56.2864" y1="30.7848" x2="56.2864" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="54.3814" y1="36.9443" x2="54.4322" y2="36.9443" width="0.6096" layer="1"/>
+<wire x1="54.4322" y1="36.9443" x2="54.6989" y2="36.6776" width="0.6096" layer="1"/>
 </signal>
 <signal name="DIP2">
 <contactref element="ROTARY_DIP" pad="4"/>
@@ -19191,12 +19119,14 @@ Please make sure your boards conform to 
 <wire x1="42.3672" y1="30.6832" x2="43.4848" y2="30.6832" width="0.4064" layer="1"/>
 <wire x1="43.4848" y1="30.6832" x2="44.5008" y2="31.6992" width="0.4064" layer="1"/>
 <wire x1="44.5008" y1="31.6992" x2="44.8437" y2="31.6992" width="0.4064" layer="1"/>
-<wire x1="44.8437" y1="31.6992" x2="45.1104" y2="31.8643" width="0.4064" layer="1"/>
 <contactref element="IC1" pad="23"/>
 <wire x1="33.1216" y1="21.4376" x2="33.1216" y2="13.9192" width="0.4064" layer="16"/>
 <via x="33.1216" y="13.9192" extent="1-16" drill="0.254"/>
 <wire x1="33.1216" y1="13.9192" x2="31.0852" y2="13.9192" width="0.4064" layer="1"/>
 <wire x1="31.0852" y1="13.9192" x2="31.073" y2="13.907" width="0.4064" layer="1"/>
+<wire x1="44.45" y1="31.75" x2="44.5008" y2="31.6992" width="0.254" layer="1"/>
+<wire x1="44.45" y1="31.75" x2="44.9961" y2="31.75" width="0.6096" layer="1"/>
+<wire x1="44.9961" y1="31.75" x2="45.1104" y2="31.8643" width="0.6096" layer="1"/>
 </signal>
 <signal name="DIP0">
 <contactref element="ROTARY_DIP" pad="1"/>
@@ -19204,15 +19134,18 @@ Please make sure your boards conform to 
 <via x="35.6616" y="26.0096" extent="1-16" drill="0.254"/>
 <wire x1="35.6616" y1="26.0096" x2="42.7736" y2="33.1216" width="0.4064" layer="1"/>
 <wire x1="42.7736" y1="33.1216" x2="42.7736" y2="35.052" width="0.4064" layer="1"/>
-<wire x1="42.7736" y1="35.052" x2="44.0944" y2="36.3728" width="0.4064" layer="1"/>
-<wire x1="44.0944" y1="36.3728" x2="44.4373" y2="36.7792" width="0.4064" layer="1"/>
-<wire x1="44.4373" y1="36.7792" x2="45.1104" y2="36.9443" width="0.4064" layer="1"/>
+<wire x1="42.7736" y1="35.052" x2="43.2308" y2="35.5092" width="0.4064" layer="1"/>
 <contactref element="IC1" pad="21"/>
+<wire x1="43.2308" y1="35.5092" x2="44.0944" y2="36.3728" width="0.4064" layer="1"/>
 <wire x1="31.6992" y1="22.0472" x2="31.6992" y2="17.3736" width="0.4064" layer="16"/>
 <wire x1="31.6992" y1="17.3736" x2="28.448" y2="14.1224" width="0.4064" layer="16"/>
 <via x="28.448" y="14.1224" extent="1-16" drill="0.254"/>
 <wire x1="28.448" y1="14.1224" x2="28.448" y2="12.132" width="0.4064" layer="1"/>
 <wire x1="28.448" y1="12.132" x2="28.473" y2="12.107" width="0.4064" layer="1"/>
+<wire x1="43.18" y1="35.56" x2="44.45" y2="36.83" width="0.254" layer="1"/>
+<wire x1="43.18" y1="35.56" x2="43.2308" y2="35.5092" width="0.254" layer="1"/>
+<wire x1="44.45" y1="36.83" x2="44.9961" y2="36.83" width="0.6096" layer="1"/>
+<wire x1="44.9961" y1="36.83" x2="45.1104" y2="36.9443" width="0.6096" layer="1"/>
 </signal>
 <signal name="PWM0">
 <contactref element="IC1" pad="40"/>
@@ -19801,9 +19734,8 @@ Please make sure your boards conform to 
 <wire x1="36.4744" y1="13.5336" x2="38.3676" y2="13.5336" width="0.4064" layer="1"/>
 <wire x1="38.3676" y1="13.5336" x2="38.3676" y2="13.6144" width="0.4064" layer="1"/>
 <wire x1="31.073" y1="15.507" x2="34.3786" y2="15.507" width="0.4064" layer="1"/>
-<wire x1="34.3786" y1="15.507" x2="35.8648" y2="14.0208" width="0.4064" layer="1"/>
-<wire x1="35.8648" y1="14.0208" x2="36.1904" y2="13.716" width="0.4064" layer="1"/>
-<wire x1="36.1904" y1="13.716" x2="36.4744" y2="13.5336" width="0.4064" layer="1"/>
+<wire x1="34.3786" y1="15.507" x2="36.352" y2="13.5336" width="0.4064" layer="1"/>
+<wire x1="36.352" y1="13.5336" x2="36.4744" y2="13.5336" width="0.4064" layer="1"/>
 </signal>
 <signal name="TOSC2">
 <contactref element="IC1" pad="26"/>
diff --git a/slave/slave.sch b/slave/slave.sch
--- a/slave/slave.sch
+++ b/slave/slave.sch
@@ -5323,16 +5323,6 @@ Source: http://www.osram.convergy.de/</d
 <attribute name="MPN" value=""/>
 <attribute name="OC_NEWARK" value="unknown"/>
 </part>
-<part name="JP2" library="SparkFun" deviceset="M10" device="LOCK">
-<attribute name="MF" value=""/>
-<attribute name="MPN" value=""/>
-<attribute name="OC_NEWARK" value="unknown"/>
-</part>
-<part name="JP1" library="SparkFun" deviceset="M10" device="LOCK">
-<attribute name="MF" value=""/>
-<attribute name="MPN" value=""/>
-<attribute name="OC_NEWARK" value="unknown"/>
-</part>
 <part name="C_CRYS2" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf">
 <attribute name="MF" value=""/>
 <attribute name="MPN" value=""/>
@@ -5514,6 +5504,8 @@ Source: http://www.osram.convergy.de/</d
 </part>
 <part name="GND23" library="SparkFun" deviceset="GND" device=""/>
 <part name="JP4" library="SparkFun" deviceset="M04" device="PTH"/>
+<part name="JP3" library="SparkFun" deviceset="M10" device="2MM"/>
+<part name="JP5" library="SparkFun" deviceset="M10" device="2MM"/>
 </parts>
 <sheets>
 <sheet>
@@ -5676,16 +5668,6 @@ Source: http://www.osram.convergy.de/</d
 <attribute name="MF" x="101.6" y="63.5" size="1.778" layer="96" display="off"/>
 <attribute name="MPN" x="101.6" y="63.5" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="JP2" gate="G$1" x="101.6" y="167.64">
-<attribute name="OC_NEWARK" x="101.6" y="167.64" size="1.778" layer="96" display="off"/>
-<attribute name="MF" x="101.6" y="167.64" size="1.778" layer="96" display="off"/>
-<attribute name="MPN" x="101.6" y="167.64" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="JP1" gate="G$1" x="101.6" y="132.08">
-<attribute name="OC_NEWARK" x="101.6" y="132.08" size="1.778" layer="96" display="off"/>
-<attribute name="MF" x="101.6" y="132.08" size="1.778" layer="96" display="off"/>
-<attribute name="MPN" x="101.6" y="132.08" size="1.778" layer="96" display="off"/>
-</instance>
 <instance part="C_CRYS2" gate="G$1" x="152.4" y="124.46" smashed="yes" rot="R180">
 <attribute name="NAME" x="155.956" y="121.539" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="150.876" y="126.619" size="1.778" layer="96" rot="R180"/>
@@ -5881,6 +5863,8 @@ Source: http://www.osram.convergy.de/</d
 </instance>
 <instance part="GND23" gate="1" x="144.78" y="60.96"/>
 <instance part="JP4" gate="G$1" x="233.68" y="48.26"/>
+<instance part="JP3" gate="G$1" x="101.6" y="167.64"/>
+<instance part="JP5" gate="G$1" x="101.6" y="132.08"/>
 </instances>
 <busses>
 </busses>
@@ -5963,9 +5947,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="241.3" y="177.8" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="3"/>
 <wire x1="111.76" y1="119.38" x2="119.38" y2="119.38" width="0.1524" layer="91"/>
 <label x="114.3" y="119.38" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="3"/>
 </segment>
 <segment>
 <pinref part="U$1" gate="G$1" pin="VDD"/>
@@ -6148,9 +6132,9 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="48.26" y1="170.18" x2="48.26" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="1"/>
 <wire x1="111.76" y1="114.3" x2="119.38" y2="114.3" width="0.1524" layer="91"/>
 <label x="114.3" y="114.3" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="ASSOC" gate="G$1" pin="C"/>
@@ -6246,9 +6230,9 @@ Source: http://www.osram.convergy.de/</d
 <pinref part="C6" gate="G$1" pin="1"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="2"/>
 <wire x1="111.76" y1="116.84" x2="119.38" y2="116.84" width="0.1524" layer="91"/>
 <label x="114.3" y="116.84" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="R10" gate="G$1" pin="2"/>
@@ -6313,9 +6297,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="93.98" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="2"/>
 <wire x1="111.76" y1="152.4" x2="119.38" y2="152.4" width="0.1524" layer="91"/>
 <label x="116.84" y="152.4" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="TEMP" gate="G$1" pin="SDA"/>
@@ -6336,9 +6320,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="91.44" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="1"/>
 <wire x1="111.76" y1="149.86" x2="119.38" y2="149.86" width="0.1524" layer="91"/>
 <label x="116.84" y="149.86" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="TEMP" gate="G$1" pin="SCL"/>
@@ -6359,9 +6343,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="137.16" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="3"/>
 <wire x1="111.76" y1="154.94" x2="119.38" y2="154.94" width="0.1524" layer="91"/>
 <label x="116.84" y="154.94" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="3"/>
 </segment>
 </net>
 <net name="PA1" class="0">
@@ -6371,9 +6355,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="139.7" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="4"/>
 <wire x1="111.76" y1="157.48" x2="119.38" y2="157.48" width="0.1524" layer="91"/>
 <label x="116.84" y="157.48" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="4"/>
 </segment>
 </net>
 <net name="PA2" class="0">
@@ -6383,9 +6367,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="142.24" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="5"/>
 <wire x1="111.76" y1="160.02" x2="119.38" y2="160.02" width="0.1524" layer="91"/>
 <label x="116.84" y="160.02" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="5"/>
 </segment>
 </net>
 <net name="PA3" class="0">
@@ -6395,9 +6379,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="144.78" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="6"/>
 <wire x1="111.76" y1="162.56" x2="119.38" y2="162.56" width="0.1524" layer="91"/>
 <label x="116.84" y="162.56" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="6"/>
 </segment>
 </net>
 <net name="PA4" class="0">
@@ -6407,9 +6391,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="147.32" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="7"/>
 <wire x1="111.76" y1="165.1" x2="119.38" y2="165.1" width="0.1524" layer="91"/>
 <label x="116.84" y="165.1" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="7"/>
 </segment>
 </net>
 <net name="PA5" class="0">
@@ -6419,9 +6403,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="149.86" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="8"/>
 <wire x1="111.76" y1="167.64" x2="119.38" y2="167.64" width="0.1524" layer="91"/>
 <label x="116.84" y="167.64" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="8"/>
 </segment>
 </net>
 <net name="PA6" class="0">
@@ -6431,9 +6415,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="152.4" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="9"/>
 <wire x1="111.76" y1="170.18" x2="119.38" y2="170.18" width="0.1524" layer="91"/>
 <label x="116.84" y="170.18" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="9"/>
 </segment>
 </net>
 <net name="PA7" class="0">
@@ -6443,9 +6427,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="154.94" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="G$1" pin="10"/>
 <wire x1="111.76" y1="172.72" x2="119.38" y2="172.72" width="0.1524" layer="91"/>
 <label x="116.84" y="172.72" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="10"/>
 </segment>
 <segment>
 <pinref part="R3" gate="G$1" pin="1"/>
@@ -6469,9 +6453,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="208.28" y="175.26" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="6"/>
 <wire x1="111.76" y1="127" x2="119.38" y2="127" width="0.1524" layer="91"/>
 <label x="114.3" y="127" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="6"/>
 </segment>
 </net>
 <net name="MISO" class="0">
@@ -6486,9 +6470,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="208.28" y="177.8" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="5"/>
 <wire x1="111.76" y1="124.46" x2="119.38" y2="124.46" width="0.1524" layer="91"/>
 <label x="114.3" y="124.46" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="5"/>
 </segment>
 </net>
 <net name="MOSI" class="0">
@@ -6503,9 +6487,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="241.3" y="175.26" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="4"/>
 <wire x1="111.76" y1="121.92" x2="119.38" y2="121.92" width="0.1524" layer="91"/>
 <label x="114.3" y="121.92" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="4"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -6603,9 +6587,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="86.36" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="10"/>
 <wire x1="111.76" y1="137.16" x2="119.38" y2="137.16" width="0.1524" layer="91"/>
 <label x="114.3" y="137.16" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="10"/>
 </segment>
 </net>
 <net name="PD6" class="0">
@@ -6615,9 +6599,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="83.82" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="9"/>
 <wire x1="111.76" y1="134.62" x2="119.38" y2="134.62" width="0.1524" layer="91"/>
 <label x="114.3" y="134.62" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="9"/>
 </segment>
 </net>
 <net name="PD5" class="0">
@@ -6627,9 +6611,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="81.28" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="8"/>
 <wire x1="111.76" y1="132.08" x2="119.38" y2="132.08" width="0.1524" layer="91"/>
 <label x="114.3" y="132.08" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="8"/>
 </segment>
 </net>
 <net name="PD4" class="0">
@@ -6639,9 +6623,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="78.74" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="7"/>
 <wire x1="111.76" y1="129.54" x2="119.38" y2="129.54" width="0.1524" layer="91"/>
 <label x="114.3" y="129.54" size="1.778" layer="95"/>
+<pinref part="JP5" gate="G$1" pin="7"/>
 </segment>
 </net>
 <net name="DIP1" class="0">