diff --git a/master/eagle.epf b/master/eagle.epf
--- a/master/eagle.epf
+++ b/master/eagle.epf
@@ -1,5 +1,5 @@
 [Eagle]
-Version="06 02 00"
+Version="06 03 00"
 Platform="Windows"
 Serial="62191E841E-LSR-WLM-1EL"
 Globals="Globals"
@@ -337,13 +337,140 @@ UsedLibrary="C:/Program Files (x86)/EAGL
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.2.0/lbr/xilinx-xcv.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.2.0/lbr/zetex.lbr"
 UsedLibrary="C:/Program Files (x86)/EAGLE-6.2.0/lbr/zilog.lbr"
+UsedLibrary="C:/Users/ethanzonca/Desktop/seniordesign-hardware/lbr/SLAT-CON-JST-ZH.lbr"
+UsedLibrary="C:/Users/ethanzonca/Desktop/seniordesign-hardware/lbr/SLAT-Connector SMD.lbr"
+UsedLibrary="C:/Users/ethanzonca/Desktop/seniordesign-hardware/lbr/SLAT-Connector TH.lbr"
+UsedLibrary="C:/Users/ethanzonca/Desktop/seniordesign-hardware/lbr/SeniorDesign.lbr"
 
 [Win_1]
+Type="Library Editor"
+Loc="204 165 699 894"
+State=0
+Number=3
+File="C:/Users/ethanzonca/Desktop/seniordesign-hardware/lbr/SeniorDesign.lbr"
+View="-48.865 -83.6462 21.4311 -41.3468"
+WireWidths=" 0 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.254 0.127"
+PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
+ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.27"
+PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
+PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
+SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635 1.27 0.6604"
+WireBend=0
+WireBendSet=0
+WireCap=1
+MiterStyle=0
+PadShape=0
+ViaShape=0
+PolygonPour=0
+PolygonRank=0
+PolygonThermals=1
+PolygonOrphans=0
+TextRatio=8
+PinDirection=3
+PinFunction=0
+PinLength=2
+PinVisible=3
+SwapLevel=0
+ArcDirection=0
+AddLevel=2
+PadsSameType=0
+Layer=94
+Device="IFX91041EJ"
+
+[Win_2]
+Type="Schematic Editor"
+Loc="204 165 803 564"
+State=3
+Number=2
+File="master.sch"
+View="28.6357 23.1424 123.368 77.9733"
+WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
+PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
+ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
+PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
+PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
+SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
+WireBend=0
+WireBendSet=31
+WireCap=1
+MiterStyle=0
+PadShape=0
+ViaShape=0
+PolygonPour=0
+PolygonRank=0
+PolygonThermals=1
+PolygonOrphans=0
+TextRatio=8
+PinDirection=3
+PinFunction=0
+PinLength=2
+PinVisible=3
+SwapLevel=0
+ArcDirection=0
+AddLevel=2
+PadsSameType=0
+Layer=91
+Views=" 1: 28.6357 23.1424 123.368 77.9733"
+Sheet=1
+
+[Win_3]
+Type="Board Editor"
+Loc="204 165 803 564"
+State=3
+Number=1
+File="master.brd"
+View="-4.07643 -3.46392 104.494 70.1927"
+WireWidths=" 0 0.254 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064"
+PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
+ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
+PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
+PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
+SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
+WireBend=0
+WireBendSet=0
+WireCap=1
+MiterStyle=0
+PadShape=0
+ViaShape=0
+PolygonPour=0
+PolygonRank=1
+PolygonThermals=1
+PolygonOrphans=0
+TextRatio=8
+PinDirection=3
+PinFunction=0
+PinLength=2
+PinVisible=3
+SwapLevel=0
+ArcDirection=0
+AddLevel=2
+PadsSameType=0
+Layer=16
+
+[Win_4]
 Type="Control Panel"
 Loc="203 75 899 661"
-State=2
+State=1
 Number=0
 
 [Desktop]
 Screen="1024 768"
 Window="Win_1"
+Window="Win_2"
+Window="Win_3"
+Window="Win_4"
diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -373,6 +373,14 @@ Source: RS Components</description>
 <rectangle x1="-0.65" y1="-0.7" x2="-0.15" y2="-0.5" layer="51"/>
 <rectangle x1="-1.5" y1="-0.7" x2="-0.95" y2="-0.5" layer="51"/>
 </package>
+<package name="0805">
+<wire x1="-0.3" y1="0.6" x2="0.3" y2="0.6" width="0.1524" layer="21"/>
+<wire x1="-0.3" y1="-0.6" x2="0.3" y2="-0.6" width="0.1524" layer="21"/>
+<smd name="1" x="-0.9" y="0" dx="0.8" dy="1.2" layer="1"/>
+<smd name="2" x="0.9" y="0" dx="0.8" dy="1.2" layer="1"/>
+<text x="-0.762" y="0.8255" size="0.4064" layer="25">&gt;NAME</text>
+<text x="-1.016" y="-1.397" size="0.4064" layer="27">&gt;VALUE</text>
+</package>
 </packages>
 </library>
 <library name="atmel">
@@ -751,31 +759,6 @@ www.irf.com&lt;p&gt;
 </package>
 </packages>
 </library>
-<library name="NEO">
-<packages>
-<package name="SOT223">
-<description>&lt;b&gt;SOT-223&lt;/b&gt;</description>
-<wire x1="3.2766" y1="1.651" x2="3.2766" y2="-1.651" width="0.2032" layer="21"/>
-<wire x1="3.2766" y1="-1.651" x2="-3.2766" y2="-1.651" width="0.2032" layer="21"/>
-<wire x1="-3.2766" y1="-1.651" x2="-3.2766" y2="1.651" width="0.2032" layer="21"/>
-<wire x1="-3.2766" y1="1.651" x2="3.2766" y2="1.651" width="0.2032" layer="21"/>
-<smd name="1" x="-2.3114" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="2" x="0" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="3" x="2.3114" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="4" x="0" y="3.099" dx="3.6" dy="2.2" layer="1"/>
-<text x="-0.8255" y="4.5085" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-1.0795" y="-0.1905" size="0.4064" layer="27">&gt;VALUE</text>
-<rectangle x1="-1.6002" y1="1.8034" x2="1.6002" y2="3.6576" layer="51"/>
-<rectangle x1="-0.4318" y1="-3.6576" x2="0.4318" y2="-1.8034" layer="51"/>
-<rectangle x1="-2.7432" y1="-3.6576" x2="-1.8796" y2="-1.8034" layer="51"/>
-<rectangle x1="1.8796" y1="-3.6576" x2="2.7432" y2="-1.8034" layer="51"/>
-<rectangle x1="-1.6002" y1="1.8034" x2="1.6002" y2="3.6576" layer="51"/>
-<rectangle x1="-0.4318" y1="-3.6576" x2="0.4318" y2="-1.8034" layer="51"/>
-<rectangle x1="-2.7432" y1="-3.6576" x2="-1.8796" y2="-1.8034" layer="51"/>
-<rectangle x1="1.8796" y1="-3.6576" x2="2.7432" y2="-1.8034" layer="51"/>
-</package>
-</packages>
-</library>
 <library name="SeniorDesign">
 <packages>
 <package name="SOT23-5">
@@ -801,6 +784,34 @@ www.irf.com&lt;p&gt;
 <rectangle x1="-0.16" y1="-1.42" x2="0.17" y2="-0.67" layer="51"/>
 <rectangle x1="0.79" y1="-1.42" x2="1.12" y2="-0.67" layer="51"/>
 </package>
+<package name="SOIC8HEAT">
+<wire x1="2.4" y1="1.9" x2="2.4" y2="-1.4" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.4" x2="2.4" y2="-1.9" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.9" x2="-2.4" y2="-1.9" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="-1.9" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="-1.4" x2="-2.4" y2="1.9" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="1.9" x2="2.4" y2="1.9" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.4" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
+<smd name="2" x="-0.635" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="7" x="-0.635" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="1" x="-1.905" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="3" x="0.635" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="4" x="1.905" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="8" x="-1.905" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="6" x="0.635" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="5" x="1.905" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<text x="-3.175" y="-1.905" size="1.27" layer="25" rot="R90">&gt;NAME</text>
+<text x="4.445" y="-1.905" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
+<rectangle x1="-2.1501" y1="-3.1001" x2="-1.6599" y2="-2" layer="51"/>
+<rectangle x1="-0.8801" y1="-3.1001" x2="-0.3899" y2="-2" layer="51"/>
+<rectangle x1="0.3899" y1="-3.1001" x2="0.8801" y2="-2" layer="51"/>
+<rectangle x1="1.6599" y1="-3.1001" x2="2.1501" y2="-2" layer="51"/>
+<rectangle x1="1.6599" y1="2" x2="2.1501" y2="3.1001" layer="51"/>
+<rectangle x1="0.3899" y1="2" x2="0.8801" y2="3.1001" layer="51"/>
+<rectangle x1="-0.8801" y1="2" x2="-0.3899" y2="3.1001" layer="51"/>
+<rectangle x1="-2.1501" y1="2" x2="-1.6599" y2="3.1001" layer="51"/>
+<smd name="9" x="0" y="0" dx="2.54" dy="1.27" layer="1"/>
+</package>
 </packages>
 </library>
 </libraries>
@@ -1066,9 +1077,11 @@ design rules under a new name.</descript
 <element name="BUZZ" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="53.34" y="3.81" rot="R180"/>
 <element name="R22" library="SparkFun" package="0603-RES" value="10k" x="66.04" y="1.27" rot="R90"/>
 <element name="Q6" library="transistor-small-signal" package="SOT23" value="BSH202" x="99.06" y="6.35"/>
-<element name="U4" library="NEO" package="SOT223" value="LINEAR_REG" x="92.71" y="8.89"/>
 <element name="JTAG" library="SLAT-CON-JST-ZH" package="ZH-V-4-1" value="ZH-V-4-1" x="59.69" y="8.89" rot="R90"/>
-<element name="U$7" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="76.2" y="43.18"/>
+<element name="U$7" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="72.39" y="36.83"/>
+<element name="5V_SWITCHING" library="SeniorDesign" package="SOIC8HEAT" value="IFX91041EJ" x="3.81" y="-8.89"/>
+<element name="C10" library="SparkFun" package="0805" value="10uF" x="-2.54" y="-10.16"/>
+<element name="C12" library="SparkFun" package="0805" value="100uF" x="-6.35" y="-10.16"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1121,12 +1134,17 @@ design rules under a new name.</descript
 <contactref element="M2" pad="0V"/>
 <contactref element="C13" pad="1"/>
 <contactref element="BUZZ" pad="1"/>
-<contactref element="Q6" pad="1"/>
 <contactref element="BATT" pad="2"/>
 <contactref element="U$7" pad="2"/>
+<contactref element="5V_SWITCHING" pad="9"/>
+<contactref element="5V_SWITCHING" pad="2"/>
+<contactref element="C10" pad="2"/>
+<contactref element="Q6" pad="1"/>
+<contactref element="C12" pad="2"/>
+<contactref element="5V_SWITCHING" pad="1"/>
 <wire x1="85.09" y1="54.19" x2="85.09" y2="56.3" width="0" layer="19" extent="1-1"/>
-<wire x1="76.2" y1="41.89" x2="85.09" y2="54.19" width="0" layer="19" extent="1-1"/>
-<wire x1="73.24" y1="25.4" x2="76.2" y2="41.89" width="0" layer="19" extent="1-1"/>
+<wire x1="72.39" y1="35.54" x2="85.09" y2="54.19" width="0" layer="19" extent="1-1"/>
+<wire x1="73.24" y1="25.4" x2="72.39" y2="35.54" width="0" layer="19" extent="1-1"/>
 <wire x1="73.24" y1="22.86" x2="73.24" y2="25.4" width="0" layer="19" extent="1-1"/>
 <wire x1="71.54" y1="17.78" x2="73.24" y2="22.86" width="0" layer="19" extent="1-1"/>
 <wire x1="71.54" y1="15.24" x2="71.54" y2="17.78" width="0" layer="19" extent="1-1"/>
@@ -1165,12 +1183,17 @@ design rules under a new name.</descript
 <wire x1="10.365" y1="9.6" x2="13.39" y2="9.45" width="0" layer="19" extent="16-16"/>
 <wire x1="4.66" y1="10.16" x2="10.365" y2="9.6" width="0" layer="19" extent="1-16"/>
 <wire x1="4.66" y1="7.62" x2="4.66" y2="10.16" width="0" layer="19" extent="1-1"/>
-<wire x1="57.785" y1="33.655" x2="48.26" y2="22.31" width="0" layer="19" extent="1-16"/>
+<wire x1="57.785" y1="33.655" x2="72.39" y2="35.54" width="0" layer="19" extent="1-16"/>
 <wire x1="42.66" y1="63.5" x2="27.09" y2="60.96" width="0" layer="19" extent="1-1"/>
 <wire x1="46.47" y1="63.5" x2="42.66" y2="63.5" width="0" layer="19" extent="1-1"/>
 <wire x1="50.28" y1="63.5" x2="46.47" y2="63.5" width="0" layer="19" extent="1-1"/>
 <wire x1="54.09" y1="63.5" x2="50.28" y2="63.5" width="0" layer="19" extent="1-1"/>
 <wire x1="46.99" y1="50.8" x2="46.47" y2="63.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.81" y1="-8.89" x2="4.66" y2="7.62" width="0" layer="19" extent="1-1"/>
+<wire x1="3.175" y1="-11.49" x2="3.81" y2="-8.89" width="0" layer="19" extent="1-1"/>
+<wire x1="1.905" y1="-11.49" x2="3.175" y2="-11.49" width="0" layer="19" extent="1-1"/>
+<wire x1="-1.64" y1="-10.16" x2="1.905" y2="-11.49" width="0" layer="19" extent="1-1"/>
+<wire x1="-5.45" y1="-10.16" x2="-1.64" y2="-10.16" width="0" layer="19" extent="1-1"/>
 <wire x1="98.11" y1="5.25" x2="71.54" y2="7.62" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
@@ -1191,14 +1214,14 @@ design rules under a new name.</descript
 <contactref element="IC1" pad="20"/>
 <contactref element="R11" pad="2"/>
 <contactref element="U$7" pad="5"/>
-<wire x1="73.24" y1="27.94" x2="75.25" y2="44.48" width="0" layer="19" extent="1-1"/>
+<wire x1="73.24" y1="27.94" x2="71.44" y2="38.13" width="0" layer="19" extent="1-1"/>
 <wire x1="50.66" y1="10.71" x2="73.24" y2="27.94" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCL">
 <contactref element="IC1" pad="19"/>
 <contactref element="R10" pad="1"/>
 <contactref element="U$7" pad="4"/>
-<wire x1="71.54" y1="30.48" x2="77.15" y2="44.48" width="0" layer="19" extent="1-1"/>
+<wire x1="71.54" y1="30.48" x2="73.34" y2="38.13" width="0" layer="19" extent="1-1"/>
 <wire x1="49.86" y1="10.71" x2="71.54" y2="30.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCK">
@@ -1309,7 +1332,7 @@ design rules under a new name.</descript
 <contactref element="C11" pad="1"/>
 <contactref element="R17" pad="2"/>
 <contactref element="U$7" pad="1"/>
-<wire x1="73.24" y1="30.48" x2="75.25" y2="41.89" width="0" layer="19" extent="1-1"/>
+<wire x1="73.24" y1="30.48" x2="71.44" y2="35.54" width="0" layer="19" extent="1-1"/>
 <wire x1="71.54" y1="27.94" x2="73.24" y2="30.48" width="0" layer="19" extent="1-1"/>
 <wire x1="71.54" y1="25.4" x2="71.54" y2="27.94" width="0" layer="19" extent="1-1"/>
 <wire x1="71.54" y1="22.86" x2="71.54" y2="25.4" width="0" layer="19" extent="1-1"/>
@@ -1345,11 +1368,13 @@ design rules under a new name.</descript
 <contactref element="Q4" pad="E"/>
 <contactref element="M2" pad="VCC"/>
 <contactref element="C13" pad="2"/>
+<contactref element="5V_SWITCHING" pad="4"/>
 <wire x1="75.88" y1="56.05" x2="79.69" y2="56.05" width="0" layer="19" extent="1-1"/>
 <wire x1="72.07" y1="56.05" x2="75.88" y2="56.05" width="0" layer="19" extent="1-1"/>
 <wire x1="68.26" y1="56.05" x2="72.07" y2="56.05" width="0" layer="19" extent="1-1"/>
 <wire x1="44.45" y1="50.8" x2="68.26" y2="56.05" width="0" layer="19" extent="1-1"/>
 <wire x1="28.79" y1="60.96" x2="44.45" y2="50.8" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="-11.49" x2="44.45" y2="50.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HX1_TXD_5V">
 <contactref element="M2" pad="TXD"/>
@@ -1522,8 +1547,15 @@ design rules under a new name.</descript
 </signal>
 <signal name="VBAT">
 <contactref element="Q6" pad="2"/>
-<contactref element="U4" pad="1"/>
-<wire x1="90.3986" y1="5.7912" x2="100.01" y2="5.25" width="0" layer="19" extent="1-1"/>
+<contactref element="5V_SWITCHING" pad="8"/>
+<contactref element="C12" pad="1"/>
+<wire x1="1.905" y1="-6.29" x2="100.01" y2="5.25" width="0" layer="19" extent="1-1"/>
+<wire x1="-7.25" y1="-10.16" x2="1.905" y2="-6.29" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$4">
+<contactref element="5V_SWITCHING" pad="7"/>
+<contactref element="C10" pad="1"/>
+<wire x1="3.175" y1="-6.29" x2="-3.44" y2="-10.16" width="0" layer="19" extent="1-1"/>
 </signal>
 </signals>
 </board>
diff --git a/master/master.sch b/master/master.sch
--- a/master/master.sch
+++ b/master/master.sch
@@ -5001,69 +5001,6 @@ Source: http://www.osram.convergy.de/</d
 </deviceset>
 </devicesets>
 </library>
-<library name="NEO">
-<packages>
-<package name="SOT223">
-<description>&lt;b&gt;SOT-223&lt;/b&gt;</description>
-<wire x1="3.2766" y1="1.651" x2="3.2766" y2="-1.651" width="0.2032" layer="21"/>
-<wire x1="3.2766" y1="-1.651" x2="-3.2766" y2="-1.651" width="0.2032" layer="21"/>
-<wire x1="-3.2766" y1="-1.651" x2="-3.2766" y2="1.651" width="0.2032" layer="21"/>
-<wire x1="-3.2766" y1="1.651" x2="3.2766" y2="1.651" width="0.2032" layer="21"/>
-<smd name="1" x="-2.3114" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="2" x="0" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="3" x="2.3114" y="-3.0988" dx="1.2192" dy="2.2352" layer="1"/>
-<smd name="4" x="0" y="3.099" dx="3.6" dy="2.2" layer="1"/>
-<text x="-0.8255" y="4.5085" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-1.0795" y="-0.1905" size="0.4064" layer="27">&gt;VALUE</text>
-<rectangle x1="-1.6002" y1="1.8034" x2="1.6002" y2="3.6576" layer="51"/>
-<rectangle x1="-0.4318" y1="-3.6576" x2="0.4318" y2="-1.8034" layer="51"/>
-<rectangle x1="-2.7432" y1="-3.6576" x2="-1.8796" y2="-1.8034" layer="51"/>
-<rectangle x1="1.8796" y1="-3.6576" x2="2.7432" y2="-1.8034" layer="51"/>
-<rectangle x1="-1.6002" y1="1.8034" x2="1.6002" y2="3.6576" layer="51"/>
-<rectangle x1="-0.4318" y1="-3.6576" x2="0.4318" y2="-1.8034" layer="51"/>
-<rectangle x1="-2.7432" y1="-3.6576" x2="-1.8796" y2="-1.8034" layer="51"/>
-<rectangle x1="1.8796" y1="-3.6576" x2="2.7432" y2="-1.8034" layer="51"/>
-</package>
-</packages>
-<symbols>
-<symbol name="LINEAR_REG_5V-0.5A">
-<wire x1="-7.62" y1="2.54" x2="7.62" y2="2.54" width="0.254" layer="94"/>
-<wire x1="7.62" y1="2.54" x2="7.62" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="7.62" y1="-5.08" x2="-7.62" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="-7.62" y1="-5.08" x2="-7.62" y2="2.54" width="0.254" layer="94"/>
-<pin name="IN" x="-10.16" y="0" length="short"/>
-<pin name="GND" x="-2.54" y="-7.62" visible="pad" length="short" rot="R90"/>
-<pin name="COMMON" x="2.54" y="-7.62" visible="pad" length="short" rot="R90"/>
-<pin name="OUT" x="10.16" y="0" length="short" rot="R180"/>
-<text x="-2.54" y="-3.81" size="1.4224" layer="97">GND</text>
-<text x="-5.08" y="5.842" size="1.778" layer="95">&gt;Name</text>
-<text x="-5.08" y="3.302" size="1.778" layer="96">&gt;Value</text>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="LINEAR_REG">
-<description>&lt;b&gt;Linear Regulators - Standard 5V 500mA&lt;/b&gt;
-Fixed Pos Voltage Regulator. Texas Instruments. Manufacturer Part #: 	
-UA78M05IDCYR</description>
-<gates>
-<gate name="G$1" symbol="LINEAR_REG_5V-0.5A" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="SOT223">
-<connects>
-<connect gate="G$1" pin="COMMON" pad="4"/>
-<connect gate="G$1" pin="GND" pad="2"/>
-<connect gate="G$1" pin="IN" pad="1"/>
-<connect gate="G$1" pin="OUT" pad="3"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="transistor-small-signal">
 <description>&lt;b&gt;Small Signal Transistors&lt;/b&gt;&lt;p&gt;
 Packages from :&lt;br&gt;
@@ -5176,6 +5113,34 @@ www.irf.com&lt;p&gt;
 <rectangle x1="-0.16" y1="-1.42" x2="0.17" y2="-0.67" layer="51"/>
 <rectangle x1="0.79" y1="-1.42" x2="1.12" y2="-0.67" layer="51"/>
 </package>
+<package name="SOIC8HEAT">
+<wire x1="2.4" y1="1.9" x2="2.4" y2="-1.4" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.4" x2="2.4" y2="-1.9" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.9" x2="-2.4" y2="-1.9" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="-1.9" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="-1.4" x2="-2.4" y2="1.9" width="0.2032" layer="51"/>
+<wire x1="-2.4" y1="1.9" x2="2.4" y2="1.9" width="0.2032" layer="51"/>
+<wire x1="2.4" y1="-1.4" x2="-2.4" y2="-1.4" width="0.2032" layer="51"/>
+<smd name="2" x="-0.635" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="7" x="-0.635" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="1" x="-1.905" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="3" x="0.635" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="4" x="1.905" y="-2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="8" x="-1.905" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="6" x="0.635" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<smd name="5" x="1.905" y="2.6" dx="0.6" dy="2.2" layer="1"/>
+<text x="-3.175" y="-1.905" size="1.27" layer="25" rot="R90">&gt;NAME</text>
+<text x="4.445" y="-1.905" size="1.27" layer="27" rot="R90">&gt;VALUE</text>
+<rectangle x1="-2.1501" y1="-3.1001" x2="-1.6599" y2="-2" layer="51"/>
+<rectangle x1="-0.8801" y1="-3.1001" x2="-0.3899" y2="-2" layer="51"/>
+<rectangle x1="0.3899" y1="-3.1001" x2="0.8801" y2="-2" layer="51"/>
+<rectangle x1="1.6599" y1="-3.1001" x2="2.1501" y2="-2" layer="51"/>
+<rectangle x1="1.6599" y1="2" x2="2.1501" y2="3.1001" layer="51"/>
+<rectangle x1="0.3899" y1="2" x2="0.8801" y2="3.1001" layer="51"/>
+<rectangle x1="-0.8801" y1="2" x2="-0.3899" y2="3.1001" layer="51"/>
+<rectangle x1="-2.1501" y1="2" x2="-1.6599" y2="3.1001" layer="51"/>
+<smd name="9" x="0" y="0" dx="2.54" dy="1.27" layer="1"/>
+</package>
 </packages>
 <symbols>
 <symbol name="MCP9800">
@@ -5191,6 +5156,22 @@ www.irf.com&lt;p&gt;
 <text x="-5.08" y="10.16" size="1.27" layer="95" rot="MR180">&gt;NAME</text>
 <text x="-5.08" y="-7.62" size="1.27" layer="96">&gt;VALUE</text>
 </symbol>
+<symbol name="IFX91041EJ">
+<wire x1="-10.16" y1="7.62" x2="-10.16" y2="-7.62" width="0.254" layer="94"/>
+<wire x1="-10.16" y1="-7.62" x2="10.16" y2="-7.62" width="0.254" layer="94"/>
+<wire x1="10.16" y1="-7.62" x2="10.16" y2="7.62" width="0.254" layer="94"/>
+<wire x1="10.16" y1="7.62" x2="-10.16" y2="7.62" width="0.254" layer="94"/>
+<pin name="SYNC" x="-15.24" y="5.08" length="middle"/>
+<pin name="VS" x="-15.24" y="2.54" length="middle"/>
+<pin name="EN" x="-15.24" y="0" length="middle"/>
+<pin name="GND" x="-15.24" y="-5.08" length="middle"/>
+<pin name="BDS" x="15.24" y="5.08" length="middle" rot="R180"/>
+<pin name="BUO" x="15.24" y="2.54" length="middle" rot="R180"/>
+<pin name="FB" x="15.24" y="0" length="middle" rot="R180"/>
+<pin name="COMP" x="15.24" y="-5.08" length="middle" rot="R180"/>
+<text x="-10.16" y="10.16" size="1.778" layer="95" rot="MR180">&gt;NAME</text>
+<text x="-10.16" y="-10.16" size="1.778" layer="96">&gt;VALUE</text>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="MCP9800">
@@ -5212,6 +5193,28 @@ www.irf.com&lt;p&gt;
 </device>
 </devices>
 </deviceset>
+<deviceset name="IFX91041EJ">
+<gates>
+<gate name="G$1" symbol="IFX91041EJ" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="SOIC8HEAT">
+<connects>
+<connect gate="G$1" pin="BDS" pad="5"/>
+<connect gate="G$1" pin="BUO" pad="6"/>
+<connect gate="G$1" pin="COMP" pad="3"/>
+<connect gate="G$1" pin="EN" pad="7"/>
+<connect gate="G$1" pin="FB" pad="4"/>
+<connect gate="G$1" pin="GND" pad="2 9"/>
+<connect gate="G$1" pin="SYNC" pad="1"/>
+<connect gate="G$1" pin="VS" pad="8"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 </libraries>
@@ -5326,13 +5329,17 @@ www.irf.com&lt;p&gt;
 <part name="R22" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10k"/>
 <part name="GND22" library="SparkFun" deviceset="GND" device=""/>
 <part name="Q6" library="transistor-small-signal" deviceset="BSS84" device="" value="BSH202"/>
-<part name="U4" library="NEO" deviceset="LINEAR_REG" device=""/>
-<part name="P+7" library="supply1" deviceset="+5V" device=""/>
 <part name="GND5" library="SparkFun" deviceset="GND" device=""/>
 <part name="JTAG" library="SLAT-CON-JST-ZH" deviceset="ZH-V-4-1" device=""/>
 <part name="U$7" library="SeniorDesign" deviceset="MCP9800" device=""/>
 <part name="P+10" library="SparkFun" deviceset="3.3V" device=""/>
 <part name="GND21" library="supply1" deviceset="GND" device=""/>
+<part name="5V_SWITCHING" library="SeniorDesign" deviceset="IFX91041EJ" device=""/>
+<part name="GND23" library="SparkFun" deviceset="GND" device=""/>
+<part name="C10" library="SparkFun" deviceset="CAP" device="0805" value="10uF"/>
+<part name="C12" library="SparkFun" deviceset="CAP" device="0805" value="100uF"/>
+<part name="GND24" library="SparkFun" deviceset="GND" device=""/>
+<part name="U$8" library="SparkFun" deviceset="5V" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -5403,7 +5410,8 @@ are free for leds</text>
 <text x="347.218" y="111.76" size="1.778" layer="94">Radio Output</text>
 <text x="15.24" y="81.28" size="1.778" layer="91">CLOSE TO CARD</text>
 <text x="45.72" y="157.48" size="6.4516" layer="91" ratio="19">TODO</text>
-<text x="53.34" y="35.56" size="6.4516" layer="91" ratio="19">TODO</text>
+<text x="294.64" y="236.22" size="6.4516" layer="91" ratio="19">TODO</text>
+<text x="76.2" y="40.64" size="1.778" layer="91">IN PROGRESS</text>
 </plain>
 <instances>
 <instance part="U2" gate="G$1" x="96.52" y="96.52"/>
@@ -5430,7 +5438,7 @@ are free for leds</text>
 <instance part="C17" gate="G$1" x="208.28" y="111.76"/>
 <instance part="L1" gate="G$1" x="40.64" y="154.94"/>
 <instance part="FRAME2" gate="G$1" x="0" y="0"/>
-<instance part="P+6" gate="G$1" x="91.44" y="45.72"/>
+<instance part="P+6" gate="G$1" x="104.14" y="45.72"/>
 <instance part="ICSP" gate="G$1" x="355.6" y="243.84"/>
 <instance part="M2" gate="G$1" x="165.1" y="215.9" rot="R270"/>
 <instance part="GND7" gate="1" x="134.62" y="193.04"/>
@@ -5543,18 +5551,28 @@ are free for leds</text>
 <instance part="R19" gate="G$1" x="231.14" y="236.22" rot="R270"/>
 <instance part="R20" gate="G$1" x="248.92" y="236.22" rot="R270"/>
 <instance part="R21" gate="G$1" x="266.7" y="236.22" rot="R270"/>
-<instance part="BATT" gate="G$1" x="15.24" y="12.7"/>
+<instance part="BATT" gate="G$1" x="10.16" y="12.7"/>
 <instance part="BUZZ" gate="G$1" x="320.04" y="243.84" rot="R180"/>
 <instance part="R22" gate="G$1" x="294.64" y="236.22"/>
-<instance part="GND22" gate="1" x="22.86" y="27.94"/>
-<instance part="Q6" gate="G$1" x="30.48" y="30.48"/>
-<instance part="U4" gate="G$1" x="63.5" y="40.64"/>
-<instance part="P+7" gate="1" x="83.82" y="48.26"/>
-<instance part="GND5" gate="1" x="30.48" y="7.62"/>
+<instance part="GND22" gate="1" x="7.62" y="25.4"/>
+<instance part="Q6" gate="G$1" x="17.78" y="27.94"/>
+<instance part="GND5" gate="1" x="20.32" y="7.62"/>
 <instance part="JTAG" gate="G$1" x="358.14" y="220.98" rot="R180"/>
 <instance part="U$7" gate="G$1" x="147.32" y="142.24"/>
 <instance part="P+10" gate="G$1" x="134.62" y="147.32"/>
 <instance part="GND21" gate="1" x="134.62" y="142.24"/>
+<instance part="5V_SWITCHING" gate="G$1" x="58.42" y="48.26"/>
+<instance part="GND23" gate="1" x="40.64" y="30.48"/>
+<instance part="C10" gate="G$1" x="35.56" y="40.64" smashed="yes">
+<attribute name="NAME" x="29.464" y="43.561" size="1.778" layer="95"/>
+<attribute name="VALUE" x="29.464" y="38.481" size="1.778" layer="96"/>
+</instance>
+<instance part="C12" gate="G$1" x="25.4" y="40.64" smashed="yes">
+<attribute name="NAME" x="19.304" y="43.561" size="1.778" layer="95"/>
+<attribute name="VALUE" x="19.304" y="38.481" size="1.778" layer="96"/>
+</instance>
+<instance part="GND24" gate="1" x="12.7" y="48.26"/>
+<instance part="U$8" gate="G$1" x="88.9" y="50.8"/>
 </instances>
 <busses>
 </busses>
@@ -5745,22 +5763,43 @@ are free for leds</text>
 <wire x1="134.62" y1="198.12" x2="134.62" y2="195.58" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="GND22" gate="1" pin="GND"/>
-<pinref part="Q6" gate="G$1" pin="G"/>
-<wire x1="22.86" y1="33.02" x2="22.86" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="25.4" y1="33.02" x2="22.86" y2="33.02" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="BATT" gate="G$1" pin="2"/>
 <pinref part="GND5" gate="1" pin="GND"/>
-<wire x1="20.32" y1="12.7" x2="30.48" y2="12.7" width="0.1524" layer="91"/>
-<wire x1="30.48" y1="12.7" x2="30.48" y2="10.16" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="12.7" x2="20.32" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="12.7" x2="20.32" y2="10.16" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$7" gate="G$1" pin="GND"/>
 <pinref part="GND21" gate="1" pin="GND"/>
 <wire x1="134.62" y1="144.78" x2="137.16" y2="144.78" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="5V_SWITCHING" gate="G$1" pin="GND"/>
+<wire x1="43.18" y1="43.18" x2="40.64" y2="43.18" width="0.1524" layer="91"/>
+<pinref part="GND23" gate="1" pin="GND"/>
+<wire x1="40.64" y1="43.18" x2="40.64" y2="35.56" width="0.1524" layer="91"/>
+<pinref part="C10" gate="G$1" pin="2"/>
+<wire x1="40.64" y1="35.56" x2="40.64" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="35.56" y1="38.1" x2="35.56" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="35.56" y1="35.56" x2="40.64" y2="35.56" width="0.1524" layer="91"/>
+<junction x="40.64" y="35.56"/>
+<pinref part="C12" gate="G$1" pin="2"/>
+<wire x1="25.4" y1="38.1" x2="25.4" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="25.4" y1="35.56" x2="35.56" y2="35.56" width="0.1524" layer="91"/>
+<junction x="35.56" y="35.56"/>
+</segment>
+<segment>
+<pinref part="Q6" gate="G$1" pin="G"/>
+<wire x1="12.7" y1="30.48" x2="7.62" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="GND22" gate="1" pin="GND"/>
+<wire x1="7.62" y1="30.48" x2="7.62" y2="27.94" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="5V_SWITCHING" gate="G$1" pin="SYNC"/>
+<wire x1="43.18" y1="53.34" x2="12.7" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="12.7" y1="53.34" x2="12.7" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="GND24" gate="1" pin="GND"/>
+</segment>
 </net>
 <net name="N$1" class="0">
 <segment>
@@ -6154,6 +6193,12 @@ are free for leds</text>
 <wire x1="134.62" y1="210.82" x2="134.62" y2="213.36" width="0.1524" layer="91"/>
 <pinref part="U$1" gate="G$1" pin="5V"/>
 </segment>
+<segment>
+<pinref part="5V_SWITCHING" gate="G$1" pin="FB"/>
+<wire x1="73.66" y1="48.26" x2="88.9" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="U$8" gate="G$1" pin="5V"/>
+<wire x1="88.9" y1="48.26" x2="88.9" y2="50.8" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="HX1_TXD_5V" class="0">
 <segment>
@@ -6441,18 +6486,30 @@ are free for leds</text>
 <net name="VBATRAW" class="1">
 <segment>
 <pinref part="Q6" gate="G$1" pin="D"/>
-<wire x1="30.48" y1="25.4" x2="30.48" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="22.86" x2="17.78" y2="15.24" width="0.1524" layer="91"/>
 <pinref part="BATT" gate="G$1" pin="1"/>
-<wire x1="20.32" y1="15.24" x2="30.48" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="15.24" x2="17.78" y2="15.24" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="VBAT" class="0">
 <segment>
 <pinref part="Q6" gate="G$1" pin="S"/>
-<wire x1="30.48" y1="35.56" x2="30.48" y2="40.64" width="0.1524" layer="91"/>
-<wire x1="30.48" y1="40.64" x2="53.34" y2="40.64" width="0.1524" layer="91"/>
-<label x="38.1" y="40.64" size="1.778" layer="95"/>
-<pinref part="U4" gate="G$1" pin="IN"/>
+<wire x1="17.78" y1="33.02" x2="17.78" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="5V_SWITCHING" gate="G$1" pin="VS"/>
+<wire x1="17.78" y1="50.8" x2="25.4" y2="50.8" width="0.1524" layer="91"/>
+<label x="20.32" y="50.8" size="1.778" layer="95"/>
+<pinref part="C12" gate="G$1" pin="1"/>
+<wire x1="25.4" y1="50.8" x2="43.18" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="25.4" y1="45.72" x2="25.4" y2="50.8" width="0.1524" layer="91"/>
+<junction x="25.4" y="50.8"/>
+</segment>
+</net>
+<net name="N$4" class="0">
+<segment>
+<pinref part="5V_SWITCHING" gate="G$1" pin="EN"/>
+<wire x1="43.18" y1="48.26" x2="35.56" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="C10" gate="G$1" pin="1"/>
+<wire x1="35.56" y1="48.26" x2="35.56" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 </net>
 </nets>