diff --git a/slave-daughter/slave-daughter-camera.brd b/slave-daughter/slave-daughter-camera.brd
--- a/slave-daughter/slave-daughter-camera.brd
+++ b/slave-daughter/slave-daughter-camera.brd
@@ -118,10 +118,12 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="100" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="34.29" x2="0" y2="5.08" width="0" layer="20"/>
+<wire x1="0" y1="5.08" x2="5.08" y2="0" width="0" layer="20" curve="90"/>
+<wire x1="5.08" y1="0" x2="100" y2="0" width="0" layer="20"/>
 <wire x1="100" y1="0" x2="100" y2="39.37" width="0" layer="20"/>
-<wire x1="100" y1="39.37" x2="0" y2="39.37" width="0" layer="20"/>
-<wire x1="0" y1="39.37" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="100" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
+<wire x1="5.08" y1="39.37" x2="0" y2="34.29" width="0" layer="20" curve="90"/>
 <text x="-1.27" y="57.15" size="1.778" layer="21">DO NOT MOVE RINGS, PIN HEADERS, OR PCB DIMMENSIONS. THEY ARE ACCURATELY PLACED</text>
 <text x="44.45" y="53.34" size="1.778" layer="21">Miter edges to radius of .2</text>
 </plain>
@@ -434,8 +436,8 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="2.54" locked="yes"/>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="36.83" locked="yes"/>
+<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="X1" library="SparkFun" package="USB-A-H" value="USB-A-H" x="49.53" y="21.59"/>
 <element name="X2" library="SparkFun" package="USB-A-H" value="USB-A-H" x="-20.32" y="22.86"/>
 <element name="X3" library="SparkFun" package="USB-A-H" value="USB-A-H" x="-20.32" y="38.1"/>
@@ -448,7 +450,7 @@ design rules under a new name.</descript
 <contactref element="X3" pad="GND"/>
 <wire x1="-17.92" y1="26.36" x2="-17.92" y2="41.6" width="0" layer="19" extent="1-1"/>
 <wire x1="51.93" y1="25.09" x2="-17.92" y2="26.36" width="0" layer="19" extent="1-1"/>
-<wire x1="7.62" y1="2.667" x2="-17.92" y2="41.6" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="2.667" x2="-17.92" y2="41.6" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="JP1" pad="2"/>
diff --git a/slave-daughter/slave-daughter-gieger.brd b/slave-daughter/slave-daughter-gieger.brd
--- a/slave-daughter/slave-daughter-gieger.brd
+++ b/slave-daughter/slave-daughter-gieger.brd
@@ -102,10 +102,12 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="100" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="34.29" x2="0" y2="5.08" width="0" layer="20"/>
+<wire x1="0" y1="5.08" x2="5.08" y2="0" width="0" layer="20" curve="90"/>
+<wire x1="5.08" y1="0" x2="100" y2="0" width="0" layer="20"/>
 <wire x1="100" y1="0" x2="100" y2="39.37" width="0" layer="20"/>
-<wire x1="100" y1="39.37" x2="0" y2="39.37" width="0" layer="20"/>
-<wire x1="0" y1="39.37" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="100" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
+<wire x1="5.08" y1="39.37" x2="0" y2="34.29" width="0" layer="20" curve="90"/>
 <text x="-3.81" y="54.61" size="1.778" layer="21">DO NOT MOVE RINGS, PIN HEADERS, OR PCB DIMMENSIONS. THEY ARE ACCURATELY PLACED</text>
 </plain>
 <libraries>
@@ -407,8 +409,8 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="2.54" locked="yes"/>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="36.83" locked="yes"/>
+<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="-63.5" y="8.89"/>
 </elements>
 <signals>
diff --git a/slave-daughter/slave-daughter-sensors.brd b/slave-daughter/slave-daughter-sensors.brd
--- a/slave-daughter/slave-daughter-sensors.brd
+++ b/slave-daughter/slave-daughter-sensors.brd
@@ -102,10 +102,12 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="100" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="34.29" x2="0" y2="5.08" width="0" layer="20"/>
+<wire x1="0" y1="5.08" x2="5.08" y2="0" width="0" layer="20" curve="90"/>
+<wire x1="5.08" y1="0" x2="100" y2="0" width="0" layer="20"/>
 <wire x1="100" y1="0" x2="100" y2="39.37" width="0" layer="20"/>
-<wire x1="100" y1="39.37" x2="0" y2="39.37" width="0" layer="20"/>
-<wire x1="0" y1="39.37" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="100" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
+<wire x1="5.08" y1="39.37" x2="0" y2="34.29" width="0" layer="20" curve="90"/>
 <text x="-13.97" y="43.18" size="1.778" layer="21">DO NOT MOVE RINGS, PIN HEADERS, OR PCB DIMMENSIONS. THEY ARE ACCURATELY PLACED</text>
 </plain>
 <libraries>
@@ -450,8 +452,8 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="36.83" locked="yes"/>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="7.62" y="2.54" locked="yes"/>
+<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="36.83" locked="yes"/>
+<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="2.54" locked="yes"/>
 <element name="U$1" library="SeniorDesign" package="SOIC8" value="HIH6131-021-001" x="-17.78" y="3.81"/>
 <element name="U$2" library="SeniorDesign" package="MAX44009" value="MAX44009" x="-15.24" y="34.29"/>
 <element name="C1" library="SparkFun" package="0603-CAP" value="0.1uF" x="-17.78" y="35.56"/>
@@ -471,8 +473,8 @@ design rules under a new name.</descript
 <wire x1="-15.11" y1="34.63" x2="-15.11" y2="35.29" width="0" layer="19" extent="1-1"/>
 <wire x1="-20.74" y1="35.56" x2="-16.93" y2="35.56" width="0" layer="19" extent="1-1"/>
 <wire x1="-24.55" y1="35.56" x2="-20.74" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="7.62" y1="36.957" x2="-24.55" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.415" y1="1.21" x2="7.62" y2="36.957" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="36.957" x2="-24.55" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="-18.415" y1="1.21" x2="5.08" y2="36.957" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="JP1" pad="2"/>
@@ -485,8 +487,8 @@ design rules under a new name.</descript
 <contactref element="JP1" pad="3"/>
 <wire x1="-22.44" y1="35.56" x2="-15.11" y2="35.95" width="0" layer="19" extent="1-1"/>
 <wire x1="-26.25" y1="35.56" x2="-22.44" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="12.7" y1="36.957" x2="-26.25" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="-19.685" y1="6.41" x2="12.7" y2="36.957" width="0" layer="19" extent="1-1"/>
+<wire x1="10.16" y1="36.957" x2="-26.25" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="-19.685" y1="6.41" x2="10.16" y2="36.957" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MOSI">
 <contactref element="JP1" pad="4"/>
@@ -513,15 +515,15 @@ design rules under a new name.</descript
 <contactref element="JP2" pad="1"/>
 <contactref element="U$1" pad="3"/>
 <contactref element="U$2" pad="5"/>
-<wire x1="7.62" y1="2.667" x2="-13.35" y2="35.29" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="2.667" x2="-13.35" y2="35.29" width="0" layer="19" extent="1-1"/>
 <wire x1="-17.145" y1="1.21" x2="-13.35" y2="35.29" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SDA">
 <contactref element="JP2" pad="2"/>
 <contactref element="U$1" pad="4"/>
 <contactref element="U$2" pad="6"/>
-<wire x1="10.16" y1="2.413" x2="-13.35" y2="35.95" width="0" layer="19" extent="1-1"/>
-<wire x1="-15.875" y1="1.21" x2="10.16" y2="2.413" width="0" layer="19" extent="1-1"/>
+<wire x1="7.62" y1="2.413" x2="-13.35" y2="35.95" width="0" layer="19" extent="1-1"/>
+<wire x1="-15.875" y1="1.21" x2="7.62" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA0">
 <contactref element="JP2" pad="3"/>
diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.01" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="0.01" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.0025" altunitdist="inch" altunit="inch"/>
 <layers>
 <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"/>
@@ -923,57 +923,57 @@ design rules under a new name.</descript
 </autorouter>
 <elements>
 <element name="U$1" library="SparkFun" package="XBEE-SMD" value="XBEE-1B3" x="49.53" y="19.685" rot="MR270"/>
-<element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644A" x="23.749" y="19.685">
-<attribute name="OC_NEWARK" value="58M3748" x="77.089" y="9.525" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="ATMEGA644PV-10AU" x="77.089" y="9.525" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="77.089" y="9.525" size="1.778" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="1455123" x="77.089" y="9.525" size="1.778" layer="27" display="off"/>
+<element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644A" x="25.273" y="17.907">
+<attribute name="OC_NEWARK" value="58M3748" x="78.613" y="7.747" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="ATMEGA644PV-10AU" x="78.613" y="7.747" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="" x="78.613" y="7.747" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="1455123" x="78.613" y="7.747" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="39.624" y="14.224" rot="R270"/>
-<element name="C4" library="SparkFun" package="0603-CAP" value="8.2pF" x="45.466" y="24.892" rot="R90"/>
-<element name="C5" library="SparkFun" package="0603-CAP" value="1uF" x="43.18" y="24.892" rot="R90"/>
-<element name="3.3V_SWITCHING" library="SeniorDesign" package="SOIC8HEAT" value="IFX91041EJ V33" x="55.626" y="21.844" rot="R270"/>
-<element name="BATT" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="52.832" y="2.794" rot="R180"/>
-<element name="Q6" library="transistor-small-signal" package="SOT23" value="BSH202" x="50.292" y="7.874" rot="R90"/>
+<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="16.002" y="21.59" rot="R90"/>
+<element name="C4" library="SparkFun" package="0603-CAP" value="8.2pF" x="26.67" y="29.464" rot="R270"/>
+<element name="C5" library="SparkFun" package="0603-CAP" value="1uF" x="24.384" y="29.464" rot="R270"/>
+<element name="3.3V_SWITCHING" library="SeniorDesign" package="SOIC8HEAT" value="IFX91041EJ V33" x="55.626" y="23.114" rot="R270"/>
+<element name="BATT" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="51.054" y="2.794" rot="R180"/>
+<element name="Q6" library="transistor-small-signal" package="SOT23" value="BSH202" x="50.292" y="8.128" rot="R90"/>
 <element name="C8" library="SparkFun" package="0805" value="100uF" x="39.624" y="25.654" rot="R90"/>
 <element name="C9" library="SparkFun" package="0603-CAP" value="22nF" x="39.624" y="20.574" rot="R180"/>
 <element name="R2" library="SparkFun" package="0603-RES" value="22k" x="44.196" y="20.066" rot="R90"/>
-<element name="C10" library="SparkFun" package="0603-CAP" value="220nF" x="48.26" y="17.018" rot="R180"/>
-<element name="L3" library="SparkFun" package="SRU1038" value="47uH" x="55.118" y="13.716"/>
-<element name="D1" library="SparkFun" package="SMA-DIODE" value="DIODE-SCHOTTKY" x="49.022" y="21.59" rot="R270"/>
+<element name="C10" library="SparkFun" package="0603-CAP" value="220nF" x="48.514" y="18.034" rot="R180"/>
+<element name="L3" library="SparkFun" package="SRU1038" value="47uH" x="55.372" y="14.224"/>
+<element name="D1" library="SparkFun" package="SMA-DIODE" value="DIODE-SCHOTTKY" x="49.022" y="22.86" rot="R270"/>
 <element name="C11" library="SparkFun" package="0603-CAP" value="220nF" x="39.624" y="18.034" rot="R180"/>
 <element name="C12" library="SparkFun" package="0805" value="100uF" x="39.624" y="23.114" rot="R180"/>
-<element name="ROTARY_DIP" library="SeniorDesign" package="CD08RM0SB" value="CD08RM0SB" x="55.626" y="28.194" rot="R90"/>
-<element name="TEMP" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="29.718" y="8.382"/>
-<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="20.32" y="36.83" locked="yes"/>
-<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="20.32" y="2.54" locked="yes"/>
-<element name="C13" library="SparkFun" package="0603-CAP" value="18pf" x="33.782" y="14.478" rot="R270"/>
-<element name="C14" library="SparkFun" package="0603-CAP" value="18pf" x="36.322" y="14.478" rot="R270"/>
-<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="17.526" y="9.398" rot="R180"/>
+<element name="ROTARY_DIP" library="SeniorDesign" package="CD08RM0SB" value="CD08RM0SB" x="45.974" y="29.464"/>
+<element name="TEMP" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="33.782" y="41.91"/>
+<element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="17.78" y="36.83" locked="yes"/>
+<element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="17.78" y="2.54" locked="yes"/>
+<element name="C_CRYS2" library="SparkFun" package="0603-CAP" value="18pf" x="16.51" y="17.018" rot="R270"/>
+<element name="C_CRYS1" library="SparkFun" package="0603-CAP" value="18pf" x="14.224" y="17.018" rot="R270"/>
+<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="15.494" y="11.43" rot="R90"/>
 <element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="36.322" y="18.288" rot="R270"/>
 <element name="L2" library="SparkFun" package="0603" value="10uH" x="33.782" y="18.288" rot="R90"/>
 <element name="C16" library="SparkFun" package="0603-CAP" value=".1uF" x="35.052" y="20.828"/>
 <element name="C17" library="SparkFun" package="0603-CAP" value=".1uF" x="35.052" y="23.368"/>
-<element name="C18" library="SparkFun" package="0603-CAP" value="10uF" x="2.54" y="23.114"/>
-<element name="ICSP" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="5.842" y="29.464"/>
-<element name="R6" library="SparkFun" package="0603-RES" value="4.7k" x="2.54" y="20.574" rot="R180"/>
-<element name="R7" library="SparkFun" package="0603-RES" value="4.7k" x="2.54" y="18.034" rot="R180"/>
-<element name="LED1" library="adafruit" package="CHIPLED_0603" value="AMBER" x="7.366" y="23.368" rot="R90"/>
-<element name="R8" library="SparkFun" package="0603-RES" value="10K" x="11.43" y="7.112"/>
-<element name="R9" library="SparkFun" package="0603-RES" value="10K" x="35.052" y="25.908" rot="R180"/>
-<element name="R10" library="SparkFun" package="0603-RES" value="1M" x="27.432" y="32.004" rot="R270"/>
-<element name="R11" library="SparkFun" package="R2512" value="" x="20.828" y="29.718"/>
-<element name="C19" library="SparkFun" package="0603-CAP" value=".1uF" x="13.716" y="31.496"/>
-<element name="Q1" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="30.988" y="31.75" rot="R180"/>
-<element name="Q2" library="transistor-npn" package="SOT23-BEC" value="BC849SMD" x="34.798" y="31.75"/>
-<element name="R12" library="SparkFun" package="0603-RES" value="10K" x="11.684" y="20.828"/>
-<element name="R13" library="SparkFun" package="0603-RES" value="10K" x="11.684" y="18.288"/>
-<element name="R14" library="SparkFun" package="0603-RES" value="10K" x="11.684" y="15.748"/>
-<element name="R15" library="SparkFun" package="0603-RES" value="10K" x="11.684" y="13.208"/>
-<element name="LED2" library="adafruit" package="CHIPLED_0603" value="BLUE" x="7.366" y="20.828" rot="R90"/>
-<element name="LED3" library="adafruit" package="CHIPLED_0603" value="GREEN" x="7.366" y="18.288" rot="R90"/>
-<element name="LED4" library="adafruit" package="CHIPLED_0603" value="WHITE" x="7.366" y="15.748" rot="R90"/>
-<element name="LED5" library="adafruit" package="CHIPLED_0603" value="RED" x="7.366" y="13.208" rot="R90"/>
+<element name="C18" library="SparkFun" package="0603-CAP" value="10uF" x="35.052" y="25.4"/>
+<element name="ICSP" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="5.334" y="28.448"/>
+<element name="R_SCL" library="SparkFun" package="0603-RES" value="4.7k" x="28.702" y="41.656" rot="R180"/>
+<element name="R_SDA" library="SparkFun" package="0603-RES" value="4.7k" x="25.146" y="42.672" rot="R180"/>
+<element name="ASSOC" library="adafruit" package="CHIPLED_0603" value="AMBER" x="5.08" y="18.796" rot="R90"/>
+<element name="R_ASSOC" library="SparkFun" package="0603-RES" value="10K" x="8.89" y="18.796"/>
+<element name="R9" library="SparkFun" package="0603-RES" value="10K" x="11.938" y="39.37" rot="R180"/>
+<element name="R10" library="SparkFun" package="0603-RES" value="1M" x="8.89" y="39.37" rot="R270"/>
+<element name="R11" library="SparkFun" package="R2512" value="" x="17.272" y="28.956" rot="R90"/>
+<element name="C19" library="SparkFun" package="0603-CAP" value=".1uF" x="37.338" y="41.656"/>
+<element name="Q1" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="11.938" y="35.306" rot="R180"/>
+<element name="Q2" library="transistor-npn" package="SOT23-BEC" value="BC849SMD" x="13.716" y="35.052"/>
+<element name="R_LED0" library="SparkFun" package="0603-RES" value="10K" x="8.89" y="16.256"/>
+<element name="R_LED1" library="SparkFun" package="0603-RES" value="10K" x="8.89" y="13.716"/>
+<element name="R_LED2" library="SparkFun" package="0603-RES" value="10K" x="8.89" y="11.176"/>
+<element name="R_LED3" library="SparkFun" package="0603-RES" value="10K" x="8.89" y="8.636"/>
+<element name="LED0" library="adafruit" package="CHIPLED_0603" value="BLUE" x="5.08" y="16.256" rot="R90"/>
+<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"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -996,8 +996,8 @@ design rules under a new name.</descript
 <contactref element="IC1" pad="18"/>
 <contactref element="IC1" pad="28"/>
 <contactref element="IC1" pad="39"/>
-<contactref element="C14" pad="1"/>
-<contactref element="C13" pad="1"/>
+<contactref element="C_CRYS1" pad="1"/>
+<contactref element="C_CRYS2" pad="1"/>
 <contactref element="C15" pad="1"/>
 <contactref element="C18" pad="2"/>
 <contactref element="C17" pad="2"/>
@@ -1007,52 +1007,53 @@ design rules under a new name.</descript
 <contactref element="ROTARY_DIP" pad="C2"/>
 <contactref element="ROTARY_DIP" pad="C1"/>
 <contactref element="JP1" pad="1"/>
-<contactref element="LED1" pad="C"/>
+<contactref element="ASSOC" pad="C"/>
 <contactref element="Q2" pad="E"/>
 <contactref element="R11" pad="1"/>
+<contactref element="LED0" pad="C"/>
+<contactref element="LED1" pad="C"/>
 <contactref element="LED2" pad="C"/>
 <contactref element="LED3" pad="C"/>
-<contactref element="LED4" pad="C"/>
-<contactref element="LED5" pad="C"/>
 <contactref element="C4" pad="2"/>
 <contactref element="C5" pad="2"/>
 <contactref element="TEMP" pad="2"/>
 <contactref element="C19" pad="2"/>
-<wire x1="47.53" y1="29.185" x2="51.6255" y2="36.83" width="0" layer="19" extent="1-16"/>
-<wire x1="51.6255" y1="27.559" x2="47.53" y2="29.185" width="0" layer="19" extent="1-16"/>
-<wire x1="45.466" y1="25.742" x2="47.53" y2="29.185" width="0" layer="19" extent="1-16"/>
-<wire x1="43.18" y1="25.742" x2="45.466" y2="25.742" width="0" layer="19" extent="1-1"/>
-<wire x1="39.624" y1="26.554" x2="43.18" y2="25.742" width="0" layer="19" extent="1-1"/>
+<wire x1="47.53" y1="29.185" x2="54.61" y2="33.4645" width="0" layer="19" extent="1-16"/>
+<wire x1="45.339" y1="33.4645" x2="47.53" y2="29.185" width="0" layer="19" extent="1-16"/>
+<wire x1="26.67" y1="28.614" x2="47.53" y2="29.185" width="0" layer="19" extent="1-16"/>
+<wire x1="24.384" y1="28.614" x2="26.67" y2="28.614" width="0" layer="19" extent="1-1"/>
+<wire x1="39.624" y1="26.554" x2="24.384" y2="28.614" width="0" layer="19" extent="1-1"/>
 <wire x1="38.724" y1="23.114" x2="39.624" y2="26.554" width="0" layer="19" extent="1-1"/>
 <wire x1="35.902" y1="23.368" x2="38.724" y2="23.114" width="0" layer="19" extent="1-1"/>
 <wire x1="35.902" y1="20.828" x2="35.902" y2="23.368" width="0" layer="19" extent="1-1"/>
 <wire x1="36.322" y1="19.138" x2="35.902" y2="20.828" width="0" layer="19" extent="1-1"/>
 <wire x1="38.774" y1="18.034" x2="36.322" y2="19.138" width="0" layer="19" extent="1-1"/>
-<wire x1="36.322" y1="15.328" x2="38.774" y2="18.034" width="0" layer="19" extent="1-1"/>
-<wire x1="33.782" y1="15.328" x2="36.322" y2="15.328" width="0" layer="19" extent="1-1"/>
-<wire x1="49.022" y1="23.74" x2="45.466" y2="25.742" width="0" layer="19" extent="1-1"/>
-<wire x1="53.026" y1="23.749" x2="49.022" y2="23.74" width="0" layer="19" extent="1-1"/>
-<wire x1="53.026" y1="22.479" x2="53.026" y2="23.749" width="0" layer="19" extent="1-1"/>
-<wire x1="55.626" y1="21.844" x2="53.026" y2="22.479" width="0" layer="19" extent="1-1"/>
+<wire x1="14.224" y1="17.868" x2="38.774" y2="18.034" width="0" layer="19" extent="1-1"/>
+<wire x1="16.51" y1="17.868" x2="14.224" y2="17.868" width="0" layer="19" extent="1-1"/>
+<wire x1="49.022" y1="25.01" x2="26.67" y2="28.614" width="0" layer="19" extent="1-1"/>
+<wire x1="53.026" y1="25.019" x2="49.022" y2="25.01" width="0" layer="19" extent="1-1"/>
+<wire x1="53.026" y1="23.749" x2="53.026" y2="25.019" width="0" layer="19" extent="1-1"/>
+<wire x1="55.626" y1="23.114" x2="53.026" y2="23.749" width="0" layer="19" extent="1-1"/>
 <wire x1="44.196" y1="19.216" x2="38.774" y2="18.034" width="0" layer="19" extent="1-1"/>
-<wire x1="51.392" y1="6.924" x2="44.196" y2="19.216" width="0" layer="19" extent="1-1"/>
-<wire x1="35.748" y1="30.65" x2="39.624" y2="26.554" width="0" layer="19" extent="1-1"/>
-<wire x1="29.549" y1="19.685" x2="33.782" y2="15.328" width="0" layer="19" extent="1-1"/>
-<wire x1="24.549" y1="13.885" x2="29.549" y2="19.685" width="0" layer="19" extent="1-1"/>
-<wire x1="23.749" y1="25.485" x2="29.549" y2="19.685" width="0" layer="19" extent="1-1"/>
-<wire x1="18.028" y1="29.718" x2="23.749" y2="25.485" width="0" layer="19" extent="1-1"/>
-<wire x1="14.566" y1="31.496" x2="18.028" y2="29.718" width="0" layer="19" extent="1-1"/>
-<wire x1="8.382" y1="30.734" x2="14.566" y2="31.496" width="0" layer="19" extent="1-1"/>
-<wire x1="6.616" y1="23.368" x2="8.382" y2="30.734" width="0" layer="19" extent="1-1"/>
-<wire x1="6.616" y1="20.828" x2="6.616" y2="23.368" width="0" layer="19" extent="1-1"/>
-<wire x1="6.616" y1="18.288" x2="6.616" y2="20.828" width="0" layer="19" extent="1-1"/>
-<wire x1="6.616" y1="15.748" x2="6.616" y2="18.288" width="0" layer="19" extent="1-1"/>
-<wire x1="6.616" y1="13.208" x2="6.616" y2="15.748" width="0" layer="19" extent="1-1"/>
-<wire x1="3.39" y1="23.114" x2="6.616" y2="23.368" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="19.685" x2="23.749" y2="25.485" width="0" layer="19" extent="1-1"/>
-<wire x1="52.832" y1="2.814" x2="51.392" y2="6.924" width="0" layer="19" extent="1-1"/>
-<wire x1="29.718" y1="7.092" x2="24.549" y2="13.885" width="0" layer="19" extent="1-1"/>
-<wire x1="20.32" y1="2.667" x2="24.549" y2="13.885" width="0" layer="19" extent="1-1"/>
+<wire x1="51.392" y1="7.178" x2="44.196" y2="19.216" width="0" layer="19" extent="1-1"/>
+<wire x1="14.666" y1="33.952" x2="39.624" y2="26.554" width="0" layer="19" extent="1-1"/>
+<wire x1="31.073" y1="17.907" x2="16.51" y2="17.868" width="0" layer="19" extent="1-1"/>
+<wire x1="26.073" y1="12.107" x2="31.073" y2="17.907" width="0" layer="19" extent="1-1"/>
+<wire x1="25.273" y1="23.707" x2="31.073" y2="17.907" width="0" layer="19" extent="1-1"/>
+<wire x1="17.272" y1="26.156" x2="25.273" y2="23.707" width="0" layer="19" extent="1-1"/>
+<wire x1="38.188" y1="41.656" x2="17.272" y2="26.156" width="0" layer="19" extent="1-1"/>
+<wire x1="7.874" y1="29.718" x2="38.188" y2="41.656" width="0" layer="19" extent="1-1"/>
+<wire x1="4.33" y1="18.796" x2="7.874" y2="29.718" width="0" layer="19" extent="1-1"/>
+<wire x1="4.33" y1="16.256" x2="4.33" y2="18.796" width="0" layer="19" extent="1-1"/>
+<wire x1="4.33" y1="13.716" x2="4.33" y2="16.256" width="0" layer="19" extent="1-1"/>
+<wire x1="4.33" y1="11.176" x2="4.33" y2="13.716" width="0" layer="19" extent="1-1"/>
+<wire x1="4.33" y1="8.636" x2="4.33" y2="11.176" width="0" layer="19" extent="1-1"/>
+<wire x1="35.902" y1="25.4" x2="4.33" y2="18.796" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="17.907" x2="25.273" y2="23.707" width="0" layer="19" extent="1-1"/>
+<wire x1="33.782" y1="40.62" x2="26.073" y2="12.107" width="0" layer="19" extent="1-1"/>
+<wire x1="17.78" y1="2.667" x2="26.073" y2="12.107" width="0" layer="19" extent="1-1"/>
+<wire x1="51.054" y1="2.814" x2="51.054" y2="6.84" width="0.8128" layer="1"/>
+<wire x1="51.054" y1="6.84" x2="51.392" y2="7.178" width="0.8128" layer="1"/>
 </signal>
 <signal name="VCC">
 <contactref element="IC1" pad="38"/>
@@ -1067,8 +1068,8 @@ design rules under a new name.</descript
 <contactref element="C18" pad="1"/>
 <contactref element="C17" pad="1"/>
 <contactref element="C16" pad="1"/>
-<contactref element="R7" pad="2"/>
-<contactref element="R6" pad="2"/>
+<contactref element="R_SDA" pad="2"/>
+<contactref element="R_SCL" pad="2"/>
 <contactref element="ICSP" pad="2"/>
 <contactref element="JP1" pad="3"/>
 <contactref element="U$1" pad="1"/>
@@ -1076,38 +1077,39 @@ design rules under a new name.</descript
 <contactref element="C5" pad="1"/>
 <contactref element="TEMP" pad="1"/>
 <contactref element="C19" pad="1"/>
-<wire x1="53.026" y1="19.939" x2="59.618" y2="13.716" width="0" layer="19" extent="1-1"/>
-<wire x1="45.466" y1="24.042" x2="53.026" y2="19.939" width="0" layer="19" extent="1-1"/>
-<wire x1="43.18" y1="24.042" x2="45.466" y2="24.042" width="0" layer="19" extent="1-1"/>
-<wire x1="40.524" y1="23.114" x2="43.18" y2="24.042" width="0" layer="19" extent="1-1"/>
+<wire x1="53.026" y1="21.209" x2="59.872" y2="14.224" width="0" layer="19" extent="1-1"/>
+<wire x1="26.67" y1="30.314" x2="53.026" y2="21.209" width="0" layer="19" extent="1-1"/>
+<wire x1="24.384" y1="30.314" x2="26.67" y2="30.314" width="0" layer="19" extent="1-1"/>
+<wire x1="40.524" y1="23.114" x2="24.384" y2="30.314" width="0" layer="19" extent="1-1"/>
 <wire x1="40.474" y1="18.034" x2="40.524" y2="23.114" width="0" layer="19" extent="1-1"/>
-<wire x1="39.624" y1="15.074" x2="40.474" y2="18.034" width="0" layer="19" extent="1-1"/>
+<wire x1="16.002" y1="20.74" x2="40.474" y2="18.034" width="0" layer="19" extent="1-1"/>
 <wire x1="34.202" y1="23.368" x2="40.524" y2="23.114" width="0" layer="19" extent="1-1"/>
 <wire x1="34.202" y1="20.828" x2="34.202" y2="23.368" width="0" layer="19" extent="1-1"/>
 <wire x1="33.782" y1="19.138" x2="34.202" y2="20.828" width="0" layer="19" extent="1-1"/>
-<wire x1="24.549" y1="25.485" x2="34.202" y2="23.368" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="20.485" x2="24.549" y2="25.485" width="0" layer="19" extent="1-1"/>
-<wire x1="29.53" y1="32.185" x2="24.549" y2="25.485" width="0" layer="19" extent="1-16"/>
-<wire x1="23.749" y1="13.885" x2="17.949" y2="20.485" width="0" layer="19" extent="1-1"/>
-<wire x1="28.768" y1="7.092" x2="23.749" y2="13.885" width="0" layer="19" extent="1-1"/>
-<wire x1="25.4" y1="2.667" x2="28.768" y2="7.092" width="0" layer="19" extent="1-1"/>
-<wire x1="12.866" y1="31.496" x2="17.949" y2="20.485" width="0" layer="19" extent="1-1"/>
-<wire x1="3.302" y1="30.734" x2="12.866" y2="31.496" width="0" layer="19" extent="1-1"/>
-<wire x1="1.69" y1="23.114" x2="3.302" y2="30.734" width="0" layer="19" extent="1-1"/>
-<wire x1="1.69" y1="20.574" x2="1.69" y2="23.114" width="0" layer="19" extent="1-1"/>
-<wire x1="1.69" y1="18.034" x2="1.69" y2="20.574" width="0" layer="19" extent="1-1"/>
+<wire x1="26.073" y1="23.707" x2="34.202" y2="23.368" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="18.707" x2="26.073" y2="23.707" width="0" layer="19" extent="1-1"/>
+<wire x1="29.53" y1="32.185" x2="26.073" y2="23.707" width="0" layer="19" extent="1-16"/>
+<wire x1="25.273" y1="12.107" x2="19.473" y2="18.707" width="0" layer="19" extent="1-1"/>
+<wire x1="32.832" y1="40.62" x2="25.273" y2="12.107" width="0" layer="19" extent="1-1"/>
+<wire x1="22.86" y1="2.667" x2="32.832" y2="40.62" width="0" layer="19" extent="1-1"/>
+<wire x1="36.488" y1="41.656" x2="19.473" y2="18.707" width="0" layer="19" extent="1-1"/>
+<wire x1="2.794" y1="29.718" x2="36.488" y2="41.656" width="0" layer="19" extent="1-1"/>
+<wire x1="34.202" y1="25.4" x2="2.794" y2="29.718" width="0" layer="19" extent="1-1"/>
+<wire x1="27.852" y1="41.656" x2="34.202" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="24.296" y1="42.672" x2="27.852" y2="41.656" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RESET">
 <contactref element="R1" pad="2"/>
 <contactref element="IC1" pad="4"/>
 <contactref element="ICSP" pad="5"/>
-<wire x1="17.949" y1="21.285" x2="8.382" y2="28.194" width="0" layer="19" extent="1-1"/>
-<wire x1="39.624" y1="13.374" x2="17.949" y2="21.285" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="19.507" x2="7.874" y2="27.178" width="0" layer="19" extent="1-1"/>
+<wire x1="16.002" y1="22.44" x2="19.473" y2="19.507" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="BATT" pad="1"/>
 <contactref element="Q6" pad="3"/>
-<wire x1="49.192" y1="7.874" x2="51.332" y2="2.814" width="0" layer="19" extent="1-1"/>
+<wire x1="49.554" y1="2.814" x2="49.554" y2="7.766" width="0.8128" layer="1"/>
+<wire x1="49.554" y1="7.766" x2="49.192" y2="8.128" width="0.8128" layer="1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="Q6" pad="2"/>
@@ -1117,12 +1119,12 @@ design rules under a new name.</descript
 <contactref element="JP1" pad="2"/>
 <contactref element="R10" pad="2"/>
 <contactref element="Q1" pad="2"/>
-<wire x1="27.432" y1="31.154" x2="30.038" y2="32.75" width="0" layer="19" extent="1-1"/>
-<wire x1="51.392" y1="8.824" x2="27.432" y2="31.154" width="0" layer="19" extent="1-1"/>
-<wire x1="58.226" y1="22.479" x2="51.392" y2="8.824" width="0" layer="19" extent="1-1"/>
-<wire x1="58.226" y1="23.749" x2="58.226" y2="22.479" width="0" layer="19" extent="1-1"/>
-<wire x1="22.86" y1="2.413" x2="51.392" y2="8.824" width="0" layer="19" extent="1-1"/>
-<wire x1="39.624" y1="24.754" x2="58.226" y2="23.749" width="0" layer="19" extent="1-1"/>
+<wire x1="8.89" y1="38.52" x2="10.988" y2="36.306" width="0" layer="19" extent="1-1"/>
+<wire x1="51.392" y1="9.078" x2="8.89" y2="38.52" width="0" layer="19" extent="1-1"/>
+<wire x1="58.226" y1="23.749" x2="51.392" y2="9.078" width="0" layer="19" extent="1-1"/>
+<wire x1="58.226" y1="25.019" x2="58.226" y2="23.749" width="0" layer="19" extent="1-1"/>
+<wire x1="20.32" y1="2.413" x2="51.392" y2="9.078" width="0" layer="19" extent="1-1"/>
+<wire x1="39.624" y1="24.754" x2="58.226" y2="25.019" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$3">
 <contactref element="R2" pad="2"/>
@@ -1132,134 +1134,134 @@ design rules under a new name.</descript
 <signal name="N$4">
 <contactref element="3.3V_SWITCHING" pad="3"/>
 <contactref element="C9" pad="1"/>
-<wire x1="53.026" y1="21.209" x2="40.474" y2="20.574" width="0" layer="19" extent="1-1"/>
+<wire x1="53.026" y1="22.479" x2="40.474" y2="20.574" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$5">
 <contactref element="3.3V_SWITCHING" pad="5"/>
 <contactref element="C10" pad="1"/>
-<wire x1="49.11" y1="17.018" x2="58.226" y2="19.939" width="0" layer="19" extent="1-1"/>
+<wire x1="49.364" y1="18.034" x2="58.226" y2="21.209" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="3.3V_SWITCHING" pad="6"/>
 <contactref element="C10" pad="2"/>
 <contactref element="L3" pad="1"/>
 <contactref element="D1" pad="C"/>
-<wire x1="58.226" y1="21.209" x2="49.022" y2="19.44" width="0" layer="19" extent="1-1"/>
-<wire x1="47.41" y1="17.018" x2="49.022" y2="19.44" width="0" layer="19" extent="1-1"/>
-<wire x1="50.618" y1="13.716" x2="47.41" y2="17.018" width="0" layer="19" extent="1-1"/>
+<wire x1="58.226" y1="22.479" x2="49.022" y2="20.71" width="0" layer="19" extent="1-1"/>
+<wire x1="47.664" y1="18.034" x2="49.022" y2="20.71" width="0" layer="19" extent="1-1"/>
+<wire x1="50.872" y1="14.224" x2="47.664" y2="18.034" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SDA">
 <contactref element="IC1" pad="20"/>
 <contactref element="JP2" pad="2"/>
 <contactref element="TEMP" pad="5"/>
-<contactref element="R7" pad="1"/>
-<wire x1="26.149" y1="13.885" x2="22.86" y2="36.703" width="0" layer="19" extent="1-1"/>
-<wire x1="28.768" y1="9.682" x2="26.149" y2="13.885" width="0" layer="19" extent="1-1"/>
-<wire x1="3.39" y1="18.034" x2="26.149" y2="13.885" width="0" layer="19" extent="1-1"/>
+<contactref element="R_SDA" pad="1"/>
+<wire x1="27.673" y1="12.107" x2="20.32" y2="36.703" width="0" layer="19" extent="1-1"/>
+<wire x1="32.832" y1="43.21" x2="27.673" y2="12.107" width="0" layer="19" extent="1-1"/>
+<wire x1="25.996" y1="42.672" x2="27.673" y2="12.107" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCL">
 <contactref element="IC1" pad="19"/>
 <contactref element="JP2" pad="1"/>
 <contactref element="TEMP" pad="4"/>
-<contactref element="R6" pad="1"/>
-<wire x1="25.349" y1="13.885" x2="20.32" y2="36.957" width="0" layer="19" extent="1-1"/>
-<wire x1="30.668" y1="9.682" x2="25.349" y2="13.885" width="0" layer="19" extent="1-1"/>
-<wire x1="3.39" y1="20.574" x2="25.349" y2="13.885" width="0" layer="19" extent="1-1"/>
+<contactref element="R_SCL" pad="1"/>
+<wire x1="26.873" y1="12.107" x2="17.78" y2="36.957" width="0" layer="19" extent="1-1"/>
+<wire x1="34.732" y1="43.21" x2="26.873" y2="12.107" width="0" layer="19" extent="1-1"/>
+<wire x1="29.552" y1="41.656" x2="26.873" y2="12.107" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA0">
 <contactref element="IC1" pad="37"/>
 <contactref element="JP2" pad="3"/>
-<wire x1="25.4" y1="36.957" x2="25.349" y2="25.485" width="0" layer="19" extent="1-1"/>
+<wire x1="22.86" y1="36.957" x2="26.873" y2="23.707" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA1">
 <contactref element="IC1" pad="36"/>
 <contactref element="JP2" pad="4"/>
-<wire x1="27.94" y1="36.703" x2="26.149" y2="25.485" width="0" layer="19" extent="1-1"/>
+<wire x1="25.4" y1="36.703" x2="27.673" y2="23.707" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA2">
 <contactref element="IC1" pad="35"/>
 <contactref element="JP2" pad="5"/>
-<wire x1="30.48" y1="36.957" x2="26.949" y2="25.485" width="0" layer="19" extent="1-1"/>
+<wire x1="27.94" y1="36.957" x2="28.473" y2="23.707" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA3">
 <contactref element="IC1" pad="34"/>
 <contactref element="JP2" pad="6"/>
-<wire x1="33.02" y1="36.703" x2="27.749" y2="25.485" width="0" layer="19" extent="1-1"/>
+<wire x1="30.48" y1="36.703" x2="29.273" y2="23.707" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA4">
 <contactref element="IC1" pad="33"/>
 <contactref element="JP2" pad="7"/>
-<wire x1="35.56" y1="36.957" x2="29.549" y2="23.685" width="0" layer="19" extent="1-1"/>
+<wire x1="33.02" y1="36.957" x2="31.073" y2="21.907" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA5">
 <contactref element="IC1" pad="32"/>
 <contactref element="JP2" pad="8"/>
-<wire x1="38.1" y1="36.703" x2="29.549" y2="22.885" width="0" layer="19" extent="1-1"/>
+<wire x1="35.56" y1="36.703" x2="31.073" y2="21.107" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA6">
 <contactref element="IC1" pad="31"/>
 <contactref element="JP2" pad="9"/>
-<wire x1="40.64" y1="36.957" x2="29.549" y2="22.085" width="0" layer="19" extent="1-1"/>
+<wire x1="38.1" y1="36.957" x2="31.073" y2="20.307" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA7">
 <contactref element="IC1" pad="30"/>
 <contactref element="JP2" pad="10"/>
-<wire x1="43.18" y1="36.703" x2="29.549" y2="21.285" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="36.703" x2="31.073" y2="19.507" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCK">
 <contactref element="IC1" pad="3"/>
 <contactref element="ICSP" pad="3"/>
 <contactref element="JP1" pad="6"/>
-<wire x1="33.02" y1="2.413" x2="5.842" y2="28.194" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="22.085" x2="33.02" y2="2.413" width="0" layer="19" extent="1-1"/>
+<wire x1="30.48" y1="2.413" x2="5.334" y2="27.178" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="20.307" x2="30.48" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
 <contactref element="ICSP" pad="1"/>
 <contactref element="JP1" pad="5"/>
-<wire x1="30.48" y1="2.667" x2="3.302" y2="28.194" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="22.885" x2="30.48" y2="2.667" width="0" layer="19" extent="1-1"/>
+<wire x1="27.94" y1="2.667" x2="2.794" y2="27.178" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="21.107" x2="27.94" y2="2.667" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="1"/>
 <contactref element="ICSP" pad="4"/>
 <contactref element="JP1" pad="4"/>
-<wire x1="27.94" y1="2.413" x2="5.842" y2="30.734" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="23.685" x2="27.94" y2="2.413" width="0" layer="19" extent="1-1"/>
+<wire x1="25.4" y1="2.413" x2="5.334" y2="29.718" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="21.907" x2="25.4" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="Y2" pad="3"/>
-<contactref element="C14" pad="2"/>
+<contactref element="C_CRYS1" pad="2"/>
 <contactref element="IC1" pad="7"/>
-<wire x1="15.676" y1="8.248" x2="36.322" y2="13.628" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="18.885" x2="15.676" y2="8.248" width="0" layer="19" extent="1-1"/>
+<wire x1="14.344" y1="13.28" x2="14.224" y2="16.168" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="17.107" x2="14.344" y2="13.28" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="Y2" pad="1"/>
-<contactref element="C13" pad="2"/>
+<contactref element="C_CRYS2" pad="2"/>
 <contactref element="IC1" pad="8"/>
-<wire x1="19.376" y1="10.548" x2="33.782" y2="13.628" width="0" layer="19" extent="1-1"/>
-<wire x1="17.949" y1="18.085" x2="19.376" y2="10.548" width="0" layer="19" extent="1-1"/>
+<wire x1="16.644" y1="9.58" x2="16.51" y2="16.168" width="0" layer="19" extent="1-1"/>
+<wire x1="19.473" y1="16.307" x2="16.644" y2="9.58" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="C15" pad="2"/>
 <contactref element="IC1" pad="29"/>
-<wire x1="29.549" y1="20.485" x2="36.322" y2="17.438" width="0" layer="19" extent="1-1"/>
+<wire x1="31.073" y1="18.707" x2="36.322" y2="17.438" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$13">
 <contactref element="L2" pad="1"/>
 <contactref element="IC1" pad="27"/>
-<wire x1="29.549" y1="18.885" x2="33.782" y2="17.438" width="0" layer="19" extent="1-1"/>
+<wire x1="31.073" y1="17.107" x2="33.782" y2="17.438" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RXD0">
 <contactref element="IC1" pad="9"/>
 <contactref element="U$1" pad="2"/>
-<wire x1="17.949" y1="17.285" x2="31.53" y2="29.185" width="0" layer="19" extent="1-16"/>
+<wire x1="19.473" y1="15.507" x2="31.53" y2="29.185" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="TXD0">
 <contactref element="IC1" pad="10"/>
 <contactref element="U$1" pad="3"/>
-<wire x1="17.949" y1="16.485" x2="33.53" y2="32.185" width="0" layer="19" extent="1-16"/>
+<wire x1="19.473" y1="14.707" x2="33.53" y2="32.185" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="RXD1">
 <contactref element="IC1" pad="11"/>
@@ -1270,114 +1272,114 @@ design rules under a new name.</descript
 <signal name="PD7">
 <contactref element="IC1" pad="16"/>
 <contactref element="JP1" pad="10"/>
-<wire x1="43.18" y1="2.413" x2="22.949" y2="13.885" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="2.413" x2="24.473" y2="12.107" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PD6">
 <contactref element="IC1" pad="15"/>
 <contactref element="JP1" pad="9"/>
-<wire x1="40.64" y1="2.667" x2="22.149" y2="13.885" width="0" layer="19" extent="1-1"/>
+<wire x1="38.1" y1="2.667" x2="23.673" y2="12.107" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PD5">
 <contactref element="IC1" pad="14"/>
 <contactref element="JP1" pad="8"/>
-<wire x1="21.349" y1="13.885" x2="38.1" y2="2.413" width="0" layer="19" extent="1-1"/>
+<wire x1="22.873" y1="12.107" x2="35.56" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PD4">
 <contactref element="IC1" pad="13"/>
 <contactref element="JP1" pad="7"/>
-<wire x1="20.549" y1="13.885" x2="35.56" y2="2.667" width="0" layer="19" extent="1-1"/>
+<wire x1="22.073" y1="12.107" x2="33.02" y2="2.667" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DIP1">
 <contactref element="ROTARY_DIP" pad="2"/>
 <contactref element="IC1" pad="24"/>
-<wire x1="54.1655" y1="36.83" x2="29.549" y2="16.485" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="30.9245" x2="31.073" y2="14.707" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DIP3">
 <contactref element="ROTARY_DIP" pad="8"/>
 <contactref element="IC1" pad="26"/>
-<wire x1="49.0855" y1="36.83" x2="29.549" y2="18.085" width="0" layer="19" extent="1-1"/>
+<wire x1="54.61" y1="36.0045" x2="31.073" y2="16.307" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DIP2">
 <contactref element="ROTARY_DIP" pad="4"/>
 <contactref element="IC1" pad="25"/>
-<wire x1="54.1655" y1="27.559" x2="29.549" y2="17.285" width="0" layer="19" extent="1-1"/>
+<wire x1="45.339" y1="30.9245" x2="31.073" y2="15.507" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DIP0">
 <contactref element="ROTARY_DIP" pad="1"/>
 <contactref element="IC1" pad="23"/>
-<wire x1="49.0855" y1="27.559" x2="29.549" y2="15.685" width="0" layer="19" extent="1-1"/>
+<wire x1="45.339" y1="36.0045" x2="31.073" y2="13.907" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PWM0">
 <contactref element="IC1" pad="40"/>
-<contactref element="R12" pad="2"/>
-<wire x1="22.949" y1="25.485" x2="12.534" y2="20.828" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED0" pad="2"/>
+<wire x1="24.473" y1="23.707" x2="9.74" y2="16.256" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PWM1">
 <contactref element="IC1" pad="41"/>
-<contactref element="R13" pad="2"/>
-<wire x1="22.149" y1="25.485" x2="12.534" y2="18.288" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED1" pad="2"/>
+<wire x1="23.673" y1="23.707" x2="9.74" y2="13.716" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PWM2">
 <contactref element="IC1" pad="42"/>
-<contactref element="R14" pad="2"/>
-<wire x1="21.349" y1="25.485" x2="12.534" y2="15.748" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED2" pad="2"/>
+<wire x1="22.873" y1="23.707" x2="9.74" y2="11.176" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PWM3">
 <contactref element="IC1" pad="43"/>
-<contactref element="R15" pad="2"/>
-<wire x1="20.549" y1="25.485" x2="12.534" y2="13.208" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED3" pad="2"/>
+<wire x1="22.073" y1="23.707" x2="9.74" y2="8.636" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="ASSOCLED">
 <contactref element="U$1" pad="15"/>
-<contactref element="R8" pad="2"/>
-<wire x1="39.53" y1="7.185" x2="12.28" y2="7.112" width="0" layer="19" extent="1-16"/>
+<contactref element="R_ASSOC" pad="2"/>
+<wire x1="39.53" y1="7.185" x2="9.74" y2="18.796" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$7">
-<contactref element="R8" pad="1"/>
-<contactref element="LED1" pad="A"/>
-<wire x1="8.116" y1="23.368" x2="10.58" y2="7.112" width="0" layer="19" extent="1-1"/>
+<contactref element="R_ASSOC" pad="1"/>
+<contactref element="ASSOC" pad="A"/>
+<wire x1="5.83" y1="18.796" x2="8.04" y2="18.796" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="Q2" pad="B"/>
 <contactref element="R9" pad="2"/>
-<wire x1="34.202" y1="25.908" x2="33.848" y2="30.65" width="0" layer="19" extent="1-1"/>
+<wire x1="11.088" y1="39.37" x2="12.766" y2="33.952" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="Q1" pad="3"/>
 <contactref element="R11" pad="2"/>
-<wire x1="23.628" y1="29.718" x2="30.988" y2="30.65" width="0" layer="19" extent="1-1"/>
+<wire x1="17.272" y1="31.756" x2="11.938" y2="34.206" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$14">
 <contactref element="Q2" pad="C"/>
 <contactref element="R10" pad="1"/>
 <contactref element="Q1" pad="1"/>
-<wire x1="31.938" y1="32.75" x2="34.798" y2="32.85" width="0" layer="19" extent="1-1"/>
-<wire x1="27.432" y1="32.854" x2="31.938" y2="32.75" width="0" layer="19" extent="1-1"/>
+<wire x1="12.888" y1="36.306" x2="13.716" y2="36.152" width="0" layer="19" extent="1-1"/>
+<wire x1="8.89" y1="40.22" x2="12.888" y2="36.306" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HEAT">
 <contactref element="R9" pad="1"/>
 <contactref element="IC1" pad="44"/>
-<wire x1="19.749" y1="25.485" x2="35.902" y2="25.908" width="0" layer="19" extent="1-1"/>
+<wire x1="21.273" y1="23.707" x2="12.788" y2="39.37" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
-<contactref element="R12" pad="1"/>
-<contactref element="LED2" pad="A"/>
-<wire x1="10.834" y1="20.828" x2="8.116" y2="20.828" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED0" pad="1"/>
+<contactref element="LED0" pad="A"/>
+<wire x1="8.04" y1="16.256" x2="5.83" y2="16.256" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
-<contactref element="R13" pad="1"/>
-<contactref element="LED3" pad="A"/>
-<wire x1="10.834" y1="18.288" x2="8.116" y2="18.288" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED1" pad="1"/>
+<contactref element="LED1" pad="A"/>
+<wire x1="8.04" y1="13.716" x2="5.83" y2="13.716" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$16">
-<contactref element="R14" pad="1"/>
-<contactref element="LED4" pad="A"/>
-<wire x1="10.834" y1="15.748" x2="8.116" y2="15.748" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED2" pad="1"/>
+<contactref element="LED2" pad="A"/>
+<wire x1="8.04" y1="11.176" x2="5.83" y2="11.176" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$17">
-<contactref element="R15" pad="1"/>
-<contactref element="LED5" pad="A"/>
-<wire x1="10.834" y1="13.208" x2="8.116" y2="13.208" width="0" layer="19" extent="1-1"/>
+<contactref element="R_LED3" pad="1"/>
+<contactref element="LED3" pad="A"/>
+<wire x1="8.04" y1="8.636" x2="5.83" y2="8.636" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$18">
 <via x="3.81" y="35.56" extent="1-16" drill="3.2"/>
diff --git a/slave/slave.sch b/slave/slave.sch
--- a/slave/slave.sch
+++ b/slave/slave.sch
@@ -4741,8 +4741,8 @@ Source: http://www.osram.convergy.de/</d
 <part name="TEMP" library="SeniorDesign" deviceset="MCP9800" device=""/>
 <part name="JP2" library="SparkFun" deviceset="M10" device="LOCK"/>
 <part name="JP1" library="SparkFun" deviceset="M10" device="LOCK"/>
-<part name="C13" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
-<part name="C14" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
+<part name="C_CRYS2" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
+<part name="C_CRYS1" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
 <part name="GND11" library="SparkFun" deviceset="GND" device=""/>
 <part name="Y2" library="SparkFun" deviceset="CRYSTAL" device="5X3" value="11.0592MHz"/>
 <part name="P+5" library="SparkFun" deviceset="VCC" device=""/>
@@ -4757,12 +4757,12 @@ Source: http://www.osram.convergy.de/</d
 <part name="GND13" library="SparkFun" deviceset="GND" device=""/>
 <part name="P+6" library="SparkFun" deviceset="VCC" device=""/>
 <part name="P+7" library="SparkFun" deviceset="VCC" device=""/>
-<part name="R6" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="4.7k"/>
-<part name="R7" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="4.7k"/>
+<part name="R_SCL" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="4.7k"/>
+<part name="R_SDA" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="4.7k"/>
 <part name="P+8" library="SparkFun" deviceset="VCC" device=""/>
 <part name="GND14" library="SparkFun" deviceset="GND" device=""/>
-<part name="LED1" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="AMBER"/>
-<part name="R8" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
+<part name="ASSOC" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="AMBER"/>
+<part name="R_ASSOC" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
 <part name="GND16" library="SparkFun" deviceset="GND" device=""/>
 <part name="R9" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
 <part name="R10" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1M"/>
@@ -4771,14 +4771,14 @@ Source: http://www.osram.convergy.de/</d
 <part name="Q1" library="SparkFun" deviceset="MOSFET-PCHANNEL" device="SMD"/>
 <part name="Q2" library="transistor-npn" deviceset="BC849*" device="SMD"/>
 <part name="GND17" library="SparkFun" deviceset="GND" device=""/>
-<part name="R12" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
-<part name="R13" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
-<part name="R14" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
-<part name="R15" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
-<part name="LED2" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="BLUE"/>
-<part name="LED3" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
-<part name="LED4" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="WHITE"/>
-<part name="LED5" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="RED"/>
+<part name="R_LED0" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
+<part name="R_LED1" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
+<part name="R_LED2" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
+<part name="R_LED3" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10K"/>
+<part name="LED0" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="BLUE"/>
+<part name="LED1" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
+<part name="LED2" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="WHITE"/>
+<part name="LED3" library="adafruit" deviceset="LED" device="CHIPLED_0603" value="RED"/>
 <part name="GND18" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND19" library="SparkFun" deviceset="GND" device=""/>
 <part name="GND20" library="SparkFun" deviceset="GND" device=""/>
@@ -4893,8 +4893,11 @@ Source: http://www.osram.convergy.de/</d
 <instance part="TEMP" gate="G$1" x="101.6" y="63.5"/>
 <instance part="JP2" gate="G$1" x="101.6" y="167.64"/>
 <instance part="JP1" gate="G$1" x="101.6" y="132.08"/>
-<instance part="C13" gate="G$1" x="152.4" y="124.46" rot="R180"/>
-<instance part="C14" gate="G$1" x="142.24" y="124.46" rot="R180"/>
+<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"/>
+</instance>
+<instance part="C_CRYS1" gate="G$1" x="142.24" y="124.46" rot="R180"/>
 <instance part="GND11" gate="1" x="147.32" y="111.76"/>
 <instance part="Y2" gate="G$1" x="147.32" y="132.08" smashed="yes" rot="R180">
 <attribute name="NAME" x="139.7" y="131.064" size="1.778" layer="95" rot="R180"/>
@@ -4916,12 +4919,12 @@ Source: http://www.osram.convergy.de/</d
 <instance part="P+7" gate="1" x="86.36" y="76.2" smashed="yes">
 <attribute name="VALUE" x="85.344" y="79.756" size="1.778" layer="96"/>
 </instance>
-<instance part="R6" gate="G$1" x="124.46" y="91.44" rot="R90"/>
-<instance part="R7" gate="G$1" x="116.84" y="91.44" rot="R90"/>
+<instance part="R_SCL" gate="G$1" x="124.46" y="91.44" rot="R90"/>
+<instance part="R_SDA" gate="G$1" x="116.84" y="91.44" rot="R90"/>
 <instance part="P+8" gate="1" x="120.65" y="100.33"/>
 <instance part="GND14" gate="1" x="48.26" y="165.1"/>
-<instance part="LED1" gate="G$1" x="5.08" y="129.54"/>
-<instance part="R8" gate="G$1" x="5.08" y="142.24" rot="R90"/>
+<instance part="ASSOC" gate="G$1" x="5.08" y="129.54"/>
+<instance part="R_ASSOC" gate="G$1" x="5.08" y="142.24" rot="R90"/>
 <instance part="GND16" gate="1" x="5.08" y="116.84"/>
 <instance part="R9" gate="G$1" x="63.5" y="127"/>
 <instance part="R10" gate="G$1" x="76.2" y="142.24" rot="R90"/>
@@ -4936,14 +4939,14 @@ Source: http://www.osram.convergy.de/</d
 </instance>
 <instance part="Q2" gate="G$1" x="73.66" y="127"/>
 <instance part="GND17" gate="1" x="81.28" y="111.76"/>
-<instance part="R12" gate="G$1" x="38.1" y="142.24" rot="R90"/>
-<instance part="R13" gate="G$1" x="30.48" y="142.24" rot="R90"/>
-<instance part="R14" gate="G$1" x="22.86" y="142.24" rot="R90"/>
-<instance part="R15" gate="G$1" x="15.24" y="142.24" rot="R90"/>
-<instance part="LED2" gate="G$1" x="38.1" y="129.54"/>
-<instance part="LED3" gate="G$1" x="30.48" y="129.54"/>
-<instance part="LED4" gate="G$1" x="22.86" y="129.54"/>
-<instance part="LED5" gate="G$1" x="15.24" y="129.54"/>
+<instance part="R_LED0" gate="G$1" x="38.1" y="142.24" rot="R90"/>
+<instance part="R_LED1" gate="G$1" x="30.48" y="142.24" rot="R90"/>
+<instance part="R_LED2" gate="G$1" x="22.86" y="142.24" rot="R90"/>
+<instance part="R_LED3" gate="G$1" x="15.24" y="142.24" rot="R90"/>
+<instance part="LED0" gate="G$1" x="38.1" y="129.54"/>
+<instance part="LED1" gate="G$1" x="30.48" y="129.54"/>
+<instance part="LED2" gate="G$1" x="22.86" y="129.54"/>
+<instance part="LED3" gate="G$1" x="15.24" y="129.54"/>
 <instance part="GND18" gate="1" x="38.1" y="116.84"/>
 <instance part="GND19" gate="1" x="30.48" y="116.84"/>
 <instance part="GND20" gate="1" x="22.86" y="116.84"/>
@@ -5017,9 +5020,9 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="170.18" y1="93.98" x2="170.18" y2="96.52" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="R_SDA" gate="G$1" pin="2"/>
 <wire x1="116.84" y1="96.52" x2="116.84" y2="99.06" width="0.1524" layer="91"/>
-<pinref part="R6" gate="G$1" pin="2"/>
+<pinref part="R_SCL" gate="G$1" pin="2"/>
 <wire x1="116.84" y1="99.06" x2="120.65" y2="99.06" width="0.1524" layer="91"/>
 <wire x1="120.65" y1="99.06" x2="124.46" y2="99.06" width="0.1524" layer="91"/>
 <wire x1="124.46" y1="99.06" x2="124.46" y2="96.52" width="0.1524" layer="91"/>
@@ -5149,10 +5152,10 @@ Source: http://www.osram.convergy.de/</d
 <junction x="170.18" y="68.58"/>
 </segment>
 <segment>
-<pinref part="C14" gate="G$1" pin="1"/>
+<pinref part="C_CRYS1" gate="G$1" pin="1"/>
 <wire x1="142.24" y1="119.38" x2="142.24" y2="116.84" width="0.1524" layer="91"/>
 <wire x1="142.24" y1="116.84" x2="147.32" y2="116.84" width="0.1524" layer="91"/>
-<pinref part="C13" gate="G$1" pin="1"/>
+<pinref part="C_CRYS2" gate="G$1" pin="1"/>
 <wire x1="147.32" y1="116.84" x2="152.4" y2="116.84" width="0.1524" layer="91"/>
 <wire x1="152.4" y1="116.84" x2="152.4" y2="119.38" width="0.1524" layer="91"/>
 <pinref part="GND11" gate="1" pin="GND"/>
@@ -5215,7 +5218,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="114.3" y="114.3" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="LED1" gate="G$1" pin="C"/>
+<pinref part="ASSOC" gate="G$1" pin="C"/>
 <pinref part="GND16" gate="1" pin="GND"/>
 <wire x1="5.08" y1="119.38" x2="5.08" y2="124.46" width="0.1524" layer="91"/>
 </segment>
@@ -5231,22 +5234,22 @@ Source: http://www.osram.convergy.de/</d
 <junction x="81.28" y="116.84"/>
 </segment>
 <segment>
-<pinref part="LED2" gate="G$1" pin="C"/>
+<pinref part="LED0" gate="G$1" pin="C"/>
 <pinref part="GND18" gate="1" pin="GND"/>
 <wire x1="38.1" y1="119.38" x2="38.1" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="LED3" gate="G$1" pin="C"/>
+<pinref part="LED1" gate="G$1" pin="C"/>
 <pinref part="GND19" gate="1" pin="GND"/>
 <wire x1="30.48" y1="119.38" x2="30.48" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="LED4" gate="G$1" pin="C"/>
+<pinref part="LED2" gate="G$1" pin="C"/>
 <pinref part="GND20" gate="1" pin="GND"/>
 <wire x1="22.86" y1="119.38" x2="22.86" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="LED5" gate="G$1" pin="C"/>
+<pinref part="LED3" gate="G$1" pin="C"/>
 <pinref part="GND21" gate="1" pin="GND"/>
 <wire x1="15.24" y1="119.38" x2="15.24" y2="124.46" width="0.1524" layer="91"/>
 </segment>
@@ -5359,7 +5362,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="121.92" y="63.5" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R_SDA" gate="G$1" pin="1"/>
 <wire x1="116.84" y1="86.36" x2="116.84" y2="83.82" width="0.1524" layer="91"/>
 <wire x1="116.84" y1="83.82" x2="104.14" y2="83.82" width="0.1524" layer="91"/>
 <label x="106.68" y="83.82" size="1.778" layer="95"/>
@@ -5382,7 +5385,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="121.92" y="60.96" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R6" gate="G$1" pin="1"/>
+<pinref part="R_SCL" gate="G$1" pin="1"/>
 <wire x1="124.46" y1="86.36" x2="124.46" y2="78.74" width="0.1524" layer="91"/>
 <wire x1="124.46" y1="78.74" x2="104.14" y2="78.74" width="0.1524" layer="91"/>
 <label x="106.68" y="78.74" size="1.778" layer="95"/>
@@ -5541,7 +5544,7 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="142.24" y1="137.16" x2="142.24" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="Y2" gate="G$1" pin="2"/>
 <wire x1="142.24" y1="132.08" x2="144.78" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="C14" gate="G$1" pin="2"/>
+<pinref part="C_CRYS1" gate="G$1" pin="2"/>
 <wire x1="142.24" y1="132.08" x2="142.24" y2="127" width="0.1524" layer="91"/>
 <junction x="142.24" y="132.08"/>
 <pinref part="IC1" gate="G$1" pin="XTAL2"/>
@@ -5553,7 +5556,7 @@ Source: http://www.osram.convergy.de/</d
 <wire x1="152.4" y1="134.62" x2="152.4" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="Y2" gate="G$1" pin="1"/>
 <wire x1="149.86" y1="132.08" x2="152.4" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="C13" gate="G$1" pin="2"/>
+<pinref part="C_CRYS2" gate="G$1" pin="2"/>
 <wire x1="152.4" y1="132.08" x2="152.4" y2="127" width="0.1524" layer="91"/>
 <junction x="152.4" y="132.08"/>
 <pinref part="IC1" gate="G$1" pin="XTAL1"/>
@@ -5716,7 +5719,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="114.3" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R12" gate="G$1" pin="2"/>
+<pinref part="R_LED0" gate="G$1" pin="2"/>
 <wire x1="38.1" y1="147.32" x2="38.1" y2="157.48" width="0.1524" layer="91"/>
 <label x="38.1" y="157.48" size="1.778" layer="95" rot="R270"/>
 </segment>
@@ -5728,7 +5731,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="116.84" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R13" gate="G$1" pin="2"/>
+<pinref part="R_LED1" gate="G$1" pin="2"/>
 <wire x1="30.48" y1="147.32" x2="30.48" y2="157.48" width="0.1524" layer="91"/>
 <label x="30.48" y="157.48" size="1.778" layer="95" rot="R270"/>
 </segment>
@@ -5740,7 +5743,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="119.38" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R14" gate="G$1" pin="2"/>
+<pinref part="R_LED2" gate="G$1" pin="2"/>
 <wire x1="22.86" y1="147.32" x2="22.86" y2="157.48" width="0.1524" layer="91"/>
 <label x="22.86" y="157.48" size="1.778" layer="95" rot="R270"/>
 </segment>
@@ -5752,7 +5755,7 @@ Source: http://www.osram.convergy.de/</d
 <label x="231.14" y="121.92" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R15" gate="G$1" pin="2"/>
+<pinref part="R_LED3" gate="G$1" pin="2"/>
 <wire x1="15.24" y1="147.32" x2="15.24" y2="157.48" width="0.1524" layer="91"/>
 <label x="15.24" y="157.48" size="1.778" layer="95" rot="R270"/>
 </segment>
@@ -5764,15 +5767,15 @@ Source: http://www.osram.convergy.de/</d
 <label x="61.722" y="76.454" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="R8" gate="G$1" pin="2"/>
+<pinref part="R_ASSOC" gate="G$1" pin="2"/>
 <wire x1="5.08" y1="147.32" x2="5.08" y2="157.48" width="0.1524" layer="91"/>
 <label x="5.08" y="157.48" size="1.778" layer="95" rot="R270"/>
 </segment>
 </net>
 <net name="N$7" class="0">
 <segment>
-<pinref part="R8" gate="G$1" pin="1"/>
-<pinref part="LED1" gate="G$1" pin="A"/>
+<pinref part="R_ASSOC" gate="G$1" pin="1"/>
+<pinref part="ASSOC" gate="G$1" pin="A"/>
 <wire x1="5.08" y1="137.16" x2="5.08" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -5814,29 +5817,29 @@ Source: http://www.osram.convergy.de/</d
 </net>
 <net name="N$1" class="0">
 <segment>
-<pinref part="R12" gate="G$1" pin="1"/>
-<pinref part="LED2" gate="G$1" pin="A"/>
+<pinref part="R_LED0" gate="G$1" pin="1"/>
+<pinref part="LED0" gate="G$1" pin="A"/>
 <wire x1="38.1" y1="137.16" x2="38.1" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
-<pinref part="R13" gate="G$1" pin="1"/>
-<pinref part="LED3" gate="G$1" pin="A"/>
+<pinref part="R_LED1" gate="G$1" pin="1"/>
+<pinref part="LED1" gate="G$1" pin="A"/>
 <wire x1="30.48" y1="137.16" x2="30.48" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$16" class="0">
 <segment>
-<pinref part="R14" gate="G$1" pin="1"/>
-<pinref part="LED4" gate="G$1" pin="A"/>
+<pinref part="R_LED2" gate="G$1" pin="1"/>
+<pinref part="LED2" gate="G$1" pin="A"/>
 <wire x1="22.86" y1="137.16" x2="22.86" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$17" class="0">
 <segment>
-<pinref part="R15" gate="G$1" pin="1"/>
-<pinref part="LED5" gate="G$1" pin="A"/>
+<pinref part="R_LED3" gate="G$1" pin="1"/>
+<pinref part="LED3" gate="G$1" pin="A"/>
 <wire x1="15.24" y1="137.16" x2="15.24" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>