diff --git a/master/eagle.epf b/master/eagle.epf
--- a/master/eagle.epf
+++ b/master/eagle.epf
@@ -351,7 +351,7 @@ UsedLibrary="C:/Users/ethanzonca/Documen
 
 [Win_1]
 Type="Control Panel"
-Loc="205 216 804 615"
+Loc="69 397 668 796"
 State=2
 Number=0
 
diff --git a/slave-daughter/slave-daughter-gieger2.brd b/slave-daughter/slave-daughter-gieger2.brd
--- a/slave-daughter/slave-daughter-gieger2.brd
+++ b/slave-daughter/slave-daughter-gieger2.brd
@@ -139,6 +139,7 @@
 <hole x="31.496" y="21.59" drill="2.54"/>
 <hole x="31.496" y="20.955" drill="2.54"/>
 <hole x="31.496" y="20.32" drill="2.54"/>
+<text x="-0.5588" y="43.0276" size="1.778" layer="21">May want to shift headers</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -147,92 +148,6 @@ We've spent an enormous amount of time c
 &lt;br&gt;&lt;br&gt;
 &lt;b&gt;Licensing:&lt;/b&gt; CC v3.0 Share-Alike You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
 <packages>
-<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="GEIGER_TUBE">
 <wire x1="9.398" y1="7.62" x2="9.398" y2="3.048" width="0.127" layer="21"/>
 <wire x1="9.398" y1="3.048" x2="9.398" y2="-3.048" width="0.127" layer="21"/>
@@ -308,6 +223,34 @@ We've spent an enormous amount of time c
 <text x="-0.6985" y="-0.889" size="0.4064" layer="25" rot="R90">&gt;NAME</text>
 <text x="1.0795" y="-1.016" size="0.4064" layer="27" rot="R90">&gt;VALUE</text>
 </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="SeniorDesign">
@@ -16918,8 +16861,6 @@ Please make sure your boards conform to 
 </pass>
 </autorouter>
 <elements>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="2.54" locked="yes"/>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="36.83" locked="yes"/>
 <element name="U$1" library="SparkFun" package="GEIGER_TUBE" value="GEIGER_TUBELND712" x="62.3316" y="7.62" rot="R90"/>
 <element name="R1" library="SparkFun" package="0603-RES" value="1M" x="22.4028" y="19.1516" rot="R270"/>
 <element name="R2" library="SparkFun" package="0603-RES" value="10M" x="24.7396" y="19.1516" rot="R270"/>
@@ -16959,10 +16900,11 @@ Please make sure your boards conform to 
 <element name="C3" library="SparkFun" package="0603-CAP" value=".47uF" x="-6.4516" y="-30.5816"/>
 <element name="U$4" library="SeniorDesign" package="TRANSFORMER_750032051" value="TRANS_750032051X2" x="4.9276" y="-40.64"/>
 <element name="C4" library="SparkFun" package="0603-CAP" value="2.2uF" x="-6.4516" y="-50.3428"/>
+<element name="JP3" library="SparkFun" package="1X10-2MM" value="M102MM" x="5.08" y="36.83"/>
+<element name="JP4" library="SparkFun" package="1X10-2MM" value="M102MM" x="5.08" y="2.54"/>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="JP1" pad="1"/>
 <contactref element="U$1" pad="GND"/>
 <contactref element="Q2" pad="2"/>
 <contactref element="C6" pad="2"/>
@@ -16976,6 +16918,7 @@ Please make sure your boards conform to 
 <contactref element="C1" pad="2"/>
 <contactref element="R12" pad="2"/>
 <contactref element="C4" pad="2"/>
+<contactref element="JP4" pad="1"/>
 <wire x1="28.5496" y1="29.884" x2="53.1876" y2="21.082" width="0" layer="19" extent="1-1"/>
 <wire x1="26.5024" y1="29.2022" x2="28.5496" y2="29.884" width="0" layer="19" extent="1-1"/>
 <wire x1="9.398" y1="24.3332" x2="26.5024" y2="29.2022" width="0" layer="19" extent="1-1"/>
@@ -16983,15 +16926,14 @@ Please make sure your boards conform to 
 <wire x1="3.9324" y1="32.5374" x2="6.4516" y2="32.5374" width="0" layer="19" extent="1-1"/>
 <wire x1="3.7592" y1="34.8488" x2="3.9324" y2="32.5374" width="0" layer="19" extent="1-1"/>
 <wire x1="5.842" y1="12.954" x2="9.398" y2="24.3332" width="0" layer="19" extent="1-1"/>
-<wire x1="5.08" y1="2.667" x2="5.842" y2="12.954" width="0" layer="19" extent="1-1"/>
-<wire x1="-3.6576" y1="4.3688" x2="5.08" y2="2.667" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="2.54" x2="5.842" y2="12.954" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.6576" y1="4.3688" x2="5.08" y2="2.54" width="0" layer="19" extent="1-1"/>
 <wire x1="-5.6016" y1="-11.8872" x2="-3.6576" y2="4.3688" width="0" layer="19" extent="1-1"/>
 <wire x1="-5.6016" y1="-16.5608" x2="-5.6016" y2="-11.8872" width="0" layer="19" extent="1-1"/>
 <wire x1="-5.6016" y1="-28.2448" x2="-5.6016" y2="-16.5608" width="0" layer="19" extent="1-1"/>
 <wire x1="-5.6016" y1="-50.3428" x2="-5.6016" y2="-28.2448" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT">
-<contactref element="JP1" pad="2"/>
 <contactref element="U$2" pad="13"/>
 <contactref element="U$2" pad="9"/>
 <contactref element="R9" pad="1"/>
@@ -17002,6 +16944,7 @@ Please make sure your boards conform to 
 <contactref element="U$4" pad="5"/>
 <contactref element="U$4" pad="4"/>
 <contactref element="C4" pad="1"/>
+<contactref element="JP4" pad="2"/>
 <wire x1="-6.4024" y1="-48.14" x2="-7.3016" y2="-50.3428" width="0" layer="19" extent="1-1"/>
 <wire x1="-6.4024" y1="-44.39" x2="-6.4024" y2="-48.14" width="0" layer="19" extent="1-1"/>
 <wire x1="-7.3016" y1="-25.908" x2="-6.4024" y2="-44.39" width="0" layer="19" extent="1-1"/>
@@ -17011,90 +16954,57 @@ Please make sure your boards conform to 
 <wire x1="-7.3016" y1="-2.54" x2="-7.3016" y2="-4.8768" width="0" layer="19" extent="1-1"/>
 <wire x1="-1.3826" y1="1.5938" x2="-7.3016" y2="-2.54" width="0" layer="19" extent="1-1"/>
 <wire x1="-2.0326" y1="7.1438" x2="-1.3826" y2="1.5938" width="0" layer="19" extent="1-1"/>
-<wire x1="7.62" y1="2.413" x2="-1.3826" y2="1.5938" width="0" layer="19" extent="1-1"/>
+<wire x1="7.08" y1="2.54" x2="-1.3826" y2="1.5938" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VCC">
-<contactref element="JP1" pad="3"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R7" pad="1"/>
 <contactref element="SP3" pad="P$2"/>
 <contactref element="IC1" pad="4"/>
 <wire x1="6.5904" y1="31.5294" x2="6.5324" y2="31.5874" width="0.4064" layer="1"/>
+<contactref element="JP4" pad="3"/>
 <wire x1="85.5726" y1="6.8472" x2="80.01" y2="25.7184" width="0" layer="19" extent="1-1"/>
 <wire x1="30.7848" y1="29.884" x2="80.01" y2="25.7184" width="0" layer="19" extent="1-1"/>
 <wire x1="6.5904" y1="31.5294" x2="30.7848" y2="29.884" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="2.667" x2="6.5904" y2="31.5294" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="MOSI">
-<contactref element="JP1" pad="4"/>
-</signal>
-<signal name="MISO">
-<contactref element="JP1" pad="5"/>
-</signal>
-<signal name="SCK">
-<contactref element="JP1" pad="6"/>
-</signal>
-<signal name="PD4">
-<contactref element="JP1" pad="7"/>
-</signal>
-<signal name="PD5">
-<contactref element="JP1" pad="8"/>
-</signal>
-<signal name="PD6">
-<contactref element="JP1" pad="9"/>
-</signal>
-<signal name="PD7">
-<contactref element="JP1" pad="10"/>
+<wire x1="9.08" y1="2.54" x2="6.5904" y2="31.5294" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCL">
-<contactref element="JP2" pad="1"/>
 <contactref element="IC1" pad="1"/>
-<wire x1="3.9324" y1="33.4874" x2="5.08" y2="36.957" width="0" layer="19" extent="1-1"/>
+<contactref element="JP3" pad="1"/>
+<wire x1="3.9324" y1="33.4874" x2="5.08" y2="36.83" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SDA">
-<contactref element="JP2" pad="2"/>
 <contactref element="IC1" pad="3"/>
-<wire x1="3.9324" y1="31.5874" x2="7.62" y2="36.703" width="0" layer="19" extent="1-1"/>
+<contactref element="JP3" pad="2"/>
+<wire x1="3.9324" y1="31.5874" x2="7.08" y2="36.83" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA0">
-<contactref element="JP2" pad="3"/>
 <contactref element="R6" pad="1"/>
 <contactref element="Q2" pad="3"/>
 <contactref element="C6" pad="1"/>
 <contactref element="SP3" pad="P$1"/>
 <contactref element="LED1" pad="C"/>
+<contactref element="JP3" pad="3"/>
 <wire x1="85.5726" y1="11.8472" x2="80.1116" y2="32.1952" width="0" layer="19" extent="1-1"/>
 <wire x1="30.7848" y1="31.584" x2="80.1116" y2="32.1952" width="0" layer="19" extent="1-1"/>
 <wire x1="28.5496" y1="31.584" x2="30.7848" y2="31.584" width="0" layer="19" extent="1-1"/>
 <wire x1="25.5524" y1="31.4022" x2="28.5496" y2="31.584" width="0" layer="19" extent="1-1"/>
-<wire x1="10.16" y1="36.957" x2="25.5524" y2="31.4022" width="0" layer="19" extent="1-1"/>
+<wire x1="9.08" y1="36.83" x2="25.5524" y2="31.4022" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA1">
-<contactref element="JP2" pad="4"/>
 <contactref element="U$2" pad="8"/>
-<wire x1="-2.0326" y1="1.5938" x2="12.7" y2="36.703" width="0" layer="19" extent="1-1"/>
+<contactref element="JP3" pad="4"/>
+<wire x1="-2.0326" y1="1.5938" x2="11.08" y2="36.83" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA2">
-<contactref element="JP2" pad="5"/>
 <contactref element="U$2" pad="7"/>
-<wire x1="-2.6826" y1="1.5938" x2="15.24" y2="36.957" width="0" layer="19" extent="1-1"/>
+<contactref element="JP3" pad="5"/>
+<wire x1="-2.6826" y1="1.5938" x2="13.08" y2="36.83" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA3">
-<contactref element="JP2" pad="6"/>
 <contactref element="U$2" pad="6"/>
-<wire x1="-3.3326" y1="1.5938" x2="17.78" y2="36.703" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="PA4">
-<contactref element="JP2" pad="7"/>
-</signal>
-<signal name="PA5">
-<contactref element="JP2" pad="8"/>
-</signal>
-<signal name="PA6">
-<contactref element="JP2" pad="9"/>
-</signal>
-<signal name="PA7">
-<contactref element="JP2" pad="10"/>
+<contactref element="JP3" pad="6"/>
+<wire x1="-3.3326" y1="1.5938" x2="15.08" y2="36.83" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HV">
 <contactref element="R1" pad="1"/>
@@ -17198,6 +17108,39 @@ Please make sure your boards conform to 
 <wire x1="-5.6016" y1="-23.5712" x2="16.2576" y2="-44.39" width="0" layer="19" extent="1-1"/>
 <wire x1="-5.6016" y1="-21.2344" x2="-5.6016" y2="-23.5712" width="0" layer="19" extent="1-1"/>
 </signal>
+<signal name="MOSI">
+<contactref element="JP4" pad="4"/>
+</signal>
+<signal name="MISO">
+<contactref element="JP4" pad="5"/>
+</signal>
+<signal name="SCK">
+<contactref element="JP4" pad="6"/>
+</signal>
+<signal name="PD4">
+<contactref element="JP4" pad="7"/>
+</signal>
+<signal name="PD5">
+<contactref element="JP4" pad="8"/>
+</signal>
+<signal name="PD6">
+<contactref element="JP4" pad="9"/>
+</signal>
+<signal name="PD7">
+<contactref element="JP4" pad="10"/>
+</signal>
+<signal name="PA4">
+<contactref element="JP3" pad="7"/>
+</signal>
+<signal name="PA5">
+<contactref element="JP3" pad="8"/>
+</signal>
+<signal name="PA6">
+<contactref element="JP3" pad="9"/>
+</signal>
+<signal name="PA7">
+<contactref element="JP3" pad="10"/>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/slave-daughter/slave-daughter-gieger2.sch b/slave-daughter/slave-daughter-gieger2.sch
--- a/slave-daughter/slave-daughter-gieger2.sch
+++ b/slave-daughter/slave-daughter-gieger2.sch
@@ -2276,8 +2276,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </classes>
 <parts>
 <part name="FRAME1" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
-<part name="JP1" library="SparkFun" deviceset="M10" device="LOCK"/>
-<part name="JP2" library="SparkFun" deviceset="M10" device="LOCK"/>
 <part name="U$1" library="SparkFun" deviceset="GEIGER_TUBE" device="LND712"/>
 <part name="P+1" library="SparkFun" deviceset="VCC" device=""/>
 <part name="GND1" library="SparkFun" deviceset="GND" device=""/>
@@ -2320,6 +2318,8 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <part name="U$4" library="SeniorDesign" deviceset="TRANS_750032051X2" device=""/>
 <part name="C4" library="SparkFun" deviceset="CAP" device="0603-CAP" value="2.2uF"/>
 <part name="GND6" library="SparkFun" deviceset="GND" device=""/>
+<part name="JP3" library="SparkFun" deviceset="M10" device="2MM"/>
+<part name="JP4" library="SparkFun" deviceset="M10" device="2MM"/>
 </parts>
 <sheets>
 <sheet>
@@ -2347,8 +2347,6 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <instances>
 <instance part="FRAME1" gate="G$1" x="0" y="0"/>
 <instance part="FRAME1" gate="G$2" x="147.32" y="0"/>
-<instance part="JP1" gate="G$1" x="10.16" y="162.56"/>
-<instance part="JP2" gate="G$1" x="10.16" y="127"/>
 <instance part="U$1" gate="G$1" x="129.54" y="162.56"/>
 <instance part="P+1" gate="1" x="50.8" y="154.94"/>
 <instance part="GND1" gate="1" x="50.8" y="139.7"/>
@@ -2391,6 +2389,8 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <instance part="U$4" gate="G$1" x="86.36" y="71.12"/>
 <instance part="C4" gate="G$1" x="66.04" y="86.36"/>
 <instance part="GND6" gate="1" x="66.04" y="78.74"/>
+<instance part="JP3" gate="G$1" x="10.16" y="127"/>
+<instance part="JP4" gate="G$1" x="10.16" y="162.56"/>
 </instances>
 <busses>
 </busses>
@@ -2399,9 +2399,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 <segment>
 <pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="50.8" y1="142.24" x2="50.8" y2="144.78" width="0.1524" layer="91"/>
-<pinref part="JP1" gate="G$1" pin="1"/>
 <label x="25.4" y="144.78" size="1.778" layer="95"/>
 <wire x1="50.8" y1="144.78" x2="20.32" y2="144.78" width="0.1524" layer="91"/>
+<pinref part="JP4" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="GND4" gate="1" pin="GND"/>
@@ -2452,9 +2452,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="VBAT" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="2"/>
 <wire x1="20.32" y1="147.32" x2="30.48" y2="147.32" width="0.1524" layer="91"/>
 <label x="25.4" y="147.32" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <wire x1="2.54" y1="93.98" x2="12.7" y2="93.98" width="0.1524" layer="91"/>
@@ -2499,11 +2499,11 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="VCC" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="3"/>
 <label x="25.4" y="149.86" size="1.778" layer="95"/>
 <pinref part="P+1" gate="1" pin="VCC"/>
 <wire x1="20.32" y1="149.86" x2="50.8" y2="149.86" width="0.1524" layer="91"/>
 <wire x1="50.8" y1="149.86" x2="50.8" y2="154.94" width="0.1524" layer="91"/>
+<pinref part="JP4" gate="G$1" pin="3"/>
 </segment>
 <segment>
 <pinref part="R6" gate="G$1" pin="2"/>
@@ -2529,58 +2529,58 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="MOSI" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="4"/>
 <wire x1="20.32" y1="152.4" x2="30.48" y2="152.4" width="0.1524" layer="91"/>
 <label x="25.4" y="152.4" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="4"/>
 </segment>
 </net>
 <net name="MISO" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="5"/>
 <wire x1="20.32" y1="154.94" x2="30.48" y2="154.94" width="0.1524" layer="91"/>
 <label x="25.4" y="154.94" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="5"/>
 </segment>
 </net>
 <net name="SCK" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="6"/>
 <wire x1="20.32" y1="157.48" x2="30.48" y2="157.48" width="0.1524" layer="91"/>
 <label x="25.4" y="157.48" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="6"/>
 </segment>
 </net>
 <net name="PD4" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="7"/>
 <wire x1="20.32" y1="160.02" x2="30.48" y2="160.02" width="0.1524" layer="91"/>
 <label x="25.4" y="160.02" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="7"/>
 </segment>
 </net>
 <net name="PD5" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="8"/>
 <wire x1="20.32" y1="162.56" x2="30.48" y2="162.56" width="0.1524" layer="91"/>
 <label x="25.4" y="162.56" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="8"/>
 </segment>
 </net>
 <net name="PD6" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="9"/>
 <wire x1="20.32" y1="165.1" x2="30.48" y2="165.1" width="0.1524" layer="91"/>
 <label x="25.4" y="165.1" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="9"/>
 </segment>
 </net>
 <net name="PD7" class="0">
 <segment>
-<pinref part="JP1" gate="G$1" pin="10"/>
 <wire x1="20.32" y1="167.64" x2="30.48" y2="167.64" width="0.1524" layer="91"/>
 <label x="25.4" y="167.64" size="1.778" layer="95"/>
+<pinref part="JP4" gate="G$1" pin="10"/>
 </segment>
 </net>
 <net name="SCL" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="1"/>
 <wire x1="20.32" y1="109.22" x2="30.48" y2="109.22" width="0.1524" layer="91"/>
 <label x="25.4" y="109.22" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="IC1" gate="G$1" pin="SCL"/>
@@ -2590,9 +2590,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="SDA" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="2"/>
 <wire x1="20.32" y1="111.76" x2="30.48" y2="111.76" width="0.1524" layer="91"/>
 <label x="25.4" y="111.76" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="IC1" gate="G$1" pin="SDA"/>
@@ -2602,9 +2602,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="PA0" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="3"/>
 <wire x1="20.32" y1="114.3" x2="30.48" y2="114.3" width="0.1524" layer="91"/>
 <label x="25.4" y="114.3" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="3"/>
 </segment>
 <segment>
 <pinref part="R6" gate="G$1" pin="1"/>
@@ -2628,9 +2628,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="PA1" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="4"/>
 <wire x1="20.32" y1="116.84" x2="30.48" y2="116.84" width="0.1524" layer="91"/>
 <label x="25.4" y="116.84" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="4"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="CHARGE"/>
@@ -2640,9 +2640,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="PA2" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="5"/>
 <wire x1="20.32" y1="119.38" x2="30.48" y2="119.38" width="0.1524" layer="91"/>
 <label x="25.4" y="119.38" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="5"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="!DONE"/>
@@ -2652,9 +2652,9 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="PA3" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="6"/>
 <wire x1="20.32" y1="121.92" x2="30.48" y2="121.92" width="0.1524" layer="91"/>
 <label x="25.4" y="121.92" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="6"/>
 </segment>
 <segment>
 <pinref part="U$2" gate="G$1" pin="!FAULT"/>
@@ -2664,30 +2664,30 @@ 128 bit, I2C (AA = 1.8 V/LC = 2.5 V/C = 
 </net>
 <net name="PA4" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="7"/>
 <wire x1="20.32" y1="124.46" x2="30.48" y2="124.46" width="0.1524" layer="91"/>
 <label x="25.4" y="124.46" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="7"/>
 </segment>
 </net>
 <net name="PA5" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="8"/>
 <wire x1="20.32" y1="127" x2="30.48" y2="127" width="0.1524" layer="91"/>
 <label x="25.4" y="127" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="8"/>
 </segment>
 </net>
 <net name="PA6" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="9"/>
 <wire x1="20.32" y1="129.54" x2="30.48" y2="129.54" width="0.1524" layer="91"/>
 <label x="25.4" y="129.54" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="9"/>
 </segment>
 </net>
 <net name="PA7" class="0">
 <segment>
-<pinref part="JP2" gate="G$1" pin="10"/>
 <wire x1="20.32" y1="132.08" x2="30.48" y2="132.08" width="0.1524" layer="91"/>
 <label x="25.4" y="132.08" size="1.778" layer="95"/>
+<pinref part="JP3" gate="G$1" pin="10"/>
 </segment>
 </net>
 <net name="HV" class="0">