diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -17,7 +17,7 @@
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
@@ -38,7 +38,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -127,6 +127,10 @@
 <wire x1="54.28" y1="0" x2="54.28" y2="53.33" width="0" layer="20"/>
 <wire x1="54.28" y1="53.33" x2="0" y2="53.33" width="0" layer="20"/>
 <wire x1="0" y1="53.33" x2="0" y2="0" width="0" layer="20"/>
+<hole x="2.54" y="2.54" drill="3.2"/>
+<hole x="2.54" y="50.8" drill="3.2"/>
+<hole x="52.07" y="50.8" drill="3.2"/>
+<hole x="50.8" y="2.54" drill="3.2"/>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -135,33 +139,34 @@ We've spent an enormous amount of time c
 &lt;br&gt;&lt;br&gt;
 &lt;b&gt;Licensing:&lt;/b&gt; CC v3.0 Share-Alike You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
 <packages>
-<package name="MICRO-SD-SOCKET-PP">
-<wire x1="-14" y1="0" x2="-14" y2="13.2" width="0.2032" layer="21"/>
-<wire x1="0" y1="12.1" x2="0" y2="0" width="0.2032" layer="21"/>
-<wire x1="-11.7" y1="15.3" x2="-12.5" y2="15.3" width="0.2032" layer="21"/>
-<wire x1="-11" y1="16" x2="0" y2="16" width="0.2032" layer="51"/>
-<wire x1="-10" y1="13.6" x2="-1.6" y2="13.6" width="0.2032" layer="21"/>
-<wire x1="-14" y1="0" x2="-9.1" y2="0" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="0" x2="-6.4" y2="0" width="0.2032" layer="21"/>
-<wire x1="0" y1="0" x2="-0.7" y2="0" width="0.2032" layer="21"/>
-<wire x1="0" y1="17.6" x2="-11" y2="17.6" width="0.2032" layer="51"/>
-<wire x1="0" y1="20.7" x2="-11" y2="20.7" width="0.2032" layer="51"/>
-<wire x1="-11.7" y1="15.3" x2="-11" y2="14.6" width="0.2032" layer="21" curve="-98.797411"/>
-<wire x1="-11" y1="14.6" x2="-10" y2="13.6" width="0.2032" layer="21" curve="87.205638"/>
-<smd name="CD2" x="-7.75" y="0.4" dx="1.8" dy="1.4" layer="1"/>
-<smd name="CD1" x="-2.05" y="0.4" dx="1.8" dy="1.4" layer="1"/>
-<smd name="GND3" x="-0.45" y="13.55" dx="1.4" dy="1.9" layer="1"/>
-<smd name="GND1" x="-13.6" y="14.55" dx="1.4" dy="1.9" layer="1"/>
-<smd name="1" x="-8.94" y="10.7" dx="0.8" dy="1.5" layer="1"/>
-<smd name="2" x="-7.84" y="10.3" dx="0.8" dy="1.5" layer="1"/>
-<smd name="3" x="-6.74" y="10.7" dx="0.8" dy="1.5" layer="1"/>
-<smd name="4" x="-5.64" y="10.9" dx="0.8" dy="1.5" layer="1"/>
-<smd name="5" x="-4.54" y="10.7" dx="0.8" dy="1.5" layer="1"/>
-<smd name="6" x="-3.44" y="10.9" dx="0.8" dy="1.5" layer="1"/>
-<smd name="7" x="-2.34" y="10.7" dx="0.8" dy="1.5" layer="1"/>
-<smd name="8" x="-1.24" y="10.7" dx="0.8" dy="1.5" layer="1"/>
-<text x="-8.89" y="6.35" size="0.8128" layer="25">&gt;Name</text>
-<text x="-8.89" y="5.08" size="0.8128" layer="27">&gt;Value</text>
+<package name="USD-SOCKET-PP">
+<description>OLD Production Socket. DO NOT USE for production boards.</description>
+<wire x1="-6.725" y1="5.5" x2="-6.725" y2="17" width="0.2032" layer="21"/>
+<wire x1="4" y1="17" x2="7.825" y2="17" width="0.2032" layer="21"/>
+<wire x1="7.825" y1="17" x2="7.825" y2="1.7" width="0.2032" layer="21"/>
+<wire x1="6" y1="0" x2="4" y2="0" width="0.2032" layer="21"/>
+<wire x1="4" y1="0" x2="4" y2="1.65" width="0.2032" layer="21"/>
+<wire x1="-4" y1="1.65" x2="-4" y2="1" width="0.2032" layer="21"/>
+<wire x1="-4" y1="1" x2="-5" y2="1" width="0.2032" layer="21"/>
+<wire x1="-4" y1="1.65" x2="4" y2="1.65" width="0.2032" layer="21" curve="-69.416099"/>
+<wire x1="4" y1="-0.7" x2="-4" y2="-0.7" width="0.127" layer="51"/>
+<wire x1="4" y1="-1.6" x2="-4" y2="-1.6" width="0.127" layer="51"/>
+<wire x1="4" y1="-5.4" x2="-4" y2="-5.4" width="0.127" layer="51"/>
+<wire x1="-6.725" y1="3.6" x2="-6.725" y2="2.6" width="0.2032" layer="21"/>
+<smd name="GND1" x="-6.275" y="1.475" dx="1.5" dy="1.35" layer="1"/>
+<smd name="GND2" x="7.375" y="0.475" dx="1.5" dy="1.35" layer="1"/>
+<smd name="CD2" x="-6.425" y="4.5" dx="1.4" dy="1" layer="1"/>
+<smd name="CD1" x="-5.85" y="16.75" dx="1" dy="1.3" layer="1"/>
+<smd name="8" x="-4.5" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="7" x="-3.4" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="6" x="-2.3" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="5" x="-1.2" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="4" x="-0.1" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="3" x="1" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="2" x="2.1" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<smd name="1" x="3.2" y="16.8" dx="0.75" dy="1.5" layer="1"/>
+<text x="-5.08" y="7.62" size="0.4064" layer="25">&gt;Name</text>
+<text x="-5.08" y="6.35" size="0.4064" layer="27">&gt;Value</text>
 </package>
 <package name="XBEE-SMD">
 <wire x1="-5" y1="27.6" x2="5" y2="27.6" width="0.2032" layer="21"/>
@@ -606,20 +611,6 @@ Source: http://www.semiconductors.philip
 </package>
 </packages>
 </library>
-<library name="jumper">
-<packages>
-<package name="05">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-1.3462" y1="0" x2="1.3462" y2="0" width="0.6096" layer="21"/>
-<wire x1="2.54" y1="0" x2="1.397" y2="0" width="0.6096" layer="51"/>
-<wire x1="-2.54" y1="0" x2="-1.397" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-2.54" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="2.54" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-2.54" y="0.889" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="2.5001" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-</library>
 <library name="adafruit">
 <packages>
 <package name="CHIPLED_0603">
@@ -867,68 +858,67 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="U2" library="SparkFun" package="MICRO-SD-SOCKET-PP" value="USD-SOCKETNEW" x="16.51" y="8.89" rot="MR270"/>
+<element name="U2" library="SparkFun" package="USD-SOCKET-PP" value="USD-SOCKETUSD" x="1.27" y="14.605" rot="MR90"/>
 <element name="U$2" library="SparkFun" package="XBEE-SMD" value="XBEE-1B3" x="29.21" y="15.24" rot="MR270"/>
-<element name="C1" library="SparkFun" package="0603-CAP" value="18pf" x="22.86" y="29.21"/>
-<element name="C2" library="SparkFun" package="0603-CAP" value="18pf" x="15.24" y="29.21" rot="R180"/>
-<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="19.05" y="29.21"/>
-<element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644P" x="21.59" y="17.78">
-<attribute name="OC_NEWARK" value="58M3748" x="64.77" y="-27.94" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="ATMEGA644PV-10AU" x="64.77" y="-27.94" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="64.77" y="-27.94" size="1.778" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="1455123" x="64.77" y="-27.94" size="1.778" layer="27" display="off"/>
+<element name="C1" library="SparkFun" package="0603-CAP" value="18pf" x="27.94" y="39.37"/>
+<element name="C2" library="SparkFun" package="0603-CAP" value="18pf" x="27.94" y="49.53"/>
+<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="27.94" y="36.83"/>
+<element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644P" x="43.18" y="17.78">
+<attribute name="OC_NEWARK" value="58M3748" x="86.36" y="-27.94" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="ATMEGA644PV-10AU" x="86.36" y="-27.94" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="" x="86.36" y="-27.94" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="1455123" x="86.36" y="-27.94" size="1.778" layer="27" display="off"/>
 </element>
-<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="11.43" y="16.51" rot="R90"/>
-<element name="U1" library="Module" package="28P-1.1-22.5X17" value="" x="33.02" y="25.4"/>
-<element name="C6" library="SparkFun" package="0603-CAP" value="" x="36.83" y="29.21"/>
-<element name="C7" library="SparkFun" package="0603-CAP" value="" x="40.64" y="29.21"/>
-<element name="C8" library="SparkFun" package="0603-CAP" value="8.2pF" x="45.72" y="29.21"/>
-<element name="C9" library="SparkFun" package="0603-CAP" value="1uF" x="52.07" y="29.21"/>
-<element name="C11" library="SparkFun" package="0603-CAP" value="" x="52.07" y="25.4" rot="R90"/>
-<element name="C12" library="SparkFun" package="0603-CAP" value="" x="10.16" y="25.4"/>
-<element name="C13" library="SparkFun" package="0603-CAP" value=".1uF" x="26.67" y="29.21"/>
-<element name="C14" library="SparkFun" package="0603-CAP" value=".1uF" x="6.35" y="20.32"/>
-<element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="6.35" y="16.51"/>
-<element name="C16" library="SparkFun" package="0603-CAP" value="10uF" x="6.35" y="13.97"/>
-<element name="C17" library="SparkFun" package="0603-CAP" value="10uF" x="49.53" y="25.4" rot="R90"/>
-<element name="L1" library="SparkFun" package="0603" value="" x="16.51" y="3.81" rot="R90"/>
-<element name="VBATT" library="jst" package="B3B-ZR" value="B3B-ZR" x="88.9" y="80.01"/>
-<element name="BUZZ" library="jst" package="B3B-ZR" value="B3B-ZR" x="88.9" y="72.39"/>
-<element name="U3" library="SparkFun" package="SOT223" value="V_REG_317SMD" x="80.01" y="73.66"/>
-<element name="J1" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="68.58" y="73.66"/>
-<element name="M2" library="trackuino" package="HX1" value="HX1" x="15.24" y="43.18"/>
-<element name="X1" library="con-coax" package="BU-SMA-V" value="BU-SMA-V" x="5.08" y="48.26">
-<attribute name="OC_NEWARK" value="unknown" x="-3.81" y="62.23" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="" x="-3.81" y="62.23" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="-3.81" y="62.23" size="1.778" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="unknown" x="-3.81" y="62.23" size="1.778" layer="27" display="off"/>
+<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="33.02" y="16.51" rot="R90"/>
+<element name="U1" library="Module" package="28P-1.1-22.5X17" value="" x="1.27" y="7.62" rot="R90"/>
+<element name="C6" library="SparkFun" package="0603-CAP" value="" x="27.94" y="34.29" rot="R180"/>
+<element name="C7" library="SparkFun" package="0603-CAP" value="" x="27.94" y="44.45" rot="R180"/>
+<element name="C8" library="SparkFun" package="0603-CAP" value="8.2pF" x="27.94" y="46.99" rot="R180"/>
+<element name="C9" library="SparkFun" package="0603-CAP" value="1uF" x="27.94" y="52.07"/>
+<element name="C11" library="SparkFun" package="0603-CAP" value="" x="27.94" y="29.21" rot="R180"/>
+<element name="C12" library="SparkFun" package="0603-CAP" value="" x="27.94" y="24.13"/>
+<element name="C13" library="SparkFun" package="0603-CAP" value=".1uF" x="27.94" y="41.91"/>
+<element name="C14" library="SparkFun" package="0603-CAP" value=".1uF" x="27.94" y="21.59"/>
+<element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="27.94" y="19.05"/>
+<element name="C16" library="SparkFun" package="0603-CAP" value="10uF" x="27.94" y="16.51"/>
+<element name="C17" library="SparkFun" package="0603-CAP" value="10uF" x="27.94" y="31.75" rot="R180"/>
+<element name="L1" library="SparkFun" package="0603" value="" x="27.94" y="13.97" rot="R180"/>
+<element name="VBATT" library="jst" package="B3B-ZR" value="B3B-ZR" x="21.59" y="33.02" rot="R90"/>
+<element name="BUZZ" library="jst" package="B3B-ZR" value="B3B-ZR" x="21.59" y="40.64" rot="R90"/>
+<element name="U3" library="SparkFun" package="SOT223" value="V_REG_317SMD" x="15.24" y="41.91"/>
+<element name="J1" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="43.18" y="3.81"/>
+<element name="M2" library="trackuino" package="HX1" value="HX1" x="13.97" y="41.91" rot="MR180"/>
+<element name="X1" library="con-coax" package="BU-SMA-V" value="BU-SMA-V" x="5.08" y="43.18">
+<attribute name="OC_NEWARK" value="unknown" x="-3.81" y="57.15" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="" x="-3.81" y="57.15" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="" x="-3.81" y="57.15" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="unknown" x="-3.81" y="57.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="X2" library="con-coax" package="BU-SMA-V" value="BU-SMA-V" x="59.69" y="7.62">
-<attribute name="OC_NEWARK" value="unknown" x="59.69" y="7.62" size="1.778" layer="27" display="off"/>
-<attribute name="MPN" value="" x="59.69" y="7.62" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="" x="59.69" y="7.62" size="1.778" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="unknown" x="59.69" y="7.62" size="1.778" layer="27" display="off"/>
+<element name="X2" library="con-coax" package="BU-SMA-V" value="BU-SMA-V" x="5.08" y="33.02">
+<attribute name="OC_NEWARK" value="unknown" x="5.08" y="33.02" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="" x="5.08" y="33.02" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="" x="5.08" y="33.02" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="unknown" x="5.08" y="33.02" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C3" library="SparkFun" package="0603-CAP" value=".1uF" x="-2.54" y="-2.54"/>
-<element name="R2" library="SparkFun" package="0603-RES" value="10k" x="-6.35" y="-6.35"/>
-<element name="R3" library="SparkFun" package="0603-RES" value="100k" x="-6.35" y="-10.16"/>
-<element name="IC2" library="74xx-little-us" package="SOT23-5" value="ON M74VHC1GT125DT1G" x="-8.89" y="-24.13"/>
-<element name="J2" library="jumper" package="05" value="J5MM" x="-7.62" y="-31.75"/>
-<element name="L2" library="SparkFun" package="0603" value="10uH" x="-10.16" y="-34.29"/>
-<element name="R4" library="SparkFun" package="0603-RES" value="1k" x="-10.16" y="-38.1"/>
-<element name="R5" library="SparkFun" package="0603-RES" value="2k" x="-10.16" y="-41.91"/>
-<element name="R6" library="SparkFun" package="0603-RES" value="3.9" x="-10.16" y="-45.72"/>
-<element name="R7" library="SparkFun" package="0603-RES" value="8.2" x="-10.16" y="-49.53"/>
-<element name="R8" library="SparkFun" package="0603-RES" value="510k" x="-10.16" y="-53.34"/>
-<element name="R9" library="SparkFun" package="TRIMPOT-3MM" value="30k" x="-13.97" y="-52.07"/>
-<element name="C4" library="SparkFun" package="0603-CAP" value=".1uF" x="-13.97" y="-57.15"/>
-<element name="TX" library="adafruit" package="CHIPLED_0603" value="GREEN" x="-19.05" y="-55.88"/>
-<element name="STAT" library="adafruit" package="CHIPLED_0603" value="BLUE" x="-24.13" y="-55.88"/>
-<element name="ERROR" library="adafruit" package="CHIPLED_0603" value="RED" x="-29.21" y="-55.88"/>
-<element name="POWER" library="adafruit" package="CHIPLED_0603" value="WHITE" x="-34.29" y="-55.88"/>
-<element name="IC4" library="adafruit" package="MSOP10" value="ISL1209" x="-40.64" y="-54.61"/>
-<element name="R10" library="SparkFun" package="0603-RES" value="100k" x="-41.91" y="-60.96"/>
-<element name="R11" library="SparkFun" package="0603-RES" value="100k" x="-41.91" y="-64.77"/>
+<element name="C3" library="SparkFun" package="0603-CAP" value=".1uF" x="35.56" y="35.56"/>
+<element name="R2" library="SparkFun" package="0603-RES" value="10k" x="35.56" y="40.64"/>
+<element name="R3" library="SparkFun" package="0603-RES" value="100k" x="35.56" y="38.1" rot="R180"/>
+<element name="IC2" library="74xx-little-us" package="SOT23-5" value="ON M74VHC1GT125DT1G" x="40.64" y="39.37"/>
+<element name="L2" library="SparkFun" package="0603" value="10uH" x="27.94" y="26.67" rot="R180"/>
+<element name="R4" library="SparkFun" package="0603-RES" value="1k" x="27.94" y="6.35"/>
+<element name="R5" library="SparkFun" package="0603-RES" value="2k" x="27.94" y="8.89"/>
+<element name="R6" library="SparkFun" package="0603-RES" value="3.9" x="27.94" y="11.43"/>
+<element name="R7" library="SparkFun" package="0603-RES" value="8.2" x="41.91" y="31.75"/>
+<element name="R8" library="SparkFun" package="0603-RES" value="510k" x="27.94" y="1.27"/>
+<element name="R9" library="SparkFun" package="TRIMPOT-3MM" value="30k" x="45.72" y="39.37"/>
+<element name="C4" library="SparkFun" package="0603-CAP" value=".1uF" x="49.53" y="39.37" rot="R90"/>
+<element name="TX" library="adafruit" package="CHIPLED_0603" value="GREEN" x="50.8" y="46.99" rot="R270"/>
+<element name="STAT" library="adafruit" package="CHIPLED_0603" value="BLUE" x="45.72" y="46.99" rot="R270"/>
+<element name="ERROR" library="adafruit" package="CHIPLED_0603" value="RED" x="35.56" y="46.99" rot="R270"/>
+<element name="POWER" library="adafruit" package="CHIPLED_0603" value="WHITE" x="40.64" y="46.99" rot="R270"/>
+<element name="IC4" library="adafruit" package="MSOP10" value="ISL1209" x="15.24" y="33.02" rot="R270"/>
+<element name="R10" library="SparkFun" package="0603-RES" value="100k" x="35.56" y="43.18"/>
+<element name="R11" library="SparkFun" package="0603-RES" value="100k" x="27.94" y="3.81"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -969,53 +959,53 @@ design rules under a new name.</descript
 <contactref element="ERROR" pad="C"/>
 <contactref element="POWER" pad="C"/>
 <contactref element="IC4" pad="4"/>
-<wire x1="51.435" y1="51.435" x2="71.12" y2="74.93" width="0" layer="19" extent="1-1"/>
-<wire x1="40.64" y1="34.29" x2="51.435" y2="51.435" width="0" layer="19" extent="1-1"/>
-<wire x1="46.57" y1="29.21" x2="40.64" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="52.92" y1="29.21" x2="46.57" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="27.21" y1="24.74" x2="40.64" y2="34.29" width="0" layer="19" extent="16-16"/>
-<wire x1="21.59" y1="23.58" x2="27.21" y2="24.74" width="0" layer="19" extent="1-16"/>
-<wire x1="22.01" y1="29.21" x2="21.59" y2="23.58" width="0" layer="19" extent="1-1"/>
-<wire x1="20.32" y1="34.29" x2="22.01" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="15.24" y1="34.29" x2="20.32" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="16.09" y1="29.21" x2="15.24" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="27.39" y1="17.78" x2="27.21" y2="24.74" width="0" layer="19" extent="1-16"/>
-<wire x1="22.39" y1="11.98" x2="27.39" y2="17.78" width="0" layer="19" extent="1-1"/>
-<wire x1="15.79" y1="17.78" x2="21.59" y2="23.58" width="0" layer="19" extent="1-1"/>
-<wire x1="7.6299" y1="45.7101" x2="15.24" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="7.6299" y1="50.8099" x2="7.6299" y2="45.7101" width="0" layer="19" extent="1-1"/>
-<wire x1="2.5301" y1="50.8099" x2="7.6299" y2="50.8099" width="0" layer="19" extent="1-1"/>
-<wire x1="2.5301" y1="45.7101" x2="7.6299" y2="45.7101" width="0" layer="19" extent="1-1"/>
-<wire x1="13.335" y1="51.435" x2="7.6299" y2="50.8099" width="0" layer="19" extent="1-1"/>
-<wire x1="57.1401" y1="10.1699" x2="52.92" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="62.2399" y1="10.1699" x2="57.1401" y2="10.1699" width="0" layer="19" extent="1-1"/>
-<wire x1="62.2399" y1="5.0701" x2="62.2399" y2="10.1699" width="0" layer="19" extent="1-1"/>
-<wire x1="57.1401" y1="5.0701" x2="57.1401" y2="10.1699" width="0" layer="19" extent="1-1"/>
-<wire x1="-3.39" y1="-2.54" x2="15.79" y2="17.78" width="0" layer="19" extent="1-1"/>
-<wire x1="-5.5" y1="-6.35" x2="-3.39" y2="-2.54" width="0" layer="19" extent="1-1"/>
-<wire x1="-7.94" y1="-25.42" x2="-5.5" y2="-6.35" width="0" layer="19" extent="1-1"/>
-<wire x1="-9.84" y1="-25.42" x2="-7.94" y2="-25.42" width="0" layer="19" extent="1-1"/>
-<wire x1="-9.31" y1="-53.34" x2="-9.84" y2="-25.42" width="0" layer="19" extent="1-1"/>
-<wire x1="-13.12" y1="-57.15" x2="-9.31" y2="-53.34" width="0" layer="19" extent="1-1"/>
-<wire x1="-19.05" y1="-55.13" x2="-13.12" y2="-57.15" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.13" y1="-55.13" x2="-19.05" y2="-55.13" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="-55.13" x2="-24.13" y2="-55.13" width="0" layer="19" extent="1-1"/>
-<wire x1="-34.29" y1="-55.13" x2="-29.21" y2="-55.13" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.14" y1="-56.7231" x2="-34.29" y2="-55.13" width="0" layer="19" extent="1-1"/>
+<wire x1="46.47" y1="46.99" x2="51.55" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="41.39" y1="46.99" x2="46.47" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="50.8" x2="41.39" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="36.31" y1="46.99" x2="39.37" y2="50.8" width="0" layer="19" extent="1-1"/>
+<wire x1="36.41" y1="40.64" x2="36.31" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="39.69" y1="38.08" x2="36.41" y2="40.64" width="0" layer="19" extent="1-1"/>
+<wire x1="41.59" y1="38.08" x2="39.69" y2="38.08" width="0" layer="19" extent="1-1"/>
+<wire x1="34.71" y1="35.56" x2="36.41" y2="40.64" width="0" layer="19" extent="1-1"/>
+<wire x1="49.53" y1="40.22" x2="51.55" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="50.165" y1="33.655" x2="49.53" y2="40.22" width="0" layer="19" extent="1-16"/>
+<wire x1="27.09" y1="39.37" x2="34.71" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="46.99" x2="27.09" y2="39.37" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="49.53" x2="27.09" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="28.79" y1="52.07" x2="27.09" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="19.05" y1="50.8" x2="27.09" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="13.97" y1="50.8" x2="19.05" y2="50.8" width="0" layer="19" extent="1-1"/>
+<wire x1="7.6299" y1="45.7299" x2="13.97" y2="50.8" width="0" layer="19" extent="1-1"/>
+<wire x1="7.6299" y1="40.6301" x2="7.6299" y2="45.7299" width="0" layer="19" extent="1-1"/>
+<wire x1="7.6299" y1="35.5699" x2="7.6299" y2="40.6301" width="0" layer="19" extent="1-1"/>
+<wire x1="12.065" y1="33.655" x2="7.6299" y2="35.5699" width="0" layer="19" extent="16-16"/>
+<wire x1="13.1269" y1="32.52" x2="12.065" y2="33.655" width="0" layer="19" extent="1-16"/>
+<wire x1="2.5301" y1="45.7299" x2="7.6299" y2="45.7299" width="0" layer="19" extent="1-1"/>
+<wire x1="2.5301" y1="40.6301" x2="7.6299" y2="40.6301" width="0" layer="19" extent="1-1"/>
+<wire x1="2.5301" y1="35.5699" x2="2.5301" y2="40.6301" width="0" layer="19" extent="1-1"/>
+<wire x1="7.6299" y1="30.4701" x2="7.6299" y2="35.5699" width="0" layer="19" extent="1-1"/>
+<wire x1="2.5301" y1="30.4701" x2="2.5301" y2="35.5699" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="23.58" x2="50.165" y2="33.655" width="0" layer="19" extent="1-16"/>
+<wire x1="48.98" y1="17.78" x2="43.18" y2="23.58" width="0" layer="19" extent="1-1"/>
+<wire x1="43.98" y1="11.98" x2="48.98" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="45.72" y1="5.08" x2="43.98" y2="11.98" width="0" layer="19" extent="1-1"/>
+<wire x1="37.38" y1="17.78" x2="43.18" y2="23.58" width="0" layer="19" extent="1-1"/>
+<wire x1="27.21" y1="24.74" x2="37.38" y2="17.78" width="0" layer="19" extent="1-16"/>
+<wire x1="28.79" y1="1.27" x2="45.72" y2="5.08" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="IC1" pad="7"/>
 <contactref element="Y2" pad="3"/>
 <contactref element="C2" pad="2"/>
-<wire x1="10.28" y1="18.36" x2="14.39" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="15.79" y1="16.98" x2="10.28" y2="18.36" width="0" layer="19" extent="1-1"/>
+<wire x1="31.87" y1="18.36" x2="28.79" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="37.38" y1="16.98" x2="31.87" y2="18.36" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="IC1" pad="8"/>
 <contactref element="Y2" pad="1"/>
 <contactref element="C1" pad="2"/>
-<wire x1="15.79" y1="16.18" x2="23.71" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="12.58" y1="14.66" x2="15.79" y2="16.18" width="0" layer="19" extent="1-1"/>
+<wire x1="37.38" y1="16.18" x2="28.79" y2="39.37" width="0" layer="19" extent="1-1"/>
+<wire x1="34.17" y1="14.66" x2="37.38" y2="16.18" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SDA">
 <contactref element="IC1" pad="20"/>
@@ -1026,24 +1016,24 @@ design rules under a new name.</descript
 <signal name="SCK">
 <contactref element="IC1" pad="3"/>
 <contactref element="J1" pad="3"/>
-<wire x1="68.58" y1="72.39" x2="15.79" y2="20.18" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="2.54" x2="37.38" y2="20.18" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
 <contactref element="J1" pad="1"/>
-<wire x1="66.04" y1="72.39" x2="15.79" y2="20.98" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="2.54" x2="37.38" y2="20.98" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="1"/>
 <contactref element="J1" pad="4"/>
-<wire x1="68.58" y1="74.93" x2="15.79" y2="21.78" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="5.08" x2="37.38" y2="21.78" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RESET">
 <contactref element="IC1" pad="4"/>
 <contactref element="R1" pad="2"/>
 <contactref element="J1" pad="5"/>
-<wire x1="15.79" y1="19.38" x2="19.9" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="71.12" y1="72.39" x2="15.79" y2="19.38" width="0" layer="19" extent="1-1"/>
+<wire x1="37.38" y1="19.38" x2="28.79" y2="36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="45.72" y1="2.54" x2="37.38" y2="19.38" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="TCK">
 <contactref element="IC1" pad="21"/>
@@ -1075,21 +1065,19 @@ design rules under a new name.</descript
 <signal name="RFOUT" class="2">
 <contactref element="M2" pad="RFOUT"/>
 <contactref element="X1" pad="1"/>
-<wire x1="17.78" y1="34.29" x2="5.08" y2="48.26" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="43.18" x2="16.51" y2="50.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HX1_EN">
 <contactref element="IC2" pad="2"/>
-<contactref element="J2" pad="1"/>
 <contactref element="IC1" pad="36"/>
 <contactref element="TX" pad="A"/>
-<wire x1="-10.16" y1="-31.75" x2="-19.05" y2="-56.63" width="0" layer="19" extent="1-1"/>
-<wire x1="-8.89" y1="-25.42" x2="-10.16" y2="-31.75" width="0" layer="19" extent="1-1"/>
-<wire x1="23.99" y1="23.58" x2="-8.89" y2="-25.42" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="38.08" x2="50.05" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="45.58" y1="23.58" x2="40.64" y2="38.08" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VCC">
 <contactref element="J1" pad="2"/>
 <contactref element="L2" pad="2"/>
-<wire x1="-9.31" y1="-34.29" x2="66.04" y2="74.93" width="0" layer="19" extent="1-1"/>
+<wire x1="40.64" y1="5.08" x2="27.09" y2="26.67" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="C8" pad="1"/>
@@ -1099,24 +1087,22 @@ design rules under a new name.</descript
 <contactref element="IC1" pad="5"/>
 <contactref element="IC1" pad="38"/>
 <contactref element="R1" pad="1"/>
-<wire x1="44.87" y1="29.21" x2="51.22" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="22.39" y1="23.58" x2="44.87" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="18.2" y1="29.21" x2="22.39" y2="23.58" width="0" layer="19" extent="1-1"/>
-<wire x1="15.79" y1="18.58" x2="22.39" y2="23.58" width="0" layer="19" extent="1-1"/>
-<wire x1="21.59" y1="11.98" x2="15.79" y2="18.58" width="0" layer="19" extent="1-1"/>
-<wire x1="9.21" y1="27.74" x2="18.2" y2="29.21" width="0" layer="19" extent="1-16"/>
+<wire x1="28.79" y1="46.99" x2="27.09" y2="52.07" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="36.83" x2="28.79" y2="46.99" width="0" layer="19" extent="1-1"/>
+<wire x1="9.21" y1="27.74" x2="27.09" y2="36.83" width="0" layer="19" extent="1-16"/>
+<wire x1="37.38" y1="18.58" x2="27.09" y2="36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="43.98" y1="23.58" x2="37.38" y2="18.58" width="0" layer="19" extent="1-1"/>
+<wire x1="43.18" y1="11.98" x2="37.38" y2="18.58" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HX1_EN_5V">
 <contactref element="M2" pad="EN"/>
 <contactref element="IC2" pad="4"/>
-<contactref element="J2" pad="2"/>
-<wire x1="-7.94" y1="-22.83" x2="35.56" y2="34.29" width="0" layer="19" extent="1-1"/>
-<wire x1="-5.08" y1="-31.75" x2="-7.94" y2="-22.83" width="0" layer="19" extent="1-1"/>
+<wire x1="41.59" y1="40.67" x2="34.29" y2="50.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$3">
 <contactref element="IC1" pad="29"/>
 <contactref element="C3" pad="2"/>
-<wire x1="-1.69" y1="-2.54" x2="27.39" y2="18.58" width="0" layer="19" extent="1-1"/>
+<wire x1="48.98" y1="18.58" x2="36.41" y2="35.56" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="3.3_RXD0">
 <contactref element="U$2" pad="2"/>
@@ -1127,12 +1113,12 @@ design rules under a new name.</descript
 <signal name="SOMEANALOGPIN">
 <contactref element="R3" pad="2"/>
 <contactref element="R2" pad="1"/>
-<wire x1="-7.2" y1="-6.35" x2="-5.5" y2="-10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="34.71" y1="38.1" x2="34.71" y2="40.64" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="R3" pad="1"/>
 <contactref element="VBATT" pad="2"/>
-<wire x1="-7.2" y1="-10.16" x2="88.9" y2="80.01" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="33.02" x2="36.41" y2="38.1" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="5V">
 <contactref element="M2" pad="VCC"/>
@@ -1143,27 +1129,27 @@ design rules under a new name.</descript
 <signal name="N$5">
 <contactref element="L2" pad="1"/>
 <contactref element="IC1" pad="27"/>
-<wire x1="27.39" y1="16.98" x2="-11.01" y2="-34.29" width="0" layer="19" extent="1-1"/>
+<wire x1="28.79" y1="26.67" x2="48.98" y2="16.98" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="IC1" pad="35"/>
 <contactref element="R4" pad="2"/>
-<wire x1="-9.31" y1="-38.1" x2="24.79" y2="23.58" width="0" layer="19" extent="1-1"/>
+<wire x1="28.79" y1="6.35" x2="46.38" y2="23.58" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="IC1" pad="34"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-9.31" y1="-41.91" x2="25.59" y2="23.58" width="0" layer="19" extent="1-1"/>
+<wire x1="28.79" y1="8.89" x2="47.18" y2="23.58" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="IC1" pad="33"/>
 <contactref element="R6" pad="2"/>
-<wire x1="27.39" y1="21.78" x2="-9.31" y2="-45.72" width="0" layer="19" extent="1-1"/>
+<wire x1="28.79" y1="11.43" x2="48.98" y2="21.78" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="IC1" pad="32"/>
 <contactref element="R7" pad="2"/>
-<wire x1="27.39" y1="20.98" x2="-9.31" y2="-49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="48.98" y1="20.98" x2="42.76" y2="31.75" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SINBEFORE">
 <contactref element="R7" pad="1"/>
@@ -1172,11 +1158,11 @@ design rules under a new name.</descript
 <contactref element="R5" pad="1"/>
 <contactref element="R9" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="-14.82" y1="-53.72" x2="-14.82" y2="-57.15" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.01" y1="-49.53" x2="-14.82" y2="-53.72" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.01" y1="-45.72" x2="-11.01" y2="-49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.01" y1="-41.91" x2="-11.01" y2="-45.72" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.01" y1="-38.1" x2="-11.01" y2="-41.91" width="0" layer="19" extent="1-1"/>
+<wire x1="44.87" y1="37.72" x2="49.53" y2="38.52" width="0" layer="19" extent="1-1"/>
+<wire x1="41.06" y1="31.75" x2="44.87" y2="37.72" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="11.43" x2="41.06" y2="31.75" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="8.89" x2="27.09" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="6.35" x2="27.09" y2="8.89" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HX1_TX_3.3">
 <contactref element="R9" pad="2"/>
@@ -1184,7 +1170,7 @@ design rules under a new name.</descript
 <signal name="N$11">
 <contactref element="R9" pad="3"/>
 <contactref element="R8" pad="1"/>
-<wire x1="-11.01" y1="-53.34" x2="-13.12" y2="-53.72" width="0" layer="19" extent="1-1"/>
+<wire x1="27.09" y1="1.27" x2="46.57" y2="37.72" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="IC4" pad="3"/>
diff --git a/master/master.sch b/master/master.sch
--- a/master/master.sch
+++ b/master/master.sch
@@ -122,6 +122,7 @@
 <layer number="254" name="cooling" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <schematic xreflabel="%F%N/%S.%C%R" xrefpart="/%S.%C%R">
+<description>HAB: Master Motherboard</description>
 <libraries>
 <library name="SparkFun">
 <description>&lt;h3&gt;SparkFun Electronics' preferred foot prints&lt;/h3&gt;
@@ -3653,185 +3654,6 @@ Source: http://www.semiconductors.philip
 </deviceset>
 </devicesets>
 </library>
-<library name="jumper">
-<packages>
-<package name="05">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-1.3462" y1="0" x2="1.3462" y2="0" width="0.6096" layer="21"/>
-<wire x1="2.54" y1="0" x2="1.397" y2="0" width="0.6096" layer="51"/>
-<wire x1="-2.54" y1="0" x2="-1.397" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-2.54" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="2.54" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-2.54" y="0.889" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="2.5001" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="07">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-2.6162" y1="0" x2="2.6162" y2="0" width="0.6096" layer="21"/>
-<wire x1="3.81" y1="0" x2="2.54" y2="0" width="0.6096" layer="51"/>
-<wire x1="-3.81" y1="0" x2="-2.54" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-3.81" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="3.81" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-2.54" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="3.7" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="10">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-3.8862" y1="0" x2="3.8862" y2="0" width="0.6096" layer="21"/>
-<wire x1="5.08" y1="0" x2="3.937" y2="0" width="0.6096" layer="51"/>
-<wire x1="-5.08" y1="0" x2="-3.937" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-5.08" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="5.08" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-3.175" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="5" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="12">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-5.1562" y1="0" x2="5.1562" y2="0" width="0.6096" layer="21"/>
-<wire x1="6.35" y1="0" x2="5.207" y2="0" width="0.6096" layer="51"/>
-<wire x1="-6.35" y1="0" x2="-5.207" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-6.35" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="6.35" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-3.175" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="6.3" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="15">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-6.4262" y1="0" x2="6.4262" y2="0" width="0.6096" layer="21"/>
-<wire x1="7.62" y1="0" x2="6.477" y2="0" width="0.6096" layer="51"/>
-<wire x1="-7.62" y1="0" x2="-6.477" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-7.62" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="7.62" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-5.715" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="7.5999" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="20">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-8.9662" y1="0" x2="8.9662" y2="0" width="0.6096" layer="21"/>
-<wire x1="10.16" y1="0" x2="9.017" y2="0" width="0.6096" layer="51"/>
-<wire x1="-10.16" y1="0" x2="-9.017" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-10.16" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="10.16" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-8.255" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="10.1001" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="25">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-11.5062" y1="0" x2="11.5062" y2="0" width="0.6096" layer="21"/>
-<wire x1="12.7" y1="0" x2="11.557" y2="0" width="0.6096" layer="51"/>
-<wire x1="-12.7" y1="0" x2="-11.557" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-12.7" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="12.7" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-10.795" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="12.5999" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-<package name="30">
-<description>&lt;b&gt;JUMPER&lt;/b&gt;</description>
-<wire x1="-14.0462" y1="0" x2="14.0462" y2="0" width="0.6096" layer="21"/>
-<wire x1="15.24" y1="0" x2="14.097" y2="0" width="0.6096" layer="51"/>
-<wire x1="-15.24" y1="0" x2="-14.097" y2="0" width="0.6096" layer="51"/>
-<pad name="1" x="-15.24" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<pad name="2" x="15.24" y="0" drill="0.8128" diameter="1.6002" shape="octagon"/>
-<text x="-13.335" y="0.635" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="15.2001" y="0" size="0.02" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-<symbols>
-<symbol name="J">
-<wire x1="-2.54" y1="0" x2="-1.27" y2="1.27" width="0.1524" layer="94"/>
-<wire x1="-1.27" y1="1.27" x2="1.27" y2="1.27" width="0.1524" layer="94"/>
-<wire x1="2.54" y1="0" x2="1.27" y2="1.27" width="0.1524" layer="94"/>
-<circle x="-2.54" y="0" radius="0.254" width="0.4064" layer="94"/>
-<circle x="2.54" y="0" radius="0.254" width="0.4064" layer="94"/>
-<text x="-2.54" y="1.905" size="1.778" layer="95">&gt;NAME</text>
-<text x="-2.54" y="-2.54" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="1" x="-5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1"/>
-<pin name="2" x="5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1" rot="R180"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="J" prefix="J">
-<description>Bridge</description>
-<gates>
-<gate name="1" symbol="J" x="0" y="0"/>
-</gates>
-<devices>
-<device name="5MM" package="05">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="7MM" package="07">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="10MM" package="10">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="12MM" package="12">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="15MM" package="15">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="20MM" package="20">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="25MM" package="25">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="30MM" package="30">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="adafruit">
 <packages>
 <package name="1206">
@@ -5151,7 +4973,7 @@ SRAM.</description>
 </class>
 </classes>
 <parts>
-<part name="U2" library="SparkFun" deviceset="USD-SOCKET" device="NEW"/>
+<part name="U2" library="SparkFun" deviceset="USD-SOCKET" device="USD"/>
 <part name="U$2" library="SparkFun" deviceset="XBEE-1" device="B3"/>
 <part name="C1" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
 <part name="C2" library="SparkFun" deviceset="CAP" device="0603-CAP" value="18pf"/>
@@ -5207,7 +5029,6 @@ SRAM.</description>
 <part name="GND8" library="supply1" deviceset="GND" device=""/>
 <part name="P+3" library="supply1" deviceset="+5V" device=""/>
 <part name="GND9" library="supply1" deviceset="GND" device=""/>
-<part name="J2" library="jumper" deviceset="J" device="5MM"/>
 <part name="L2" library="SparkFun" deviceset="INDUCTOR" device="0603" value="10uH"/>
 <part name="R4" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="1k"/>
 <part name="R5" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="2k"/>
@@ -5285,6 +5106,8 @@ SRAM.</description>
 <wire x1="190.5" y1="166.878" x2="190.5" y2="45.974" width="0.3048" layer="94"/>
 <wire x1="190.246" y1="166.878" x2="109.728" y2="166.878" width="0.3048" layer="94"/>
 <wire x1="190.5" y1="244.094" x2="190.5" y2="167.132" width="0.3048" layer="94"/>
+<text x="319.786" y="-8.128" size="2.286" layer="94" font="vector">Ethan Zonca</text>
+<text x="317.246" y="2.032" size="2.286" layer="94" font="vector">DRAFT</text>
 </plain>
 <instances>
 <instance part="U2" gate="G$1" x="83.82" y="83.82"/>
@@ -5342,7 +5165,6 @@ SRAM.</description>
 <instance part="GND8" gate="1" x="147.32" y="22.86"/>
 <instance part="P+3" gate="1" x="121.92" y="22.86"/>
 <instance part="GND9" gate="1" x="121.92" y="2.54"/>
-<instance part="J2" gate="1" x="154.94" y="0"/>
 <instance part="L2" gate="G$1" x="238.76" y="121.92"/>
 <instance part="R4" gate="G$1" x="330.2" y="160.02" smashed="yes" rot="R180">
 <attribute name="NAME" x="328.93" y="171.6786" size="1.778" layer="95"/>
@@ -5679,14 +5501,9 @@ SRAM.</description>
 </net>
 <net name="HX1_EN" class="0">
 <segment>
-<wire x1="144.78" y1="10.16" x2="142.24" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="10.16" x2="129.54" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="10.16" x2="142.24" y2="0" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="0" x2="149.86" y2="0" width="0.1524" layer="91"/>
-<junction x="142.24" y="10.16"/>
+<wire x1="144.78" y1="10.16" x2="129.54" y2="10.16" width="0.1524" layer="91"/>
 <label x="129.54" y="10.16" size="1.778" layer="95"/>
 <pinref part="IC2" gate="A" pin="I"/>
-<pinref part="J2" gate="1" pin="1"/>
 </segment>
 <segment>
 <pinref part="IC1" gate="G$1" pin="(PCINT1/ADC1)PA1"/>
@@ -5752,14 +5569,9 @@ SRAM.</description>
 <label x="124.46" y="200.66" size="1.778" layer="95"/>
 </segment>
 <segment>
-<wire x1="165.1" y1="10.16" x2="167.64" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="167.64" y1="10.16" x2="187.96" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="160.02" y1="0" x2="167.64" y2="0" width="0.1524" layer="91"/>
-<wire x1="167.64" y1="0" x2="167.64" y2="10.16" width="0.1524" layer="91"/>
-<junction x="167.64" y="10.16"/>
+<wire x1="165.1" y1="10.16" x2="187.96" y2="10.16" width="0.1524" layer="91"/>
 <label x="172.72" y="10.16" size="1.778" layer="95"/>
 <pinref part="IC2" gate="A" pin="O"/>
-<pinref part="J2" gate="1" pin="2"/>
 </segment>
 </net>
 <net name="N$3" class="0">