diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -8,22 +8,22 @@
 </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="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" 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="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" 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="yes" 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="no" 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"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <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="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" 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"/>
@@ -4498,10 +4498,10 @@ Please make sure your boards conform to 
 </pass>
 </autorouter>
 <elements>
-<element name="U$1" library="SparkFun" package="XBEE-SMD" value="XBEE-1B3" x="49.53" y="19.685" rot="MR270">
-<attribute name="OC_NEWARK" value="unknown" x="49.53" y="19.685" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="MF" value="" x="49.53" y="19.685" size="1.778" layer="28" rot="MR270" display="off"/>
-<attribute name="MPN" value="" x="49.53" y="19.685" size="1.778" layer="28" rot="MR270" display="off"/>
+<element name="U$1" library="SparkFun" package="XBEE-SMD" value="XBEE-1B3" x="35.56" y="19.685" rot="MR90">
+<attribute name="OC_NEWARK" value="unknown" x="35.56" y="19.685" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MF" value="" x="35.56" y="19.685" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="" x="35.56" y="19.685" size="1.778" layer="28" rot="MR90" display="off"/>
 </element>
 <element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644A" x="25.273" y="17.907">
 <attribute name="OC_NEWARK" value="unknown" x="78.613" y="7.747" size="1.778" layer="27" display="off"/>
@@ -4824,10 +4824,7 @@ Please make sure your boards conform to 
 <vertex x="69.6976" y="42.8752"/>
 <vertex x="-3.048" y="42.8752"/>
 </polygon>
-<wire x1="47.53" y1="29.185" x2="47.5746" y2="29.185" width="0.8128" layer="16"/>
-<via x="51.1048" y="29.8704" extent="1-16" drill="0.6"/>
-<wire x1="51.1048" y1="29.8704" x2="51.1048" y2="28.5242" width="0.8128" layer="1"/>
-<wire x1="51.1048" y1="28.5242" x2="50.9016" y2="28.321" width="0.8128" layer="1"/>
+<via x="49.5808" y="29.8704" extent="1-16" drill="0.6"/>
 <wire x1="33.8328" y1="9.9568" x2="27.2288" y2="9.9568" width="0.4064" layer="1"/>
 <wire x1="27.2288" y1="9.9568" x2="26.1112" y2="11.0744" width="0.4064" layer="1"/>
 <wire x1="26.1112" y1="11.0744" x2="26.1112" y2="12.0688" width="0.4064" layer="1"/>
@@ -4838,8 +4835,6 @@ Please make sure your boards conform to 
 <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"/>
-<wire x1="25.26665" y1="22.0472" x2="24.7904" y2="22.0472" width="0.4064" layer="1"/>
-<via x="24.7904" y="22.0472" extent="1-16" drill="0.254"/>
 <via x="44.196" y="14.6304" extent="1-16" drill="0.381"/>
 <via x="45.0088" y="14.6304" extent="1-16" drill="0.381"/>
 <via x="45.8216" y="14.6304" extent="1-16" drill="0.381"/>
@@ -4857,6 +4852,8 @@ 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.6408" y="8.636" extent="1-16" drill="0.254"/>
+<via x="26.8224" y="18.796" extent="1-16" drill="0.254"/>
 </signal>
 <signal name="VCC">
 <contactref element="IC1" pad="38"/>
@@ -4890,24 +4887,19 @@ Please make sure your boards conform to 
 <wire x1="13.9192" y1="31.662" x2="13.9192" y2="29.9368" width="0.4064" layer="1"/>
 <wire x1="13.9192" y1="29.9368" x2="14.204" y2="29.652" width="0.4064" layer="1"/>
 <wire x1="24.13" y1="31.584" x2="21.844" y2="31.584" width="0.4064" layer="1"/>
-<wire x1="26.0096" y1="16.5608" x2="26.0096" y2="23.6436" width="0.4064" layer="1"/>
+<wire x1="26.0096" y1="16.5608" x2="26.0096" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="26.0096" y1="17.78" x2="26.0096" y2="23.6436" width="0.4064" layer="1"/>
 <wire x1="26.0096" y1="23.6436" x2="26.073" y2="23.707" width="0.4064" layer="1"/>
 <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="24.1808" x2="36.234" y2="22.098" 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"/>
-<wire x1="25.8064" y1="32.9184" x2="25.4644" y2="32.9184" width="0.4064" layer="1"/>
-<wire x1="25.4644" y1="32.9184" x2="24.13" y2="31.584" width="0.4064" layer="1"/>
 <wire x1="4.9784" y1="32.004" x2="2.794" y2="29.8196" width="0.4064" layer="1"/>
 <wire x1="17.272" y1="31.662" x2="21.766" y2="31.662" width="0.4064" layer="1"/>
 <wire x1="21.766" y1="31.662" x2="21.844" y2="31.584" width="0.4064" layer="1"/>
 <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"/>
-<via x="39.9288" y="24.6888" 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"/>
@@ -4932,19 +4924,11 @@ Please make sure your boards conform to 
 <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="27.2288" width="0.8128" layer="16"/>
-<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="48.1584" y1="24.6888" x2="39.9288" y2="24.6888" width="0.4064" layer="16"/>
+<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="25.8064" y1="32.9184" x2="29.0576" y2="32.9184" width="0.4064" layer="16"/>
-<wire x1="29.0576" y1="32.9184" x2="29.2608" y2="32.7152" width="0.4064" layer="16"/>
-<wire x1="29.2608" y1="32.7152" x2="29.2608" y2="32.4542" width="0.4064" layer="16"/>
-<wire x1="29.2608" y1="32.4542" x2="29.53" y2="32.185" width="0.4064" layer="16"/>
 <wire x1="22.86" y1="2.667" x2="22.86" y2="3.8608" width="0.4064" layer="16"/>
 <wire x1="21.2344" y1="5.4864" x2="11.0744" y2="5.4864" width="0.4064" layer="16"/>
 <wire x1="8.8392" y1="7.7216" x2="8.8392" y2="17.0688" width="0.4064" layer="16"/>
@@ -4959,13 +4943,11 @@ Please make sure your boards conform to 
 <wire x1="21.2344" y1="5.4864" x2="22.86" y2="3.8608" width="0.4064" layer="16"/>
 <wire x1="36.234" y1="24.1808" x2="36.234" y2="24.3468" width="0.4064" layer="1"/>
 <wire x1="36.234" y1="24.3468" x2="36.9824" y2="25.0952" width="0.4064" layer="1"/>
-<wire x1="36.9824" y1="25.0952" x2="39.5224" y2="25.0952" width="0.4064" layer="1"/>
-<wire x1="39.5224" y1="25.0952" x2="39.9288" y2="24.6888" width="0.4064" layer="1"/>
 <wire x1="37.934" y1="18.1356" x2="39.46045" y2="18.1356" width="0.4064" layer="1"/>
 <wire x1="39.46045" y1="18.1356" x2="39.9288" y2="18.60395" width="0.4064" layer="1"/>
-<wire x1="39.9288" y1="18.60395" x2="39.9288" y2="24.6888" width="0.4064" layer="1"/>
-<wire x1="48.1584" y1="24.6888" x2="49.784" y2="23.0632" width="0.4064" layer="16"/>
+<wire x1="39.9288" y1="18.60395" x2="39.9288" y2="25.0952" width="0.4064" layer="1"/>
 <contactref element="C3" pad="1"/>
+<wire x1="48.4124" y1="24.4348" x2="49.784" y2="23.0632" width="0.4064" layer="16"/>
 <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"/>
@@ -4976,6 +4958,24 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="55.56" y1="7.185" x2="55.5752" y2="7.185" width="0.6096" layer="16"/>
+<wire x1="21.9456" y1="17.78" x2="26.0096" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="19.473" y1="18.6944" x2="21.0312" y2="18.6944" width="0.4064" layer="1"/>
+<wire x1="21.0312" y1="18.6944" x2="21.9456" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="19.473" y1="18.6944" x2="19.473" y2="18.707" width="0.4064" layer="1"/>
+<wire x1="36.9824" y1="25.0952" x2="39.9288" y2="25.0952" width="0.4064" layer="1"/>
+<wire x1="39.9288" y1="25.0952" x2="43.2816" y2="25.0952" width="0.4064" layer="1"/>
+<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="48.1584" y1="24.6888" x2="48.4124" y2="24.4348" width="0.4064" layer="16"/>
 </signal>
 <signal name="RESET">
 <contactref element="R1" pad="2"/>
@@ -5308,27 +5308,25 @@ Please make sure your boards conform to 
 <contactref element="U$1" pad="2"/>
 <via x="20.9296" y="15.5448" extent="1-16" drill="0.254"/>
 <wire x1="20.9296" y1="15.5448" x2="20.9296" y2="22.0472" width="0.4064" layer="16"/>
-<wire x1="20.9296" y1="22.0472" x2="26.7208" y2="27.8384" width="0.4064" layer="16"/>
-<wire x1="31.5042" y1="29.1592" x2="31.53" y2="29.185" width="0.4064" layer="16"/>
-<wire x1="26.7208" y1="27.8384" x2="30.6832" y2="27.8384" width="0.4064" layer="16"/>
-<wire x1="30.6832" y1="27.8384" x2="31.3944" y2="28.5496" width="0.4064" layer="16"/>
-<wire x1="31.3944" y1="28.5496" x2="31.3944" y2="29.0494" width="0.4064" layer="16"/>
-<wire x1="31.3944" y1="29.0494" x2="31.53" y2="29.185" width="0.4064" layer="16"/>
+<wire x1="20.9296" y1="22.0472" x2="26.5176" y2="27.6352" width="0.4064" layer="16"/>
 <wire x1="19.473" y1="15.507" x2="20.8918" y2="15.507" width="0.4064" layer="1"/>
 <wire x1="20.8918" y1="15.507" x2="20.9296" y2="15.5448" width="0.4064" layer="1"/>
+<wire x1="26.5176" y1="27.6352" x2="39.4208" y2="27.6352" width="0.4064" layer="16"/>
+<wire x1="39.4208" y1="27.6352" x2="53.5432" y2="13.5128" width="0.4064" layer="16"/>
+<wire x1="53.5432" y1="13.5128" x2="53.5432" y2="10.2018" width="0.4064" layer="16"/>
+<wire x1="53.5432" y1="10.2018" x2="53.56" y2="10.185" width="0.4064" layer="16"/>
 </signal>
 <signal name="TXD0">
 <contactref element="IC1" pad="10"/>
 <contactref element="U$1" pad="3"/>
 <via x="21.6408" y="14.732" extent="1-16" drill="0.254"/>
 <wire x1="21.6408" y1="14.732" x2="21.6408" y2="21.6408" width="0.4064" layer="16"/>
-<wire x1="21.6408" y1="21.6408" x2="27.1272" y2="27.1272" width="0.4064" layer="16"/>
-<wire x1="27.1272" y1="27.1272" x2="32.2072" y2="27.1272" width="0.4064" layer="16"/>
-<wire x1="32.2072" y1="27.1272" x2="33.528" y2="28.448" width="0.4064" layer="16"/>
-<wire x1="33.528" y1="28.448" x2="33.528" y2="32.183" width="0.4064" layer="16"/>
-<wire x1="33.528" y1="32.183" x2="33.53" y2="32.185" width="0.4064" layer="16"/>
+<wire x1="21.6408" y1="21.6408" x2="26.924" y2="26.924" width="0.4064" layer="16"/>
 <wire x1="19.473" y1="14.707" x2="21.6158" y2="14.707" width="0.4064" layer="1"/>
 <wire x1="21.6158" y1="14.707" x2="21.6408" y2="14.732" width="0.4064" layer="1"/>
+<wire x1="26.924" y1="26.924" x2="39.0144" y2="26.924" width="0.4064" layer="16"/>
+<wire x1="39.0144" y1="26.924" x2="51.56" y2="14.3784" width="0.4064" layer="16"/>
+<wire x1="51.56" y1="14.3784" x2="51.56" y2="7.185" width="0.4064" layer="16"/>
 </signal>
 <signal name="RXD1">
 <contactref element="IC1" pad="11"/>
@@ -5374,9 +5372,9 @@ Please make sure your boards conform to 
 </signal>
 <signal name="DIP1">
 <contactref element="ROTARY_DIP" pad="2"/>
-<wire x1="32.4104" y1="21.7424" x2="37.4904" y2="26.8224" width="0.4064" layer="16"/>
-<via x="37.4904" y="26.8224" extent="1-16" drill="0.254"/>
-<wire x1="37.4904" y1="26.8224" x2="43.7896" y2="33.1216" width="0.4064" layer="1"/>
+<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="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"/>
@@ -5390,9 +5388,9 @@ Please make sure your boards conform to 
 </signal>
 <signal name="DIP3">
 <contactref element="ROTARY_DIP" pad="8"/>
-<wire x1="33.8328" y1="21.1328" x2="39.5224" y2="26.8224" width="0.4064" layer="16"/>
-<via x="39.5224" y="26.8224" extent="1-16" drill="0.254"/>
-<wire x1="39.5224" y1="26.8224" x2="42.672" y2="29.972" width="0.4064" layer="1"/>
+<wire x1="33.8328" y1="21.1328" x2="38.7096" y2="26.0096" width="0.4064" layer="16"/>
+<via x="38.7096" y="26.0096" extent="1-16" drill="0.254"/>
+<wire x1="38.7096" y1="26.0096" x2="42.672" y2="29.972" width="0.4064" layer="1"/>
 <wire x1="42.672" y1="29.972" x2="45.9232" y2="29.972" width="0.4064" layer="1"/>
 <wire x1="45.9232" y1="29.972" x2="47.752" y2="31.8008" width="0.4064" layer="1"/>
 <wire x1="47.752" y1="31.8008" x2="51.816" y2="31.8008" width="0.4064" layer="1"/>
@@ -5412,9 +5410,9 @@ Please make sure your boards conform to 
 </signal>
 <signal name="DIP2">
 <contactref element="ROTARY_DIP" pad="4"/>
-<wire x1="33.1216" y1="21.4376" x2="38.5064" y2="26.8224" width="0.4064" layer="16"/>
-<via x="38.5064" y="26.8224" extent="1-16" drill="0.254"/>
-<wire x1="38.5064" y1="26.8224" x2="42.3672" y2="30.6832" width="0.4064" layer="1"/>
+<wire x1="33.1216" y1="21.4376" x2="37.6936" y2="26.0096" width="0.4064" layer="16"/>
+<via x="37.6936" y="26.0096" extent="1-16" drill="0.254"/>
+<wire x1="37.6936" y1="26.0096" 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"/>
@@ -5427,9 +5425,9 @@ Please make sure your boards conform to 
 </signal>
 <signal name="DIP0">
 <contactref element="ROTARY_DIP" pad="1"/>
-<wire x1="31.6992" y1="22.0472" x2="36.4744" y2="26.8224" width="0.4064" layer="16"/>
-<via x="36.4744" y="26.8224" extent="1-16" drill="0.254"/>
-<wire x1="36.4744" y1="26.8224" x2="42.7736" y2="33.1216" width="0.4064" layer="1"/>
+<wire x1="31.6992" y1="22.0472" x2="35.6616" y2="26.0096" width="0.4064" layer="16"/>
+<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"/>
@@ -5498,18 +5496,13 @@ Please make sure your boards conform to 
 <contactref element="R_ASSOC" pad="2"/>
 <wire x1="9.74" y1="18.796" x2="12.3952" y2="18.796" width="0.4064" layer="1"/>
 <via x="12.3952" y="18.796" extent="1-16" drill="0.254"/>
-<wire x1="9.652" y1="16.0528" x2="9.652" y2="8.128" width="0.4064" layer="16"/>
-<via x="22.4536" y="5.588" extent="1-16" drill="0.254"/>
-<wire x1="22.4536" y1="5.588" x2="29.972" y2="5.588" width="0.4064" layer="1"/>
-<via x="29.972" y="5.588" extent="1-16" drill="0.254"/>
-<wire x1="29.972" y1="5.588" x2="38.4048" y2="5.588" width="0.4064" layer="16"/>
-<wire x1="38.4048" y1="5.588" x2="39.3192" y2="6.5024" width="0.4064" layer="16"/>
-<wire x1="39.3192" y1="6.5024" x2="39.3192" y2="6.9742" width="0.4064" layer="16"/>
-<wire x1="39.3192" y1="6.9742" x2="39.53" y2="7.185" width="0.4064" layer="16"/>
-<wire x1="22.4536" y1="5.588" x2="21.7424" y2="6.2992" width="0.4064" layer="16"/>
-<wire x1="21.7424" y1="6.2992" x2="11.4808" y2="6.2992" width="0.4064" layer="16"/>
-<wire x1="11.4808" y1="6.2992" x2="9.652" y2="8.128" width="0.4064" layer="16"/>
-<wire x1="9.652" y1="16.0528" x2="12.3952" y2="18.796" width="0.4064" layer="16"/>
+<wire x1="12.3952" y1="18.796" x2="13.0048" y2="19.4056" width="0.4064" layer="16"/>
+<wire x1="13.0048" y1="19.4056" x2="13.0048" y2="26.2128" width="0.4064" layer="16"/>
+<wire x1="13.0048" y1="26.2128" x2="21.2344" y2="34.4424" width="0.4064" layer="16"/>
+<wire x1="21.2344" y1="34.4424" x2="43.5864" y2="34.4424" width="0.4064" layer="16"/>
+<wire x1="43.5864" y1="34.4424" x2="45.3136" y2="32.7152" width="0.4064" layer="16"/>
+<wire x1="45.3136" y1="32.7152" x2="45.3136" y2="32.4314" width="0.4064" layer="16"/>
+<wire x1="45.3136" y1="32.4314" x2="45.56" y2="32.185" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$7">
 <contactref element="R_ASSOC" pad="1"/>