diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -8,16 +8,16 @@
 </settings>
 <grid distance="4" 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="no" active="yes"/>
+<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="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="no" 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="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" 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="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"/>
@@ -44,8 +44,8 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -454,6 +454,41 @@ Basic SMA packaged diode. Good for rever
 <text x="-0.8255" y="1.778" size="0.4064" layer="25">&gt;NAME</text>
 <text x="-1.016" y="-0.1905" size="0.4064" layer="27">&gt;VALUE</text>
 </package>
+<package name="TC26H">
+<description>&lt;b&gt;CRYSTAL&lt;/b&gt;</description>
+<wire x1="-0.889" y1="1.651" x2="0.889" y2="1.651" width="0.1524" layer="21"/>
+<wire x1="0.762" y1="7.747" x2="1.016" y2="7.493" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-1.016" y1="7.493" x2="-0.762" y2="7.747" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-0.762" y1="7.747" x2="0.762" y2="7.747" width="0.1524" layer="21"/>
+<wire x1="0.889" y1="1.651" x2="0.889" y2="2.032" width="0.1524" layer="21"/>
+<wire x1="1.016" y1="2.032" x2="1.016" y2="7.493" width="0.1524" layer="21"/>
+<wire x1="-0.889" y1="1.651" x2="-0.889" y2="2.032" width="0.1524" layer="21"/>
+<wire x1="-1.016" y1="2.032" x2="-0.889" y2="2.032" width="0.1524" layer="21"/>
+<wire x1="-1.016" y1="2.032" x2="-1.016" y2="7.493" width="0.1524" layer="21"/>
+<wire x1="0.508" y1="0.762" x2="0.508" y2="1.143" width="0.4064" layer="21"/>
+<wire x1="-0.508" y1="0.762" x2="-0.508" y2="1.27" width="0.4064" layer="21"/>
+<wire x1="0.635" y1="0.635" x2="1.27" y2="0" width="0.4064" layer="51"/>
+<wire x1="-0.635" y1="0.635" x2="-1.27" y2="0" width="0.4064" layer="51"/>
+<wire x1="-0.508" y1="4.953" x2="-0.508" y2="4.572" width="0.1524" layer="21"/>
+<wire x1="0.508" y1="4.572" x2="-0.508" y2="4.572" width="0.1524" layer="21"/>
+<wire x1="0.508" y1="4.572" x2="0.508" y2="4.953" width="0.1524" layer="21"/>
+<wire x1="-0.508" y1="4.953" x2="0.508" y2="4.953" width="0.1524" layer="21"/>
+<wire x1="-0.508" y1="5.334" x2="0" y2="5.334" width="0.1524" layer="21"/>
+<wire x1="-0.508" y1="4.191" x2="0" y2="4.191" width="0.1524" layer="21"/>
+<wire x1="0" y1="4.191" x2="0" y2="3.683" width="0.1524" layer="21"/>
+<wire x1="0" y1="4.191" x2="0.508" y2="4.191" width="0.1524" layer="21"/>
+<wire x1="0" y1="5.334" x2="0" y2="5.842" width="0.1524" layer="21"/>
+<wire x1="0" y1="5.334" x2="0.508" y2="5.334" width="0.1524" layer="21"/>
+<wire x1="1.016" y1="2.032" x2="0.889" y2="2.032" width="0.1524" layer="21"/>
+<wire x1="0.889" y1="2.032" x2="-0.889" y2="2.032" width="0.1524" layer="21"/>
+<pad name="1" x="-1.27" y="0" drill="0.8128" diameter="1.6764"/>
+<pad name="2" x="1.27" y="0" drill="0.8128" diameter="1.6764"/>
+<text x="-1.397" y="2.032" size="1.27" layer="25" ratio="10" rot="R90">&gt;NAME</text>
+<text x="2.667" y="2.032" size="1.27" layer="27" ratio="10" rot="R90">&gt;VALUE</text>
+<rectangle x1="0.3048" y1="1.016" x2="0.7112" y2="1.6002" layer="21"/>
+<rectangle x1="-0.7112" y1="1.016" x2="-0.3048" y2="1.6002" layer="21"/>
+<rectangle x1="-1.778" y1="0.762" x2="1.778" y2="8.382" layer="43"/>
+</package>
 </packages>
 </library>
 <library name="atmel">
@@ -961,11 +996,11 @@ Please make sure your boards conform to 
 <element name="C_CRYS2" library="SparkFun" package="0603-CAP" value="18pf" x="17.018" y="8.5852" rot="R90"/>
 <element name="C_CRYS1" library="SparkFun" package="0603-CAP" value="18pf" x="14.224" y="8.5852" rot="R90"/>
 <element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="15.0876" y="13.6652" rot="R90"/>
-<element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="37.084" y="18.288" rot="R180"/>
-<element name="L2" library="SparkFun" package="0603" value="10uH" x="37.084" y="15.7988"/>
+<element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="37.084" y="18.9992" rot="R180"/>
+<element name="L2" library="SparkFun" package="0603" value="10uH" x="37.084" y="16.8148"/>
 <element name="C16" library="SparkFun" package="0603-CAP" value=".1uF" x="14.478" y="20.066" rot="R180"/>
-<element name="C17" library="SparkFun" package="0603-CAP" value=".1uF" x="37.084" y="20.574"/>
-<element name="C18" library="SparkFun" package="0603-CAP" value="10uF" x="37.084" y="22.86"/>
+<element name="C17" library="SparkFun" package="0603-CAP" value=".1uF" x="37.084" y="21.2852"/>
+<element name="C18" library="SparkFun" package="0603-CAP" value="10uF" x="37.084" y="23.5712"/>
 <element name="ICSP" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="5.334" y="28.5496"/>
 <element name="R_SCL" library="SparkFun" package="0603-RES" value="4.7k" x="13.9192" y="32.512" rot="R270"/>
 <element name="R_SDA" library="SparkFun" package="0603-RES" value="4.7k" x="17.272" y="32.512" rot="R270"/>
@@ -991,6 +1026,7 @@ Please make sure your boards conform to 
 <element name="LED1" library="adafruit" package="CHIPLED_0603" value="GREEN" x="5.08" y="13.716" rot="R90"/>
 <element name="LED2" library="adafruit" package="CHIPLED_0603" value="WHITE" x="5.08" y="11.176" rot="R90"/>
 <element name="LED3" library="adafruit" package="CHIPLED_0603" value="RED" x="5.08" y="8.636" rot="R90"/>
+<element name="Y1" library="SparkFun" package="TC26H" value="" x="-23.6728" y="-2.032"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1055,8 +1091,8 @@ Please make sure your boards conform to 
 <wire x1="4.33" y1="13.716" x2="4.33" y2="16.256" width="0.4064" layer="1"/>
 <wire x1="4.33" y1="16.256" x2="4.33" y2="18.796" width="0.4064" layer="1"/>
 <wire x1="51.0032" y1="3.576" x2="51.054" y2="3.6268" width="0.6096" layer="1"/>
-<wire x1="37.934" y1="22.86" x2="37.934" y2="20.574" width="0.4064" layer="1"/>
-<wire x1="37.934" y1="20.574" x2="37.934" y2="18.288" width="0.4064" layer="1"/>
+<wire x1="37.934" y1="23.5712" x2="37.934" y2="21.2852" width="0.4064" layer="1"/>
+<wire x1="37.934" y1="21.2852" x2="37.934" y2="18.9992" width="0.4064" layer="1"/>
 <wire x1="45.085" y1="34.4805" 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"/>
@@ -1149,7 +1185,7 @@ Please make sure your boards conform to 
 <wire x1="11.684" y1="29.552" x2="11.684" y2="29.5656" width="0.4064" layer="1"/>
 <wire x1="9.3472" y1="32.004" x2="4.9784" y2="32.004" width="0.4064" layer="1"/>
 <wire x1="25.1968" y1="12.1832" x2="25.273" y2="12.107" width="0.4064" layer="1"/>
-<wire x1="36.234" y1="22.86" x2="36.234" y2="20.574" width="0.4064" layer="1"/>
+<wire x1="36.234" y1="23.5712" x2="36.234" y2="21.2852" width="0.4064" layer="1"/>
 <wire x1="2.794" y1="29.8196" x2="5.8928" y2="32.9184" width="0.4064" layer="16"/>
 <wire x1="5.8928" y1="32.9184" x2="25.8064" y2="32.9184" width="0.4064" layer="16"/>
 <via x="25.8064" y="32.9184" extent="1-16" drill="0.254"/>
@@ -1161,16 +1197,9 @@ Please make sure your boards conform to 
 <wire x1="53.026" y1="24.511" x2="52.1462" y2="24.511" width="0.4064" layer="1"/>
 <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="37.934" y1="15.7988" x2="38.1508" y2="15.7988" width="0.4064" layer="1"/>
-<wire x1="38.1508" y1="15.7988" x2="39.2176" y2="16.8656" width="0.4064" layer="1"/>
-<wire x1="39.2176" y1="24.384" x2="39.4208" y2="24.5872" width="0.4064" layer="1"/>
-<wire x1="36.234" y1="22.86" x2="36.234" y2="23.026" width="0.4064" layer="1"/>
-<wire x1="36.234" y1="23.026" x2="37.592" y2="24.384" width="0.4064" layer="1"/>
-<wire x1="37.592" y1="24.384" x2="39.2176" y2="24.384" width="0.4064" layer="1"/>
-<via x="39.4208" y="24.5872" extent="1-16" drill="0.254"/>
-<via x="39.2176" y="16.8656" extent="1-16" drill="0.254"/>
-<wire x1="39.2176" y1="16.8656" x2="39.2176" y2="24.384" width="0.4064" layer="16"/>
-<wire x1="39.2176" y1="24.384" x2="39.4208" y2="24.5872" width="0.4064" layer="16"/>
+<via x="39.116" y="24.6888" extent="1-16" drill="0.254"/>
+<via x="39.116" y="16.8656" extent="1-16" drill="0.254"/>
+<wire x1="39.116" y1="16.8656" x2="39.116" y2="24.6888" width="0.4064" layer="16"/>
 <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"/>
@@ -1199,8 +1228,7 @@ Please make sure your boards conform to 
 <wire x1="57.912" y1="27.2288" x2="50.6984" y2="34.4424" width="0.8128" layer="16"/>
 <wire x1="50.6984" y1="34.4424" x2="31.7874" y2="34.4424" width="0.8128" layer="16"/>
 <wire x1="31.7874" y1="34.4424" x2="29.53" y2="32.185" width="0.8128" layer="16"/>
-<wire x1="45.6184" y1="24.6888" x2="39.5224" y2="24.6888" width="0.4064" layer="16"/>
-<wire x1="39.5224" y1="24.6888" x2="39.4208" y2="24.5872" width="0.4064" layer="16"/>
+<wire x1="45.6184" y1="24.6888" x2="39.116" y2="24.6888" width="0.4064" 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"/>
@@ -1223,6 +1251,11 @@ Please make sure your boards conform to 
 <wire x1="2.663253125" y1="29.688853125" x2="2.794" y2="29.8196" width="0.4064" layer="16"/>
 <wire x1="11.0744" y1="5.4864" x2="8.8392" y2="7.7216" width="0.4064" layer="16"/>
 <wire x1="21.2344" y1="5.4864" x2="22.86" y2="3.8608" width="0.4064" layer="16"/>
+<wire x1="37.934" y1="16.8148" x2="39.0652" y2="16.8148" width="0.4064" layer="1"/>
+<wire x1="39.0652" y1="16.8148" x2="39.116" y2="16.8656" width="0.4064" layer="1"/>
+<wire x1="36.234" y1="23.5712" x2="36.234" y2="24.3468" width="0.4064" layer="1"/>
+<wire x1="36.234" y1="24.3468" x2="36.576" y2="24.6888" width="0.4064" layer="1"/>
+<wire x1="36.576" y1="24.6888" x2="39.116" y2="24.6888" width="0.4064" layer="1"/>
 </signal>
 <signal name="RESET">
 <contactref element="R1" pad="2"/>
@@ -1338,13 +1371,14 @@ Please make sure your boards conform to 
 <wire x1="18.8976" y1="30.3784" x2="30.48" y2="30.3784" width="0.4064" layer="16"/>
 <via x="30.48" y="30.3784" extent="1-16" drill="0.254"/>
 <wire x1="30.48" y1="30.3784" x2="30.5816" y2="30.3784" width="0.4064" layer="1"/>
-<wire x1="30.5816" y1="30.3784" x2="31.0896" y2="29.8704" width="0.4064" layer="1"/>
-<wire x1="31.0896" y1="29.8704" x2="31.0896" y2="25.0952" width="0.4064" layer="1"/>
-<via x="31.0896" y="25.0952" extent="1-16" drill="0.254"/>
-<wire x1="31.0896" y1="25.0952" x2="31.0896" y2="17.5768" width="0.4064" layer="16"/>
-<wire x1="31.0896" y1="17.5768" x2="27.6352" y2="14.1224" width="0.4064" layer="16"/>
-<via x="27.6352" y="14.1224" extent="1-16" drill="0.254"/>
-<wire x1="27.6352" y1="14.1224" x2="27.6352" y2="12.1448" width="0.4064" layer="1"/>
+<via x="30.988" y="25.0952" extent="1-16" drill="0.254"/>
+<wire x1="30.988" y1="25.0952" x2="30.988" y2="17.6784" width="0.4064" layer="16"/>
+<wire x1="30.5816" y1="30.3784" x2="30.5816" y2="30.2768" width="0.4064" layer="1"/>
+<wire x1="30.5816" y1="30.2768" x2="30.988" y2="29.8704" width="0.4064" layer="1"/>
+<wire x1="30.988" y1="29.8704" x2="30.988" y2="25.0952" width="0.4064" layer="1"/>
+<wire x1="30.988" y1="17.6784" x2="27.6352" y2="14.3256" width="0.4064" layer="16"/>
+<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"/>
 </signal>
 <signal name="SCL">
@@ -1526,16 +1560,19 @@ Please make sure your boards conform to 
 <signal name="N$12">
 <contactref element="C15" pad="2"/>
 <contactref element="IC1" pad="29"/>
-<wire x1="31.073" y1="18.707" x2="35.815" y2="18.707" width="0.4064" layer="1"/>
-<wire x1="35.815" y1="18.707" x2="36.234" y2="18.288" width="0.4064" layer="1"/>
+<wire x1="31.073" y1="18.707" x2="34.455" y2="18.707" width="0.4064" layer="1"/>
+<wire x1="34.455" y1="18.707" x2="34.7472" y2="18.9992" width="0.4064" layer="1"/>
+<wire x1="34.7472" y1="18.9992" x2="36.234" y2="18.9992" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="L2" pad="1"/>
 <contactref element="IC1" pad="27"/>
-<wire x1="36.234" y1="15.7988" x2="34.798" y2="15.7988" width="0.4064" layer="1"/>
-<wire x1="34.798" y1="15.7988" x2="33.528" y2="17.0688" width="0.4064" layer="1"/>
-<wire x1="33.528" y1="17.0688" x2="31.1112" y2="17.0688" width="0.4064" layer="1"/>
 <wire x1="31.1112" y1="17.0688" x2="31.073" y2="17.107" width="0.4064" layer="1"/>
+<wire x1="35.98" y1="17.0688" x2="36.234" y2="16.8148" width="0.4064" layer="1"/>
+<wire x1="31.1112" y1="17.0688" x2="34.4424" y2="17.0688" width="0.4064" layer="1"/>
+<wire x1="34.4424" y1="17.0688" x2="34.7472" y2="16.764" width="0.4064" layer="1"/>
+<wire x1="34.7472" y1="16.764" x2="36.1832" y2="16.764" width="0.4064" layer="1"/>
+<wire x1="36.1832" y1="16.764" x2="36.234" y2="16.8148" width="0.4064" layer="1"/>
 </signal>
 <signal name="RXD0">
 <contactref element="IC1" pad="9"/>
@@ -1608,27 +1645,23 @@ Please make sure your boards conform to 
 </signal>
 <signal name="DIP1">
 <contactref element="ROTARY_DIP" pad="2"/>
-<contactref element="IC1" pad="24"/>
-<wire x1="31.073" y1="14.707" x2="32.4354" y2="14.707" width="0.4064" layer="1"/>
-<via x="33.02" y="14.1224" extent="1-16" drill="0.254"/>
-<wire x1="32.4354" y1="14.707" x2="33.02" y2="14.1224" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="14.1224" x2="33.02" y2="22.352" width="0.4064" layer="16"/>
-<wire x1="33.02" y1="22.352" x2="37.3888" y2="26.7208" width="0.4064" layer="16"/>
+<wire x1="32.4104" y1="21.7424" x2="37.3888" y2="26.7208" width="0.4064" layer="16"/>
 <via x="37.3888" y="26.7208" extent="1-16" drill="0.254"/>
 <wire x1="37.3888" y1="26.7208" 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="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.356" y2="31.9405" 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"/>
 </signal>
 <signal name="DIP3">
 <contactref element="ROTARY_DIP" pad="8"/>
-<contactref element="IC1" pad="26"/>
-<wire x1="31.073" y1="16.307" x2="33.0706" y2="16.307" width="0.4064" layer="1"/>
-<via x="34.4424" y="14.9352" extent="1-16" drill="0.254"/>
-<wire x1="34.4424" y1="14.9352" x2="34.4424" y2="21.7424" width="0.4064" layer="16"/>
-<wire x1="33.0706" y1="16.307" x2="34.4424" y2="14.9352" width="0.4064" layer="1"/>
-<wire x1="34.4424" y1="21.7424" x2="39.4208" y2="26.7208" width="0.4064" layer="16"/>
+<wire x1="33.8328" y1="21.1328" x2="39.4208" y2="26.7208" width="0.4064" layer="16"/>
 <via x="39.4208" y="26.7208" extent="1-16" drill="0.254"/>
 <wire x1="39.4208" y1="26.7208" x2="42.3672" y2="29.6672" width="0.4064" layer="1"/>
 <wire x1="42.3672" y1="29.6672" x2="45.6184" y2="29.6672" width="0.4064" layer="1"/>
@@ -1641,36 +1674,42 @@ Please make sure your boards conform to 
 <wire x1="54.6989" y1="36.6776" x2="54.356" y2="37.0205" width="0.4064" layer="1"/>
 <wire x1="55.9816" y1="30.2768" x2="56.7944" y2="31.0896" width="0.4064" layer="1"/>
 <wire x1="56.7944" y1="35.052" x2="54.9656" y2="36.8808" width="0.4064" layer="1"/>
+<contactref element="IC1" pad="24"/>
+<wire x1="33.8328" y1="21.1328" x2="33.8328" y2="14.732" width="0.4064" layer="16"/>
+<via x="33.8328" y="14.732" extent="1-16" drill="0.254"/>
+<wire x1="33.8328" y1="14.732" x2="31.098" y2="14.732" width="0.4064" layer="1"/>
+<wire x1="31.098" y1="14.732" x2="31.073" y2="14.707" width="0.4064" layer="1"/>
 </signal>
 <signal name="DIP2">
 <contactref element="ROTARY_DIP" pad="4"/>
-<contactref element="IC1" pad="25"/>
-<wire x1="31.073" y1="15.507" x2="32.753" y2="15.507" width="0.4064" layer="1"/>
-<via x="33.7312" y="14.5288" extent="1-16" drill="0.254"/>
-<wire x1="32.753" y1="15.507" x2="33.7312" y2="14.5288" width="0.4064" layer="1"/>
-<wire x1="33.7312" y1="14.5288" x2="33.7312" y2="22.0472" width="0.4064" layer="16"/>
-<wire x1="33.7312" y1="22.0472" x2="38.4048" y2="26.7208" width="0.4064" layer="16"/>
+<wire x1="33.1216" y1="21.4376" x2="38.4048" y2="26.7208" width="0.4064" layer="16"/>
 <via x="38.4048" y="26.7208" extent="1-16" drill="0.254"/>
 <wire x1="38.4048" y1="26.7208" x2="42.3672" y2="30.6832" width="0.4064" layer="1"/>
 <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.085" y2="31.9405" 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"/>
 </signal>
 <signal name="DIP0">
 <contactref element="ROTARY_DIP" pad="1"/>
-<contactref element="IC1" pad="23"/>
-<wire x1="31.073" y1="13.907" x2="32.1178" y2="13.907" width="0.4064" layer="1"/>
-<wire x1="32.1178" y1="13.907" x2="32.3088" y2="13.716" width="0.4064" layer="1"/>
-<via x="32.3088" y="13.716" extent="1-16" drill="0.254"/>
-<wire x1="32.3088" y1="13.716" x2="32.3088" y2="22.6568" width="0.4064" layer="16"/>
-<wire x1="32.3088" y1="22.6568" x2="36.3728" y2="26.7208" width="0.4064" layer="16"/>
+<wire x1="31.6992" y1="22.0472" x2="36.3728" y2="26.7208" width="0.4064" layer="16"/>
 <via x="36.3728" y="26.7208" extent="1-16" drill="0.254"/>
 <wire x1="36.3728" y1="26.7208" 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.085" y2="37.0205" width="0.4064" layer="1"/>
+<contactref element="IC1" pad="21"/>
+<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"/>
 </signal>
 <signal name="PWM0">
 <contactref element="IC1" pad="40"/>
@@ -1777,10 +1816,11 @@ Please make sure your boards conform to 
 <via x="23.6728" y="21.7424" extent="1-16" drill="0.254"/>
 <via x="35.1536" y="13.0048" extent="1-16" drill="0.254"/>
 <wire x1="35.1536" y1="13.0048" x2="37.0468" y2="13.0048" width="0.4064" layer="1"/>
-<wire x1="35.1536" y1="13.0048" x2="27.1272" y2="13.0048" width="0.4064" layer="16"/>
-<wire x1="25.908" y1="14.224" x2="25.908" y2="19.5072" width="0.4064" layer="16"/>
-<wire x1="27.1272" y1="13.0048" x2="25.908" y2="14.224" width="0.4064" layer="16"/>
+<wire x1="25.908" y1="13.208" x2="25.908" y2="19.5072" width="0.4064" layer="16"/>
 <wire x1="25.908" y1="19.5072" x2="23.6728" y2="21.7424" width="0.4064" layer="16"/>
+<wire x1="35.1536" y1="13.0048" x2="34.036" y2="11.8872" width="0.4064" layer="16"/>
+<wire x1="34.036" y1="11.8872" x2="27.2288" y2="11.8872" width="0.4064" layer="16"/>
+<wire x1="27.2288" y1="11.8872" x2="25.908" y2="13.208" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$1">
 <contactref element="R_LED0" pad="1"/>
@@ -1833,11 +1873,10 @@ Please make sure your boards conform to 
 </signal>
 <signal name="N$24">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="30.6832" y="18.288"/>
+<vertex x="30.6832" y="17.4752"/>
 <vertex x="30.6832" y="18.3896"/>
 <vertex x="31.3944" y="18.3896"/>
 <vertex x="31.3944" y="17.4752"/>
-<vertex x="30.6832" y="17.4752"/>
 </polygon>
 </signal>
 <signal name="N$25">
@@ -2197,58 +2236,58 @@ Please make sure your boards conform to 
 </signal>
 <signal name="N$61">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="37.3888" y="22.2504"/>
-<vertex x="36.8808" y="22.2504"/>
-<vertex x="36.8808" y="22.11705"/>
-<vertex x="37.3888" y="22.11705"/>
+<vertex x="37.3888" y="22.9616"/>
+<vertex x="36.8808" y="22.9616"/>
+<vertex x="36.8808" y="22.82825"/>
+<vertex x="37.3888" y="22.82825"/>
 </polygon>
 </signal>
 <signal name="N$62">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="21.31695"/>
-<vertex x="36.8808" y="21.2344"/>
-<vertex x="37.3888" y="21.2344"/>
-<vertex x="37.3888" y="21.31695"/>
+<vertex x="36.8808" y="22.02815"/>
+<vertex x="36.8808" y="21.9456"/>
+<vertex x="37.3888" y="21.9456"/>
+<vertex x="37.3888" y="22.02815"/>
 </polygon>
 </signal>
 <signal name="N$63">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="15.1384"/>
-<vertex x="36.8808" y="15.05585"/>
-<vertex x="37.2872" y="15.05585"/>
-<vertex x="37.2872" y="15.1384"/>
+<vertex x="36.8808" y="16.1544"/>
+<vertex x="36.8808" y="16.07185"/>
+<vertex x="37.2872" y="16.07185"/>
+<vertex x="37.2872" y="16.1544"/>
 </polygon>
 </signal>
 <signal name="N$64">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="16.54175"/>
-<vertex x="36.8808" y="16.4592"/>
-<vertex x="37.2872" y="16.4592"/>
-<vertex x="37.2872" y="16.54175"/>
+<vertex x="36.8808" y="17.55775"/>
+<vertex x="36.8808" y="17.4752"/>
+<vertex x="37.2872" y="17.4752"/>
+<vertex x="37.2872" y="17.55775"/>
 </polygon>
 </signal>
 <signal name="N$65">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="17.6784"/>
-<vertex x="36.8808" y="17.54505"/>
-<vertex x="37.2872" y="17.54505"/>
-<vertex x="37.2872" y="17.6784"/>
+<vertex x="36.8808" y="18.3896"/>
+<vertex x="36.8808" y="18.25625"/>
+<vertex x="37.2872" y="18.25625"/>
+<vertex x="37.2872" y="18.3896"/>
 </polygon>
 </signal>
 <signal name="N$66">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="19.03095"/>
-<vertex x="36.8808" y="18.8976"/>
-<vertex x="37.3888" y="18.8976"/>
-<vertex x="37.3888" y="19.03095"/>
+<vertex x="36.8808" y="19.74215"/>
+<vertex x="36.8808" y="19.6088"/>
+<vertex x="37.3888" y="19.6088"/>
+<vertex x="37.3888" y="19.74215"/>
 </polygon>
 </signal>
 <signal name="N$67">
 <polygon width="0.0254" layer="1" pour="cutout">
-<vertex x="36.8808" y="19.9136"/>
-<vertex x="36.8808" y="19.83105"/>
-<vertex x="37.2872" y="19.83105"/>
-<vertex x="37.2872" y="19.9136"/>
+<vertex x="36.8808" y="20.6248"/>
+<vertex x="36.8808" y="20.54225"/>
+<vertex x="37.2872" y="20.54225"/>
+<vertex x="37.2872" y="20.6248"/>
 </polygon>
 </signal>
 <signal name="N$68">
@@ -2413,6 +2452,12 @@ Please make sure your boards conform to 
 <vertex x="53.4416" y="8.7376"/>
 </polygon>
 </signal>
+<signal name="TOSC1">
+<contactref element="IC1" pad="25"/>
+</signal>
+<signal name="TOSC2">
+<contactref element="IC1" pad="26"/>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/slave/slave.sch b/slave/slave.sch
--- a/slave/slave.sch
+++ b/slave/slave.sch
@@ -4784,6 +4784,7 @@ Source: http://www.osram.convergy.de/</d
 <part name="GND20" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND21" library="SparkFun" deviceset="GND" device=""/>
 <part name="P+2" library="SparkFun" deviceset="VCC" device=""/>
+<part name="Y1" library="SparkFun" deviceset="CRYSTAL" device="TC26H"/>
 </parts>
 <sheets>
 <sheet>
@@ -4805,9 +4806,9 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="93.98" y1="185.42" x2="93.98" y2="157.48" width="0.4064" layer="94"/>
 <wire x1="93.98" y1="157.48" x2="93.98" y2="106.68" width="0.4064" layer="94"/>
 <wire x1="147.32" y1="53.34" x2="129.54" y2="53.34" width="0.4064" layer="94"/>
-<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="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">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"/>
@@ -4830,7 +4831,7 @@ Source: http://www.osram.convergy.de/</d
 <text x="241.554" y="72.136" size="1.778" layer="94">USART</text>
 <text x="96.774" y="100.076" size="5.08" layer="94" font="vector">I2C</text>
 <text x="33.02" y="93.98" size="3.81" layer="91">TODO</text>
-<wire x1="241.046" y1="101.092" x2="241.046" y2="111.252" width="0.1524" layer="94"/>
+<wire x1="241.046" y1="96.012" x2="241.046" y2="106.172" 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"/>
@@ -4954,6 +4955,7 @@ Source: http://www.osram.convergy.de/</d
 <instance part="P+2" gate="1" x="7.62" y="83.82" smashed="yes">
 <attribute name="VALUE" x="1.524" y="84.836" size="1.778" layer="96"/>
 </instance>
+<instance part="Y1" gate="G$1" x="149.86" y="76.2"/>
 </instances>
 <busses>
 </busses>
@@ -5671,9 +5673,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="81.28" y="167.64" 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"/>
+<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="DIP3" class="0">
@@ -5683,9 +5685,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="81.28" y="172.72" 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"/>
+<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="DIP2" class="0">
@@ -5695,9 +5697,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="50.8" y="167.64" 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"/>
+<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="DIP0" class="0">
@@ -5707,9 +5709,9 @@ Source: http://www.osram.convergy.de/</d
 <label x="50.8" y="172.72" 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"/>
+<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="PWM0" class="0">
@@ -5843,6 +5845,20 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="15.24" y1="137.16" x2="15.24" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="TOSC1" class="0">
+<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="TOSC2" class="0">
+<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>
 </nets>
 </sheet>
 </sheets>