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">