diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -941,7 +941,6 @@ design rules under a new name.</descript
 <wire x1="27.94" y1="22.84" x2="15.24" y2="15.63" width="0" layer="19" extent="1-1"/>
 <wire x1="35.475" y1="19.685" x2="27.94" y2="22.84" width="0" layer="19" extent="1-1"/>
 <wire x1="41.275" y1="25.485" x2="35.475" y2="19.685" width="0" layer="19" extent="1-1"/>
-<wire x1="47.53" y1="29.185" x2="41.275" y2="25.485" width="0" layer="19" extent="1-16"/>
 <wire x1="47.075" y1="19.685" x2="41.275" y2="25.485" width="0" layer="19" extent="1-1"/>
 <wire x1="42.075" y1="13.885" x2="47.075" y2="19.685" width="0" layer="19" extent="1-1"/>
 <wire x1="-14.39" y1="63.5" x2="4.445" y2="30.6705" width="0" layer="19" extent="1-1"/>
@@ -950,6 +949,7 @@ design rules under a new name.</descript
 <wire x1="-27.04" y1="60.96" x2="-23.23" y2="60.96" width="0" layer="19" extent="1-1"/>
 <wire x1="-38.52" y1="60.96" x2="-27.04" y2="60.96" width="0" layer="19" extent="1-1"/>
 <wire x1="-47.84" y1="60.96" x2="-38.52" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="47.53" y1="29.185" x2="41.275" y2="25.485" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="AVCC">
 <contactref element="IC1" pad="27"/>
@@ -1137,18 +1137,6 @@ design rules under a new name.</descript
 <signal name="N$13">
 <contactref element="L2" pad="1"/>
 </signal>
-<signal name="TCK">
-<contactref element="IC1" pad="21"/>
-</signal>
-<signal name="TMS">
-<contactref element="IC1" pad="22"/>
-</signal>
-<signal name="TDO">
-<contactref element="IC1" pad="23"/>
-</signal>
-<signal name="TDI">
-<contactref element="IC1" pad="24"/>
-</signal>
 <signal name="RXD0">
 <contactref element="IC1" pad="9"/>
 <contactref element="U$1" pad="2"/>
@@ -1185,17 +1173,25 @@ design rules under a new name.</descript
 <contactref element="JP1" pad="7"/>
 <wire x1="38.075" y1="13.885" x2="39.37" y2="2.667" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$1">
+<signal name="DIP1">
 <contactref element="ROTARY_DIP" pad="2"/>
+<contactref element="IC1" pad="24"/>
+<wire x1="13.716" y1="28.1305" x2="47.075" y2="16.485" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$7">
+<signal name="DIP3">
 <contactref element="ROTARY_DIP" pad="8"/>
+<contactref element="IC1" pad="26"/>
+<wire x1="13.716" y1="33.2105" x2="47.075" y2="18.085" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$8">
+<signal name="DIP2">
 <contactref element="ROTARY_DIP" pad="4"/>
+<contactref element="IC1" pad="25"/>
+<wire x1="4.445" y1="28.1305" x2="47.075" y2="17.285" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$9">
+<signal name="DIP0">
 <contactref element="ROTARY_DIP" pad="1"/>
+<contactref element="IC1" pad="23"/>
+<wire x1="4.445" y1="33.2105" x2="47.075" y2="15.685" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PWM0">
 <contactref element="IC1" pad="40"/>
diff --git a/slave/slave.sch b/slave/slave.sch
--- a/slave/slave.sch
+++ b/slave/slave.sch
@@ -3431,9 +3431,9 @@ www.irf.com&lt;p&gt;
 <wire x1="71.12" y1="142.24" x2="71.12" y2="106.68" width="0.3048" layer="94"/>
 <wire x1="147.32" y1="35.56" x2="147.32" y2="53.34" width="0.3048" layer="94"/>
 <wire x1="147.32" y1="53.34" x2="129.54" y2="53.34" width="0.3048" layer="94"/>
-<wire x1="238.506" y1="106.172" x2="241.046" y2="106.172" width="0.1524" layer="94"/>
-<wire x1="238.506" y1="96.012" x2="241.046" y2="96.012" width="0.1524" layer="94"/>
-<text x="241.554" y="100.076" size="1.778" layer="94">JTAG</text>
+<wire x1="238.506" y1="111.252" x2="241.046" y2="111.252" width="0.1524" layer="94"/>
+<wire x1="238.506" y1="101.092" x2="241.046" y2="101.092" width="0.1524" layer="94"/>
+<text x="241.554" y="105.156" size="1.778" layer="94">DIP</text>
 <wire x1="238.506" y1="95.504" x2="241.046" y2="95.504" width="0.1524" layer="94"/>
 <wire x1="241.046" y1="95.504" x2="241.046" y2="91.186" width="0.1524" layer="94"/>
 <wire x1="238.506" y1="91.186" x2="241.046" y2="91.186" width="0.1524" layer="94"/>
@@ -3457,7 +3457,7 @@ www.irf.com&lt;p&gt;
 <wire x1="71.12" y1="142.24" x2="0" y2="142.24" width="0.3048" layer="94"/>
 <text x="30.734" y="135.636" size="5.08" layer="94" font="vector">I2C</text>
 <text x="63.5" y="93.98" size="3.81" layer="91">TODO</text>
-<wire x1="241.046" y1="96.012" x2="241.046" y2="106.172" width="0.1524" layer="94"/>
+<wire x1="241.046" y1="101.092" x2="241.046" y2="111.252" width="0.1524" layer="94"/>
 <wire x1="241.046" y1="78.486" x2="241.046" y2="88.392" width="0.1524" layer="94"/>
 <wire x1="241.046" y1="78.486" x2="238.506" y2="78.486" width="0.1524" layer="94"/>
 <wire x1="241.046" y1="88.392" x2="238.506" y2="88.392" width="0.1524" layer="94"/>
@@ -4099,34 +4099,6 @@ www.irf.com&lt;p&gt;
 <wire x1="170.18" y1="127" x2="172.72" y2="127" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="TCK" class="0">
-<segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT18/TCK)PC2"/>
-<wire x1="226.06" y1="96.52" x2="236.22" y2="96.52" width="0.1524" layer="91"/>
-<label x="231.14" y="96.52" size="1.778" layer="95"/>
-</segment>
-</net>
-<net name="TMS" class="0">
-<segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT19/TMS)PC3"/>
-<wire x1="226.06" y1="99.06" x2="236.22" y2="99.06" width="0.1524" layer="91"/>
-<label x="231.14" y="99.06" size="1.778" layer="95"/>
-</segment>
-</net>
-<net name="TDO" class="0">
-<segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT20/TDO)PC4"/>
-<wire x1="226.06" y1="101.6" x2="236.22" y2="101.6" width="0.1524" layer="91"/>
-<label x="231.14" y="101.6" size="1.778" layer="95"/>
-</segment>
-</net>
-<net name="TDI" class="0">
-<segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT21/TDI)PC5"/>
-<wire x1="226.06" y1="104.14" x2="236.22" y2="104.14" width="0.1524" layer="91"/>
-<label x="231.14" y="104.14" size="1.778" layer="95"/>
-</segment>
-</net>
 <net name="RXD0" class="0">
 <segment>
 <pinref part="IC1" gate="G$1" pin="(PCINT24/RXD0)PD0"/>
@@ -4213,33 +4185,53 @@ www.irf.com&lt;p&gt;
 <label x="88.9" y="129.54" size="1.778" layer="95"/>
 </segment>
 </net>
-<net name="N$1" class="0">
+<net name="DIP1" class="0">
 <segment>
 <pinref part="ROTARY_DIP" gate="G$1" pin="2"/>
 <wire x1="43.18" y1="160.02" x2="50.8" y2="160.02" width="0.1524" layer="91"/>
 <label x="45.72" y="160.02" size="1.778" layer="95"/>
 </segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT21/TDI)PC5"/>
+<wire x1="226.06" y1="104.14" x2="236.22" y2="104.14" width="0.1524" layer="91"/>
+<label x="231.14" y="104.14" size="1.778" layer="95"/>
+</segment>
 </net>
-<net name="N$7" class="0">
+<net name="DIP3" class="0">
 <segment>
 <pinref part="ROTARY_DIP" gate="G$1" pin="8"/>
 <wire x1="43.18" y1="165.1" x2="50.8" y2="165.1" width="0.1524" layer="91"/>
 <label x="45.72" y="165.1" size="1.778" layer="95"/>
 </segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT23/TOSC2)PC7"/>
+<wire x1="226.06" y1="109.22" x2="236.22" y2="109.22" width="0.1524" layer="91"/>
+<label x="231.14" y="109.22" size="1.778" layer="95"/>
+</segment>
 </net>
-<net name="N$8" class="0">
+<net name="DIP2" class="0">
 <segment>
 <pinref part="ROTARY_DIP" gate="G$1" pin="4"/>
 <wire x1="22.86" y1="160.02" x2="15.24" y2="160.02" width="0.1524" layer="91"/>
 <label x="15.24" y="160.02" size="1.778" layer="95"/>
 </segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT22/TOSC1)PC6"/>
+<wire x1="226.06" y1="106.68" x2="236.22" y2="106.68" width="0.1524" layer="91"/>
+<label x="231.14" y="106.68" size="1.778" layer="95"/>
+</segment>
 </net>
-<net name="N$9" class="0">
+<net name="DIP0" class="0">
 <segment>
 <pinref part="ROTARY_DIP" gate="G$1" pin="1"/>
 <wire x1="22.86" y1="165.1" x2="15.24" y2="165.1" width="0.1524" layer="91"/>
 <label x="15.24" y="165.1" size="1.778" layer="95"/>
 </segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT20/TDO)PC4"/>
+<wire x1="226.06" y1="101.6" x2="236.22" y2="101.6" width="0.1524" layer="91"/>
+<label x="231.14" y="101.6" size="1.778" layer="95"/>
+</segment>
 </net>
 <net name="PWM0" class="0">
 <segment>