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>