diff --git a/therm.sch b/therm.sch
--- a/therm.sch
+++ b/therm.sch
@@ -4272,6 +4272,10 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="15.24" y="68.58" size="2.54" layer="113">Indication</text>
 <text x="139.7" y="33.02" size="2.54" layer="113">Buttons</text>
 <text x="182.88" y="162.56" size="2.54" layer="113">TC Amp</text>
+<text x="-68.58" y="172.72" size="1.778" layer="91">TODO:
+  - Convert to 4 layers
+  - Re-add power screw terminal? If room.
+ </text>
 </plain>
 <instances>
 <instance part="SUP3" gate="G$1" x="48.26" y="15.24"/>
@@ -4689,8 +4693,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="129.54" y="22.86" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="106.68" y1="142.24" x2="104.14" y2="142.24" width="0.1524" layer="91"/>
-<label x="106.68" y="142.24" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="149.86" x2="93.98" y2="149.86" width="0.1524" layer="91"/>
+<label x="96.52" y="149.86" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PA4"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
@@ -4700,8 +4705,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="129.54" y="17.78" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="106.68" y1="137.16" x2="104.14" y2="137.16" width="0.1524" layer="91"/>
-<label x="106.68" y="137.16" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="142.24" x2="93.98" y2="142.24" width="0.1524" layer="91"/>
+<label x="96.52" y="142.24" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PA7"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
@@ -4711,8 +4717,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="162.56" y="22.86" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="106.68" y1="147.32" x2="104.14" y2="147.32" width="0.1524" layer="91"/>
-<label x="106.68" y="147.32" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="147.32" x2="93.98" y2="147.32" width="0.1524" layer="91"/>
+<label x="96.52" y="147.32" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PA5"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
@@ -4722,8 +4729,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="162.56" y="17.78" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="106.68" y1="144.78" x2="104.14" y2="144.78" width="0.1524" layer="91"/>
-<label x="106.68" y="144.78" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="144.78" x2="93.98" y2="144.78" width="0.1524" layer="91"/>
+<label x="96.52" y="144.78" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PA6"/>
 </segment>
 </net>
 <net name="D+" class="0">
@@ -4769,8 +4777,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="246.38" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="106.68" y="160.02" size="1.27" layer="95" xref="yes"/>
-<wire x1="106.68" y1="160.02" x2="104.14" y2="160.02" width="0.1524" layer="91"/>
+<label x="119.38" y="142.24" size="1.27" layer="95" xref="yes"/>
+<wire x1="119.38" y1="142.24" x2="116.84" y2="142.24" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$23" class="0">
@@ -4787,8 +4795,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="27.94" y="50.8" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="106.68" y1="157.48" x2="104.14" y2="157.48" width="0.1524" layer="91"/>
-<label x="106.68" y="157.48" size="1.27" layer="95" xref="yes"/>
+<wire x1="119.38" y1="139.7" x2="116.84" y2="139.7" width="0.1524" layer="91"/>
+<label x="119.38" y="139.7" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="!RES" class="0">
@@ -4798,8 +4806,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="106.68" y="99.06" size="1.27" layer="95" xref="yes"/>
-<wire x1="106.68" y1="99.06" x2="104.14" y2="99.06" width="0.1524" layer="91"/>
+<label x="96.52" y="154.94" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="154.94" x2="93.98" y2="154.94" width="0.1524" layer="91"/>
+<pinref part="U4" gate="G$1" pin="PA2"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
@@ -4809,8 +4818,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="106.68" y="101.6" size="1.27" layer="95" xref="yes"/>
-<wire x1="106.68" y1="101.6" x2="104.14" y2="101.6" width="0.1524" layer="91"/>
+<label x="96.52" y="157.48" size="1.27" layer="95" xref="yes"/>
+<wire x1="96.52" y1="157.48" x2="93.98" y2="157.48" width="0.1524" layer="91"/>
+<pinref part="U4" gate="G$1" pin="PA1"/>
 </segment>
 </net>
 <net name="T-" class="0">
@@ -4820,20 +4830,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="246.38" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="154.94" y1="147.32" x2="157.48" y2="147.32" width="0.1524" layer="91"/>
-<wire x1="157.48" y1="147.32" x2="157.48" y2="144.78" width="0.1524" layer="91"/>
-<pinref part="U3" gate="G$1" pin="T-"/>
-<wire x1="177.8" y1="142.24" x2="162.56" y2="142.24" width="0.1524" layer="91"/>
-<wire x1="162.56" y1="142.24" x2="162.56" y2="147.32" width="0.1524" layer="91"/>
-<wire x1="162.56" y1="147.32" x2="157.48" y2="147.32" width="0.1524" layer="91"/>
-<junction x="157.48" y="147.32"/>
-<wire x1="157.48" y1="147.32" x2="157.48" y2="149.86" width="0.1524" layer="91"/>
-<label x="170.18" y="142.24" size="1.778" layer="95"/>
-<pinref part="R6" gate="G$1" pin="1"/>
-<pinref part="C17" gate="G$1" pin="1"/>
-<pinref part="C6" gate="G$1" pin="2"/>
-</segment>
-<segment>
 <wire x1="139.7" y1="142.24" x2="142.24" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="142.24" y1="142.24" x2="142.24" y2="147.32" width="0.1524" layer="91"/>
 <wire x1="142.24" y1="147.32" x2="144.78" y2="147.32" width="0.1524" layer="91"/>
@@ -4855,20 +4851,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="246.38" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="154.94" y1="134.62" x2="157.48" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="157.48" y1="134.62" x2="157.48" y2="137.16" width="0.1524" layer="91"/>
-<wire x1="157.48" y1="134.62" x2="162.56" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="162.56" y1="134.62" x2="162.56" y2="139.7" width="0.1524" layer="91"/>
-<junction x="157.48" y="134.62"/>
-<pinref part="U3" gate="G$1" pin="T+"/>
-<wire x1="162.56" y1="139.7" x2="177.8" y2="139.7" width="0.1524" layer="91"/>
-<wire x1="157.48" y1="134.62" x2="157.48" y2="127" width="0.1524" layer="91"/>
-<label x="170.18" y="139.7" size="1.778" layer="95"/>
-<pinref part="R7" gate="G$1" pin="1"/>
-<pinref part="C6" gate="G$1" pin="1"/>
-<pinref part="C18" gate="G$1" pin="2"/>
-</segment>
-<segment>
 <wire x1="139.7" y1="139.7" x2="142.24" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="142.24" y1="139.7" x2="142.24" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="142.24" y1="134.62" x2="144.78" y2="134.62" width="0.1524" layer="91"/>
@@ -4883,8 +4865,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="129.54" y="20.32" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="104.14" y1="139.7" x2="106.68" y2="139.7" width="0.1524" layer="91"/>
-<label x="106.68" y="139.7" size="1.27" layer="95" xref="yes"/>
+<wire x1="93.98" y1="116.84" x2="96.52" y2="116.84" width="0.1524" layer="91"/>
+<label x="96.52" y="116.84" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PB0"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
@@ -4940,8 +4923,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="104.14" y1="96.52" x2="106.68" y2="96.52" width="0.1524" layer="91"/>
-<label x="106.68" y="96.52" size="1.27" layer="95" xref="yes"/>
+<wire x1="93.98" y1="152.4" x2="96.52" y2="152.4" width="0.1524" layer="91"/>
+<label x="96.52" y="152.4" size="1.27" layer="95" xref="yes"/>
+<pinref part="U4" gate="G$1" pin="PA3"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
@@ -4951,11 +4935,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="215.9" y="134.62" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="104.14" y1="134.62" x2="106.68" y2="134.62" width="0.1524" layer="91"/>
-<label x="106.68" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="116.84" y1="116.84" x2="119.38" y2="116.84" width="0.1524" layer="91"/>
+<label x="119.38" y="116.84" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="AUX-TX" class="0">
+<net name="AUX2" class="0">
 <segment>
 <wire x1="236.22" y1="83.82" x2="241.3" y2="83.82" width="0.1524" layer="91"/>
 <label x="236.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -4970,19 +4954,19 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="241.3" y="83.82"/>
 </segment>
 <segment>
-<wire x1="104.14" y1="152.4" x2="106.68" y2="152.4" width="0.1524" layer="91"/>
-<label x="106.68" y="152.4" size="1.27" layer="95" xref="yes"/>
+<wire x1="116.84" y1="134.62" x2="119.38" y2="134.62" width="0.1524" layer="91"/>
+<label x="119.38" y="134.62" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="AUX-RX" class="0">
+<net name="AUX1" class="0">
 <segment>
 <wire x1="236.22" y1="86.36" x2="254" y2="86.36" width="0.1524" layer="91"/>
 <label x="236.22" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="JP5" gate="G$1" pin="1"/>
 </segment>
 <segment>
-<wire x1="104.14" y1="154.94" x2="106.68" y2="154.94" width="0.1524" layer="91"/>
-<label x="106.68" y="154.94" size="1.27" layer="95" xref="yes"/>
+<wire x1="116.84" y1="137.16" x2="119.38" y2="137.16" width="0.1524" layer="91"/>
+<label x="119.38" y="137.16" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
@@ -5047,6 +5031,38 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="38.1" y="129.54"/>
 </segment>
 </net>
+<net name="T-RAW" class="0">
+<segment>
+<wire x1="154.94" y1="147.32" x2="157.48" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="147.32" x2="157.48" y2="144.78" width="0.1524" layer="91"/>
+<pinref part="U3" gate="G$1" pin="T-"/>
+<wire x1="177.8" y1="142.24" x2="162.56" y2="142.24" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="142.24" x2="162.56" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="147.32" x2="157.48" y2="147.32" width="0.1524" layer="91"/>
+<junction x="157.48" y="147.32"/>
+<wire x1="157.48" y1="147.32" x2="157.48" y2="149.86" width="0.1524" layer="91"/>
+<label x="170.18" y="142.24" size="1.778" layer="95"/>
+<pinref part="R6" gate="G$1" pin="1"/>
+<pinref part="C17" gate="G$1" pin="1"/>
+<pinref part="C6" gate="G$1" pin="2"/>
+</segment>
+</net>
+<net name="T+RAW" class="0">
+<segment>
+<wire x1="154.94" y1="134.62" x2="157.48" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="134.62" x2="157.48" y2="137.16" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="134.62" x2="162.56" y2="134.62" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="134.62" x2="162.56" y2="139.7" width="0.1524" layer="91"/>
+<junction x="157.48" y="134.62"/>
+<pinref part="U3" gate="G$1" pin="T+"/>
+<wire x1="162.56" y1="139.7" x2="177.8" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="134.62" x2="157.48" y2="127" width="0.1524" layer="91"/>
+<label x="170.18" y="139.7" size="1.778" layer="95"/>
+<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<pinref part="C18" gate="G$1" pin="2"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>