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>