diff --git a/custom.pretty/stm32bb.kicad_mod b/custom.pretty/stm32bb.kicad_mod
new file mode 100644
index 0000000..387adba
--- /dev/null
+++ b/custom.pretty/stm32bb.kicad_mod
@@ -0,0 +1,56 @@
+(module stm32bb (layer F.Cu) (tedit 5967990B)
+  (fp_text reference REF** (at 0 -26.63) (layer F.SilkS)
+    (effects (font (size 1.2 1.2) (thickness 0.15)))
+  )
+  (fp_text value stm32 (at 0 0 180) (layer F.Fab)
+    (effects (font (size 1.2 1.2) (thickness 0.15)))
+  )
+  (fp_line (start -8.919999 -25.43) (end -8.92 25.43) (layer F.SilkS) (width 0.15))
+  (fp_line (start -8.92 25.43) (end 8.919999 25.43) (layer F.SilkS) (width 0.15))
+  (fp_line (start 8.919999 25.43) (end 8.92 -25.43) (layer F.SilkS) (width 0.15))
+  (fp_line (start 8.92 -25.43) (end 2.973333 -25.43) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.973333 -25.43) (end 2.973333 -24.98) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.973333 -24.98) (end -2.973333 -24.98) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.973333 -24.98) (end -2.973333 -25.43) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.973333 -25.43) (end -8.919999 -25.43) (layer F.SilkS) (width 0.15))
+  (pad 40 thru_hole circle (at 7.62 -24.13 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at -7.62 -24.13 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 39 thru_hole circle (at 7.62 -21.59 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at -7.62 -21.59 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 38 thru_hole circle (at 7.62 -19.05 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at -7.62 -19.05 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 37 thru_hole circle (at 7.62 -16.51 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at -7.62 -16.51 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 36 thru_hole circle (at 7.62 -13.97 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at -7.62 -13.97 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 35 thru_hole circle (at 7.62 -11.43 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at -7.62 -11.43 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 34 thru_hole circle (at 7.62 -8.89 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 7 thru_hole circle (at -7.62 -8.89 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 33 thru_hole circle (at 7.62 -6.35 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 8 thru_hole circle (at -7.62 -6.35 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 32 thru_hole circle (at 7.62 -3.81 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 9 thru_hole circle (at -7.62 -3.81 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 31 thru_hole circle (at 7.62 -1.27 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 10 thru_hole circle (at -7.62 -1.27 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 30 thru_hole circle (at 7.62 1.27 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 11 thru_hole circle (at -7.62 1.27 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 29 thru_hole circle (at 7.62 3.81 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 12 thru_hole circle (at -7.62 3.81 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 28 thru_hole circle (at 7.62 6.35 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 13 thru_hole circle (at -7.62 6.35 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 27 thru_hole circle (at 7.62 8.89 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 14 thru_hole circle (at -7.62 8.89 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 26 thru_hole circle (at 7.62 11.43 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 15 thru_hole circle (at -7.62 11.43 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 25 thru_hole circle (at 7.62 13.97 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 16 thru_hole circle (at -7.62 13.97 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 24 thru_hole circle (at 7.62 16.51 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 17 thru_hole circle (at -7.62 16.51 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 23 thru_hole circle (at 7.62 19.05 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 18 thru_hole circle (at -7.62 19.05 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 22 thru_hole circle (at 7.62 21.59 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 19 thru_hole circle (at -7.62 21.59 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 21 thru_hole circle (at 7.62 24.13 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 20 thru_hole circle (at -7.62 24.13 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+)
diff --git a/lib/custom.lib b/lib/custom.lib
index f0a9c55..5524a76 100644
--- a/lib/custom.lib
+++ b/lib/custom.lib
@@ -34,4 +34,56 @@ X ~ 9 -500 -400 200 R 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# stm32bb
+#
+DEF stm32bb U 0 40 Y Y 1 F N
+F0 "U" 0 1050 60 H V C CNN
+F1 "stm32bb" -50 850 60 H V C CNN
+F2 "" -1050 750 60 H I C CNN
+F3 "" -1050 750 60 H I C CNN
+$FPLIST
+ DIP40
+$ENDFPLIST
+DRAW
+S -1750 950 1750 -1050 1 1 0 f
+X GND 1 -1950 -950 200 R 50 50 1 1 W
+X +3.3V 2 -1950 -850 200 R 50 50 1 1 w
+X RESET 3 -1950 -750 200 R 50 50 1 1 I
+X Serial_3_RX/I2C2_SDA/PWM2_4/PB11 4 -1950 -650 200 R 50 50 1 1 I
+X D6/Serial_3_TX/I2C2_SCL/PWM2_3/PB10 5 -1950 -550 200 R 50 50 1 1 I
+X ADC_10/B1 6 -1950 -450 200 R 50 50 1 1 I
+X ADC_9/B0 7 -1950 -350 200 R 50 50 1 1 I
+X ADC_8/A7 8 -1950 -250 200 R 50 50 1 1 I
+X ADC_7/A6 9 -1950 -150 200 R 50 50 1 1 I
+X ADC_6/A5 10 -1950 -50 200 R 50 50 1 1 I
+X +5V 20 1950 850 200 L 50 50 1 1 w
+X A11 30 1950 -150 200 L 50 50 1 1 I
+X ADC_5/A4 11 -1950 50 200 R 50 50 1 1 I
+X B9 21 1950 750 200 L 50 50 1 1 I
+X PWM1_3/Serial1_RX/D2/PA10 31 1950 -250 200 L 50 50 1 1 I
+X ADC_4/A3 12 -1950 150 200 R 50 50 1 1 I
+X B8 22 1950 650 200 L 50 50 1 1 I
+X PWM1_2/Serial1_TX/D8/PA9 32 1950 -350 200 L 50 50 1 1 I
+X ADC_3/A2 13 -1950 250 200 R 50 50 1 1 I
+X B7 23 1950 550 200 L 50 50 1 1 I
+X A8 33 1950 -450 200 L 50 50 1 1 I
+X ADC_2/A1 14 -1950 350 200 R 50 50 1 1 I
+X B6 24 1950 450 200 L 50 50 1 1 I
+X B15 34 1950 -550 200 L 50 50 1 1 I
+X ADC_1/A0 15 -1950 450 200 R 50 50 1 1 I
+X B5 25 1950 350 200 L 50 50 1 1 I
+X B14 35 1950 -650 200 L 50 50 1 1 I
+X C15 16 -1950 550 200 R 50 50 1 1 I
+X B4 26 1950 250 200 L 50 50 1 1 I
+X B13 36 1950 -750 200 L 50 50 1 1 I
+X C14 17 -1950 650 200 R 50 50 1 1 I
+X B3 27 1950 150 200 L 50 50 1 1 I
+X B12 37 1950 -850 200 L 50 50 1 1 I
+X C13 18 -1950 750 200 R 50 50 1 1 I
+X A15 28 1950 50 200 L 50 50 1 1 I
+X VBAT 19 -1950 850 200 R 50 50 1 1 I
+X A12 29 1950 -50 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/velocomputer/velocomputer-cache.lib b/velocomputer/velocomputer-cache.lib
index 48bb9fe..712ad97 100644
--- a/velocomputer/velocomputer-cache.lib
+++ b/velocomputer/velocomputer-cache.lib
@@ -1,6 +1,62 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+# CONN_01X04
+#
+DEF CONN_01X04 J 0 40 Y N 1 F N
+F0 "J" 0 250 50 H V C CNN
+F1 "CONN_01X04" 100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Pin_Header_Straight_1X*
+ Pin_Header_Angled_1X*
+ Socket_Strip_Straight_1X*
+ Socket_Strip_Angled_1X*
+$ENDFPLIST
+DRAW
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 200 50 -200 0 1 0 N
+X P1 1 -200 150 150 R 50 50 1 1 P
+X P2 2 -200 50 150 R 50 50 1 1 P
+X P3 3 -200 -50 150 R 50 50 1 1 P
+X P4 4 -200 -150 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_01X06
+#
+DEF CONN_01X06 J 0 40 Y N 1 F N
+F0 "J" 0 350 50 H V C CNN
+F1 "CONN_01X06" 100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Pin_Header_Straight_1X*
+ Pin_Header_Angled_1X*
+ Socket_Strip_Straight_1X*
+ Socket_Strip_Angled_1X*
+$ENDFPLIST
+DRAW
+S -50 -245 10 -255 0 1 0 N
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 255 10 245 0 1 0 N
+S -50 300 50 -300 0 1 0 N
+X P1 1 -200 250 150 R 50 50 1 1 P
+X P2 2 -200 150 150 R 50 50 1 1 P
+X P3 3 -200 50 150 R 50 50 1 1 P
+X P4 4 -200 -50 150 R 50 50 1 1 P
+X P5 5 -200 -150 150 R 50 50 1 1 P
+X P6 6 -200 -250 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CP1_Small
 #
 DEF CP1_Small C 0 10 N N 1 F N
@@ -148,25 +204,6 @@ X ~ 2 0 -100 30 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Screw_Terminal_1x01
-#
-DEF Screw_Terminal_1x01 J 0 30 Y N 1 F N
-F0 "J" 0 150 50 H V C TNN
-F1 "Screw_Terminal_1x01" -150 0 50 V V C TNN
-F2 "" 0 -125 50 H I C CNN
-F3 "" 0 -100 50 H I C CNN
-$FPLIST
- TerminalBlock*1pol
-$ENDFPLIST
-DRAW
-C 25 0 50 0 1 10 N
-S -50 75 100 -75 0 1 10 f
-P 2 0 1 10 0 40 65 -25 N
-P 2 0 1 10 50 -40 -15 25 N
-X ~ 1 200 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # VDD
 #
 DEF VDD #PWR 0 0 Y Y 1 F P
@@ -181,4 +218,56 @@ X VDD 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# stm32bb
+#
+DEF stm32bb U 0 40 Y Y 1 F N
+F0 "U" 0 1050 60 H V C CNN
+F1 "stm32bb" -50 850 60 H V C CNN
+F2 "" -1050 750 60 H I C CNN
+F3 "" -1050 750 60 H I C CNN
+$FPLIST
+ DIP40
+$ENDFPLIST
+DRAW
+S -1750 950 1750 -1050 1 1 0 f
+X GND 1 -1950 -950 200 R 50 50 1 1 W
+X +3.3V 2 -1950 -850 200 R 50 50 1 1 w
+X RESET 3 -1950 -750 200 R 50 50 1 1 I
+X Serial_3_RX/I2C2_SDA/PWM2_4/PB11 4 -1950 -650 200 R 50 50 1 1 I
+X D6/Serial_3_TX/I2C2_SCL/PWM2_3/PB10 5 -1950 -550 200 R 50 50 1 1 I
+X ADC_10/B1 6 -1950 -450 200 R 50 50 1 1 I
+X ADC_9/B0 7 -1950 -350 200 R 50 50 1 1 I
+X ADC_8/A7 8 -1950 -250 200 R 50 50 1 1 I
+X ADC_7/A6 9 -1950 -150 200 R 50 50 1 1 I
+X ADC_6/A5 10 -1950 -50 200 R 50 50 1 1 I
+X +5V 20 1950 850 200 L 50 50 1 1 w
+X A11 30 1950 -150 200 L 50 50 1 1 I
+X ADC_5/A4 11 -1950 50 200 R 50 50 1 1 I
+X B9 21 1950 750 200 L 50 50 1 1 I
+X PWM1_3/Serial1_RX/D2/PA10 31 1950 -250 200 L 50 50 1 1 I
+X ADC_4/A3 12 -1950 150 200 R 50 50 1 1 I
+X B8 22 1950 650 200 L 50 50 1 1 I
+X PWM1_2/Serial1_TX/D8/PA9 32 1950 -350 200 L 50 50 1 1 I
+X ADC_3/A2 13 -1950 250 200 R 50 50 1 1 I
+X B7 23 1950 550 200 L 50 50 1 1 I
+X A8 33 1950 -450 200 L 50 50 1 1 I
+X ADC_2/A1 14 -1950 350 200 R 50 50 1 1 I
+X B6 24 1950 450 200 L 50 50 1 1 I
+X B15 34 1950 -550 200 L 50 50 1 1 I
+X ADC_1/A0 15 -1950 450 200 R 50 50 1 1 I
+X B5 25 1950 350 200 L 50 50 1 1 I
+X B14 35 1950 -650 200 L 50 50 1 1 I
+X C15 16 -1950 550 200 R 50 50 1 1 I
+X B4 26 1950 250 200 L 50 50 1 1 I
+X B13 36 1950 -750 200 L 50 50 1 1 I
+X C14 17 -1950 650 200 R 50 50 1 1 I
+X B3 27 1950 150 200 L 50 50 1 1 I
+X B12 37 1950 -850 200 L 50 50 1 1 I
+X C13 18 -1950 750 200 R 50 50 1 1 I
+X A15 28 1950 50 200 L 50 50 1 1 I
+X VBAT 19 -1950 850 200 R 50 50 1 1 I
+X A12 29 1950 -50 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/velocomputer/velocomputer.bak b/velocomputer/velocomputer.bak
index be0d040..e01b2ac 100644
--- a/velocomputer/velocomputer.bak
+++ b/velocomputer/velocomputer.bak
@@ -47,21 +47,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VDD #PWR01
-U 1 1 5943BC57
-P 1000 1000
-F 0 "#PWR01" H 1000 850 50  0001 C CNN
-F 1 "VDD" H 1000 1150 50  0000 C CNN
-F 2 "" H 1000 1000 50  0001 C CNN
-F 3 "" H 1000 1000 50  0001 C CNN
-	1    1000 1000
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR02
+L GND #PWR01
 U 1 1 5943BD49
 P 1000 1600
-F 0 "#PWR02" H 1000 1350 50  0001 C CNN
+F 0 "#PWR01" H 1000 1350 50  0001 C CNN
 F 1 "GND" H 1000 1450 50  0000 C CNN
 F 2 "" H 1000 1600 50  0001 C CNN
 F 3 "" H 1000 1600 50  0001 C CNN
@@ -69,10 +58,10 @@ F 3 "" H 1000 1600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR02
 U 1 1 5943C0DC
 P 2650 1900
-F 0 "#PWR03" H 2650 1650 50  0001 C CNN
+F 0 "#PWR02" H 2650 1650 50  0001 C CNN
 F 1 "GND" H 2650 1750 50  0000 C CNN
 F 2 "" H 2650 1900 50  0001 C CNN
 F 3 "" H 2650 1900 50  0001 C CNN
@@ -91,10 +80,10 @@ F 3 "" H 3250 1050 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR03
 U 1 1 5943C3D4
 P 3700 2300
-F 0 "#PWR04" H 3700 2050 50  0001 C CNN
+F 0 "#PWR03" H 3700 2050 50  0001 C CNN
 F 1 "GND" H 3700 2150 50  0000 C CNN
 F 2 "" H 3700 2300 50  0001 C CNN
 F 3 "" H 3700 2300 50  0001 C CNN
@@ -102,99 +91,44 @@ F 3 "" H 3700 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG05
+L PWR_FLAG #FLG04
 U 1 1 594C1F6F
-P 700 2950
-F 0 "#FLG05" H 700 3025 50  0001 C CNN
-F 1 "PWR_FLAG" H 700 3100 50  0000 C CNN
-F 2 "" H 700 2950 50  0001 C CNN
-F 3 "" H 700 2950 50  0001 C CNN
-	1    700  2950
+P 700 2200
+F 0 "#FLG04" H 700 2275 50  0001 C CNN
+F 1 "PWR_FLAG" H 700 2350 50  0000 C CNN
+F 2 "" H 700 2200 50  0001 C CNN
+F 3 "" H 700 2200 50  0001 C CNN
+	1    700  2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG06
+L PWR_FLAG #FLG05
 U 1 1 594C1F95
-P 1100 2950
-F 0 "#FLG06" H 1100 3025 50  0001 C CNN
-F 1 "PWR_FLAG" H 1100 3100 50  0000 C CNN
-F 2 "" H 1100 2950 50  0001 C CNN
-F 3 "" H 1100 2950 50  0001 C CNN
-	1    1100 2950
+P 1100 2200
+F 0 "#FLG05" H 1100 2275 50  0001 C CNN
+F 1 "PWR_FLAG" H 1100 2350 50  0000 C CNN
+F 2 "" H 1100 2200 50  0001 C CNN
+F 3 "" H 1100 2200 50  0001 C CNN
+	1    1100 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDD #PWR07
-U 1 1 594C20AE
-P 700 2950
-F 0 "#PWR07" H 700 2800 50  0001 C CNN
-F 1 "VDD" H 700 3100 50  0000 C CNN
-F 2 "" H 700 2950 50  0001 C CNN
-F 3 "" H 700 2950 50  0001 C CNN
-	1    700  2950
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR08
+L GND #PWR06
 U 1 1 594C20D4
-P 1100 2950
-F 0 "#PWR08" H 1100 2700 50  0001 C CNN
-F 1 "GND" H 1100 2800 50  0000 C CNN
-F 2 "" H 1100 2950 50  0001 C CNN
-F 3 "" H 1100 2950 50  0001 C CNN
-	1    1100 2950
+P 1100 2200
+F 0 "#PWR06" H 1100 1950 50  0001 C CNN
+F 1 "GND" H 1100 2050 50  0000 C CNN
+F 2 "" H 1100 2200 50  0001 C CNN
+F 3 "" H 1100 2200 50  0001 C CNN
+	1    1100 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L Screw_Terminal_1x01 J1
-U 1 1 594C33F7
-P 800 1000
-F 0 "J1" H 800 1150 50  0000 C TNN
-F 1 "VDD" V 650 1000 50  0000 C TNN
-F 2 "custom:1pin" H 800 875 50  0001 C CNN
-F 3 "" H 800 900 50  0001 C CNN
-	1    800  1000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J2
-U 1 1 594C3430
-P 800 1600
-F 0 "J2" H 800 1750 50  0000 C TNN
-F 1 "GND" V 650 1600 50  0000 C TNN
-F 2 "custom:1pin" H 800 1475 50  0001 C CNN
-F 3 "" H 800 1500 50  0001 C CNN
-	1    800  1600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J4
-U 1 1 594C355C
-P 4600 1050
-F 0 "J4" H 4600 1200 50  0000 C TNN
-F 1 "+5V" V 4450 1050 50  0000 C TNN
-F 2 "custom:1pin" H 4600 925 50  0001 C CNN
-F 3 "" H 4600 950 50  0001 C CNN
-	1    4600 1050
-	-1   0    0    1   
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J3
-U 1 1 594C35C3
-P 4600 2100
-F 0 "J3" H 4600 2250 50  0000 C TNN
-F 1 "GND" V 4450 2100 50  0000 C TNN
-F 2 "custom:1pin" H 4600 1975 50  0001 C CNN
-F 3 "" H 4600 2000 50  0001 C CNN
-	1    4600 2100
-	-1   0    0    1   
-$EndComp
-$Comp
 L R_Small R1
 U 1 1 595E706C
 P 1000 1300
 F 0 "R1" H 1030 1320 50  0000 L CNN
-F 1 "430K" H 1030 1260 50  0000 L CNN
+F 1 "830K" H 1030 1260 50  0000 L CNN
 F 2 "Resistors_SMD:R_1206" H 1000 1300 50  0001 C CNN
 F 3 "" H 1000 1300 50  0001 C CNN
 	1    1000 1300
@@ -233,38 +167,6 @@ F 3 "" H 2800 850 50  0001 C CNN
 	1    2800 850 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1000 1600 1600 1600
-Wire Wire Line
-	1000 1400 1600 1400
-Wire Wire Line
-	2650 1600 2800 1600
-Wire Wire Line
-	2650 1400 2650 1600
-Wire Wire Line
-	2650 1600 2650 1700
-Wire Wire Line
-	2400 1000 2400 750 
-Wire Wire Line
-	2400 750  2800 750 
-Wire Wire Line
-	2400 1200 2400 1050
-Wire Wire Line
-	2400 1050 2800 1050
-Wire Wire Line
-	2800 1050 3100 1050
-Wire Wire Line
-	2800 950  2800 1050
-Wire Wire Line
-	2800 1050 2800 1300
-Connection ~ 2800 1050
-Wire Wire Line
-	3400 1050 3700 1050
-Wire Wire Line
-	3700 1050 4100 1050
-Wire Wire Line
-	4100 1050 4400 1050
-Connection ~ 2650 1600
 $Comp
 L D_Small_ALT D1
 U 1 1 595E82D7
@@ -309,11 +211,6 @@ F 3 "" H 3400 1300 50  0001 C CNN
 	1    3400 1300
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2800 1300 2900 1300
-Wire Wire Line
-	3200 1550 3200 2100
-Connection ~ 3200 2100
 $Comp
 L CP1_Small C1
 U 1 1 595E8CC0
@@ -325,28 +222,6 @@ F 3 "" H 2650 1800 50  0001 C CNN
 	1    2650 1800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3500 1300 3700 1300
-Wire Wire Line
-	3700 1050 3700 1300
-Wire Wire Line
-	3700 1300 3700 1600
-Wire Wire Line
-	3700 1600 3700 1900
-Connection ~ 3700 1050
-Connection ~ 3700 1300
-Wire Wire Line
-	3700 1600 3000 1600
-Wire Wire Line
-	2650 1400 2400 1400
-Wire Wire Line
-	2400 1600 2400 2100
-Wire Wire Line
-	2400 2100 3200 2100
-Wire Wire Line
-	3200 2100 3700 2100
-Connection ~ 4100 1050
-Connection ~ 3700 1600
 $Comp
 L R_Small R5
 U 1 1 595E91C6
@@ -369,8 +244,6 @@ F 3 "" H 3700 2200 50  0001 C CNN
 	1    3700 2200
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4100 1050 4100 1500
 $Comp
 L CP1_Small C5
 U 1 1 595E9526
@@ -383,112 +256,497 @@ F 3 "" H 4100 1600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR07
 U 1 1 595E9577
 P 4100 2300
-F 0 "#PWR09" H 4100 2050 50  0001 C CNN
+F 0 "#PWR07" H 4100 2050 50  0001 C CNN
 F 1 "GND" H 4100 2150 50  0000 C CNN
 F 2 "" H 4100 2300 50  0001 C CNN
 F 3 "" H 4100 2300 50  0001 C CNN
 	1    4100 2300
 	1    0    0    -1  
 $EndComp
+$Comp
+L LM5017MR U1
+U 1 1 595EB5EC
+P 2000 1300
+F 0 "U1" H 1700 1850 50  0000 L CNN
+F 1 "LM5017MR" H 1700 1750 50  0000 L CNN
+F 2 "w_smd_dil:so-8" H 2000 850 50  0001 C CIN
+F 3 "" H 2000 1300 50  0001 C CNN
+	1    2000 1300
+	1    0    0    -1  
+$EndComp
+Text Label 6150 800  0    60   ~ 0
+VBAT
+$Comp
+L GND #PWR08
+U 1 1 59609FDC
+P 6200 1300
+F 0 "#PWR08" H 6200 1050 50  0001 C CNN
+F 1 "GND" H 6200 1150 50  0000 C CNN
+F 2 "" H 6200 1300 50  0001 C CNN
+F 3 "" H 6200 1300 50  0001 C CNN
+	1    6200 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R9
+U 1 1 5960A014
+P 6400 900
+F 0 "R9" H 6430 920 50  0000 L CNN
+F 1 "1M" H 6430 860 50  0000 L CNN
+F 2 "" H 6400 900 50  0001 C CNN
+F 3 "" H 6400 900 50  0001 C CNN
+	1    6400 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R10
+U 1 1 5960A0C0
+P 6400 1200
+F 0 "R10" H 6430 1220 50  0000 L CNN
+F 1 "30K" H 6430 1160 50  0000 L CNN
+F 2 "" H 6400 1200 50  0001 C CNN
+F 3 "" H 6400 1200 50  0001 C CNN
+	1    6400 1200
+	1    0    0    -1  
+$EndComp
+Text Label 6500 1050 0    60   ~ 0
+BAT_SIG
+$Comp
+L stm32bb U2
+U 1 1 59679263
+P 11550 1850
+F 0 "U2" H 11550 2900 60  0000 C CNN
+F 1 "stm32bb" H 11500 2700 60  0000 C CNN
+F 2 "" H 10500 2600 60  0001 C CNN
+F 3 "" H 10500 2600 60  0001 C CNN
+	1    11550 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_01X06 J1
+U 1 1 59679F11
+P 1750 3400
+F 0 "J1" H 1750 3750 50  0000 C CNN
+F 1 "controller connector" V 1850 3400 50  0000 C CNN
+F 2 "" H 1750 3400 50  0001 C CNN
+F 3 "" H 1750 3400 50  0001 C CNN
+	1    1750 3400
+	1    0    0    -1  
+$EndComp
+Text Label 950  3150 0    60   ~ 0
+VBAT
+$Comp
+L GND #PWR09
+U 1 1 5967A19D
+P 900 3250
+F 0 "#PWR09" H 900 3000 50  0001 C CNN
+F 1 "GND" H 900 3100 50  0000 C CNN
+F 2 "" H 900 3250 50  0001 C CNN
+F 3 "" H 900 3250 50  0001 C CNN
+	1    900  3250
+	1    0    0    -1  
+$EndComp
+Text Label 650  1000 0    60   ~ 0
+VBAT
 Wire Wire Line
-	1000 1000 1300 1000
+	1000 1600 1600 1600
 Wire Wire Line
-	1300 1000 1600 1000
+	1000 1400 1600 1400
+Wire Wire Line
+	2650 1600 2800 1600
+Wire Wire Line
+	2650 1400 2650 1700
+Wire Wire Line
+	2400 1000 2400 750 
+Wire Wire Line
+	2400 750  2800 750 
+Wire Wire Line
+	2400 1200 2400 1050
+Wire Wire Line
+	2400 1050 3100 1050
+Wire Wire Line
+	2800 950  2800 1300
+Connection ~ 2800 1050
+Wire Wire Line
+	3400 1050 4400 1050
+Connection ~ 2650 1600
+Wire Wire Line
+	2800 1300 2900 1300
+Wire Wire Line
+	3200 1550 3200 2100
+Connection ~ 3200 2100
+Wire Wire Line
+	3500 1300 3700 1300
+Wire Wire Line
+	3700 1050 3700 1900
+Connection ~ 3700 1050
+Connection ~ 3700 1300
+Wire Wire Line
+	3700 1600 3000 1600
+Wire Wire Line
+	2650 1400 2400 1400
+Wire Wire Line
+	2400 1600 2400 2100
+Wire Wire Line
+	2400 2100 3700 2100
+Connection ~ 4100 1050
+Connection ~ 3700 1600
+Wire Wire Line
+	4100 1050 4100 1500
+Wire Wire Line
+	650  1000 1600 1000
 Wire Wire Line
 	1000 1000 1000 1200
 Wire Wire Line
 	1000 1200 1400 1200
 Connection ~ 1000 1000
 Wire Wire Line
-	4100 2100 4400 2100
+	4100 1700 4100 2300
 Wire Wire Line
-	4100 1700 4100 2100
+	3100 1300 3300 1300
 Wire Wire Line
-	4100 2100 4100 2300
-Connection ~ 4100 2100
+	3200 1350 3200 1300
+Connection ~ 3200 1300
 Wire Wire Line
-	3100 1300 3200 1300
+	6150 800  6400 800 
 Wire Wire Line
-	3200 1300 3300 1300
+	6200 1300 6400 1300
 Wire Wire Line
-	3200 1350 3200 1300
-Connection ~ 3200 1300
+	6400 1000 6400 1100
+Wire Wire Line
+	6400 1050 6500 1050
+Connection ~ 6400 1050
+Wire Wire Line
+	950  3150 1550 3150
+Wire Wire Line
+	1550 3250 900  3250
 $Comp
-L LM5017MR U1
-U 1 1 595EB5EC
-P 2000 1300
-F 0 "U1" H 1700 1850 50  0000 L CNN
-F 1 "LM5017MR" H 1700 1750 50  0000 L CNN
-F 2 "w_smd_dil:so-8" H 2000 850 50  0001 C CIN
-F 3 "" H 2000 1300 50  0001 C CNN
-	1    2000 1300
+L VDD #PWR010
+U 1 1 594C20AE
+P 700 2200
+F 0 "#PWR010" H 700 2050 50  0001 C CNN
+F 1 "VDD" H 700 2350 50  0000 C CNN
+F 2 "" H 700 2200 50  0001 C CNN
+F 3 "" H 700 2200 50  0001 C CNN
+	1    700  2200
+	-1   0    0    1   
+$EndComp
+$Comp
+L VDD #PWR011
+U 1 1 5967AA09
+P 1300 3150
+F 0 "#PWR011" H 1300 3000 50  0001 C CNN
+F 1 "VDD" H 1300 3300 50  0000 C CNN
+F 2 "" H 1300 3150 50  0001 C CNN
+F 3 "" H 1300 3150 50  0001 C CNN
+	1    1300 3150
+	1    0    0    -1  
+$EndComp
+Connection ~ 1300 3150
+Wire Wire Line
+	1550 3350 1100 3350
+Text Label 1100 3350 0    60   ~ 0
+AMP_LO
+Wire Wire Line
+	1550 3450 1100 3450
+Text Label 1100 3450 0    60   ~ 0
+AMP_HI
+Wire Wire Line
+	1550 3550 1100 3550
+Text Label 1100 3550 0    60   ~ 0
+HALL
+Wire Wire Line
+	1550 3650 1100 3650
+Text Label 1100 3650 0    60   ~ 0
+THROTTLE
+Text Label 4400 1050 0    60   ~ 0
+5V
+Text Label 6200 1750 0    60   ~ 0
+AMP_LO
+$Comp
+L GND #PWR012
+U 1 1 5967C1CD
+P 6200 2250
+F 0 "#PWR012" H 6200 2000 50  0001 C CNN
+F 1 "GND" H 6200 2100 50  0000 C CNN
+F 2 "" H 6200 2250 50  0001 C CNN
+F 3 "" H 6200 2250 50  0001 C CNN
+	1    6200 2250
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R11
+U 1 1 5967C1D3
+P 6400 1850
+F 0 "R11" H 6430 1870 50  0000 L CNN
+F 1 "1M" H 6430 1810 50  0000 L CNN
+F 2 "" H 6400 1850 50  0001 C CNN
+F 3 "" H 6400 1850 50  0001 C CNN
+	1    6400 1850
 	1    0    0    -1  
 $EndComp
+$Comp
+L R_Small R12
+U 1 1 5967C1D9
+P 6400 2150
+F 0 "R12" H 6430 2170 50  0000 L CNN
+F 1 "30K" H 6430 2110 50  0000 L CNN
+F 2 "" H 6400 2150 50  0001 C CNN
+F 3 "" H 6400 2150 50  0001 C CNN
+	1    6400 2150
+	1    0    0    -1  
+$EndComp
+Text Label 6500 2000 0    60   ~ 0
+AMP_LO_SIG
+Wire Wire Line
+	6200 1750 6400 1750
 Wire Wire Line
-	1300 1000 1300 750 
-Text Label 1300 750  0    60   ~ 0
-HV
-Connection ~ 1300 1000
+	6200 2250 6400 2250
 Wire Wire Line
-	1350 4350 1650 4350
+	6400 1950 6400 2050
 Wire Wire Line
-	1350 4950 1650 4950
-Text Label 1350 4350 0    60   ~ 0
-HV
+	6400 2000 6500 2000
+Connection ~ 6400 2000
+Text Label 7000 1750 0    60   ~ 0
+AMP_HI
 $Comp
-L GND #PWR?
-U 1 1 59609FDC
-P 1350 4950
-F 0 "#PWR?" H 1350 4700 50  0001 C CNN
-F 1 "GND" H 1350 4800 50  0000 C CNN
-F 2 "" H 1350 4950 50  0001 C CNN
-F 3 "" H 1350 4950 50  0001 C CNN
-	1    1350 4950
+L GND #PWR013
+U 1 1 5967C95A
+P 7000 2250
+F 0 "#PWR013" H 7000 2000 50  0001 C CNN
+F 1 "GND" H 7000 2100 50  0000 C CNN
+F 2 "" H 7000 2250 50  0001 C CNN
+F 3 "" H 7000 2250 50  0001 C CNN
+	1    7000 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_Small R?
-U 1 1 5960A014
-P 1650 4450
-F 0 "R?" H 1680 4470 50  0000 L CNN
-F 1 "1M" H 1680 4410 50  0000 L CNN
-F 2 "" H 1650 4450 50  0001 C CNN
-F 3 "" H 1650 4450 50  0001 C CNN
-	1    1650 4450
+L R_Small R13
+U 1 1 5967C960
+P 7200 1850
+F 0 "R13" H 7230 1870 50  0000 L CNN
+F 1 "1M" H 7230 1810 50  0000 L CNN
+F 2 "" H 7200 1850 50  0001 C CNN
+F 3 "" H 7200 1850 50  0001 C CNN
+	1    7200 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_Small R?
-U 1 1 5960A0C0
-P 1650 4850
-F 0 "R?" H 1680 4870 50  0000 L CNN
-F 1 "30K" H 1680 4810 50  0000 L CNN
-F 2 "" H 1650 4850 50  0001 C CNN
-F 3 "" H 1650 4850 50  0001 C CNN
-	1    1650 4850
+L R_Small R14
+U 1 1 5967C966
+P 7200 2150
+F 0 "R14" H 7230 2170 50  0000 L CNN
+F 1 "30K" H 7230 2110 50  0000 L CNN
+F 2 "" H 7200 2150 50  0001 C CNN
+F 3 "" H 7200 2150 50  0001 C CNN
+	1    7200 2150
+	1    0    0    -1  
+$EndComp
+Text Label 7300 2000 0    60   ~ 0
+AMP_HI_SIG
+Wire Wire Line
+	7000 1750 7200 1750
+Wire Wire Line
+	7000 2250 7200 2250
+Wire Wire Line
+	7200 1950 7200 2050
+Wire Wire Line
+	7200 2000 7300 2000
+Connection ~ 7200 2000
+Text Label 6150 2600 0    60   ~ 0
+HALL
+$Comp
+L GND #PWR014
+U 1 1 5967CD93
+P 6150 3100
+F 0 "#PWR014" H 6150 2850 50  0001 C CNN
+F 1 "GND" H 6150 2950 50  0000 C CNN
+F 2 "" H 6150 3100 50  0001 C CNN
+F 3 "" H 6150 3100 50  0001 C CNN
+	1    6150 3100
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R7
+U 1 1 5967CD99
+P 6350 2700
+F 0 "R7" H 6380 2720 50  0000 L CNN
+F 1 "1M" H 6380 2660 50  0000 L CNN
+F 2 "" H 6350 2700 50  0001 C CNN
+F 3 "" H 6350 2700 50  0001 C CNN
+	1    6350 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R8
+U 1 1 5967CD9F
+P 6350 3000
+F 0 "R8" H 6380 3020 50  0000 L CNN
+F 1 "30K" H 6380 2960 50  0000 L CNN
+F 2 "" H 6350 3000 50  0001 C CNN
+F 3 "" H 6350 3000 50  0001 C CNN
+	1    6350 3000
 	1    0    0    -1  
 $EndComp
+Text Label 6450 2850 0    60   ~ 0
+HALL_SIG
 Wire Wire Line
-	1650 4550 1650 4650
+	6150 2600 6350 2600
 Wire Wire Line
-	1650 4650 1650 4750
+	6150 3100 6350 3100
 Wire Wire Line
-	1650 4650 1850 4650
-Connection ~ 1650 4650
-Text Label 1850 4650 0    60   ~ 0
+	6350 2800 6350 2900
+Wire Wire Line
+	6350 2850 6450 2850
+Connection ~ 6350 2850
+$Comp
+L GND #PWR015
+U 1 1 5967D7B9
+P 9600 2800
+F 0 "#PWR015" H 9600 2550 50  0001 C CNN
+F 1 "GND" H 9600 2650 50  0000 C CNN
+F 2 "" H 9600 2800 50  0001 C CNN
+F 3 "" H 9600 2800 50  0001 C CNN
+	1    9600 2800
+	1    0    0    -1  
+$EndComp
+NoConn ~ 9600 1000
+NoConn ~ 9600 2600
+Wire Wire Line
+	13500 1000 13850 1000
+Text Label 13850 1000 0    60   ~ 0
+5V
+Wire Wire Line
+	9600 1400 9000 1400
+Text Label 9000 1400 0    60   ~ 0
 BAT_SIG
+Wire Wire Line
+	9600 1500 9000 1500
+Text Label 9000 1500 0    60   ~ 0
+AMP_LO_SIG
+Wire Wire Line
+	9600 1600 9000 1600
+Text Label 9000 1600 0    60   ~ 0
+AMP_HI_SIG
+Wire Wire Line
+	9600 1200 9000 1200
+Text Label 9000 1200 0    60   ~ 0
+HALL_SIG
+NoConn ~ 9600 1100
+NoConn ~ 9600 1300
+Wire Wire Line
+	9600 1800 9000 1800
+Text Label 9000 1800 0    60   ~ 0
+THROTTLE
+NoConn ~ 9600 1700
+NoConn ~ 9600 2300
+NoConn ~ 9600 2200
+NoConn ~ 9600 2100
+NoConn ~ 9600 2000
+NoConn ~ 9600 1900
+NoConn ~ 13500 1100
+NoConn ~ 13500 1200
+NoConn ~ 13500 1300
+NoConn ~ 13500 1400
+NoConn ~ 13500 1500
+NoConn ~ 13500 1600
+NoConn ~ 13500 1700
+NoConn ~ 13500 1800
+NoConn ~ 13500 1900
+NoConn ~ 13500 2000
+NoConn ~ 13500 2300
+NoConn ~ 13500 2400
+NoConn ~ 13500 2500
+NoConn ~ 13500 2600
+NoConn ~ 13500 2700
 $Comp
-L STM32F103C8Tx U?
-U 1 1 5960AA50
-P 4200 8650
-F 0 "U?" H 1400 10375 50  0000 L BNN
-F 1 "STM32F103C8Tx" H 7000 10375 50  0000 R BNN
-F 2 "Housings_QFP:LQFP-48_7x7mm_Pitch0.5mm" H 7000 10325 50  0001 R TNN
-F 3 "" H 4200 8650 50  0001 C CNN
-	1    4200 8650
+L CONN_01X04 J3
+U 1 1 59682402
+P 3200 4050
+F 0 "J3" H 3200 4300 50  0000 C CNN
+F 1 "program" V 3300 4050 50  0000 C CNN
+F 2 "" H 3200 4050 50  0001 C CNN
+F 3 "" H 3200 4050 50  0001 C CNN
+	1    3200 4050
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	2400 3900 3000 3900
+Text Label 2400 3900 0    60   ~ 0
+5V
+Wire Wire Line
+	3000 4000 2300 4000
+$Comp
+L GND #PWR016
+U 1 1 5968273D
+P 2300 4000
+F 0 "#PWR016" H 2300 3750 50  0001 C CNN
+F 1 "GND" H 2300 3850 50  0000 C CNN
+F 2 "" H 2300 4000 50  0001 C CNN
+F 3 "" H 2300 4000 50  0001 C CNN
+	1    2300 4000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 4100 2450 4100
+Wire Wire Line
+	3000 4200 2450 4200
+Wire Wire Line
+	13500 2100 14050 2100
+Wire Wire Line
+	13500 2200 14050 2200
+Text Label 14050 2100 0    60   ~ 0
+SERIAL_RX
+Text Label 14050 2200 0    60   ~ 0
+SERIAL_TX
+Text Label 2450 4100 0    60   ~ 0
+SERIAL_RX
+Text Label 2450 4200 0    60   ~ 0
+SERIAL_TX
+$Comp
+L CONN_01X04 J2
+U 1 1 596837D3
+P 2800 3300
+F 0 "J2" H 2800 3550 50  0000 C CNN
+F 1 "screen" V 2900 3300 50  0000 C CNN
+F 2 "" H 2800 3300 50  0001 C CNN
+F 3 "" H 2800 3300 50  0001 C CNN
+	1    2800 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9600 2700 9000 2700
+Text Label 9000 2700 0    60   ~ 0
+3V
+Wire Wire Line
+	2600 3150 2200 3150
+Text Label 2200 3150 0    60   ~ 0
+3V
+Wire Wire Line
+	2600 3250 2200 3250
+Wire Wire Line
+	1100 2200 1400 2200
+Text Label 1400 2200 0    60   ~ 0
+GND
+Text Label 2200 3250 0    60   ~ 0
+GND
+Wire Wire Line
+	2600 3350 2200 3350
+Wire Wire Line
+	2600 3450 2200 3450
+Text Label 2200 3350 0    60   ~ 0
+I2C_SCL
+Text Label 2200 3450 0    60   ~ 0
+I2C_SDA
+Wire Wire Line
+	9600 2400 9000 2400
+Wire Wire Line
+	9600 2500 9000 2500
+Text Label 9000 2400 0    60   ~ 0
+I2C_SCL
+Text Label 9000 2500 0    60   ~ 0
+I2C_SDA
 $EndSCHEMATC
diff --git a/velocomputer/velocomputer.sch b/velocomputer/velocomputer.sch
index 26e7b89..e01b2ac 100644
--- a/velocomputer/velocomputer.sch
+++ b/velocomputer/velocomputer.sch
@@ -47,21 +47,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VDD #PWR01
-U 1 1 5943BC57
-P 1000 1000
-F 0 "#PWR01" H 1000 850 50  0001 C CNN
-F 1 "VDD" H 1000 1150 50  0000 C CNN
-F 2 "" H 1000 1000 50  0001 C CNN
-F 3 "" H 1000 1000 50  0001 C CNN
-	1    1000 1000
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR02
+L GND #PWR01
 U 1 1 5943BD49
 P 1000 1600
-F 0 "#PWR02" H 1000 1350 50  0001 C CNN
+F 0 "#PWR01" H 1000 1350 50  0001 C CNN
 F 1 "GND" H 1000 1450 50  0000 C CNN
 F 2 "" H 1000 1600 50  0001 C CNN
 F 3 "" H 1000 1600 50  0001 C CNN
@@ -69,10 +58,10 @@ F 3 "" H 1000 1600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR02
 U 1 1 5943C0DC
 P 2650 1900
-F 0 "#PWR03" H 2650 1650 50  0001 C CNN
+F 0 "#PWR02" H 2650 1650 50  0001 C CNN
 F 1 "GND" H 2650 1750 50  0000 C CNN
 F 2 "" H 2650 1900 50  0001 C CNN
 F 3 "" H 2650 1900 50  0001 C CNN
@@ -91,10 +80,10 @@ F 3 "" H 3250 1050 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR03
 U 1 1 5943C3D4
 P 3700 2300
-F 0 "#PWR04" H 3700 2050 50  0001 C CNN
+F 0 "#PWR03" H 3700 2050 50  0001 C CNN
 F 1 "GND" H 3700 2150 50  0000 C CNN
 F 2 "" H 3700 2300 50  0001 C CNN
 F 3 "" H 3700 2300 50  0001 C CNN
@@ -102,99 +91,44 @@ F 3 "" H 3700 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG05
+L PWR_FLAG #FLG04
 U 1 1 594C1F6F
-P 700 2950
-F 0 "#FLG05" H 700 3025 50  0001 C CNN
-F 1 "PWR_FLAG" H 700 3100 50  0000 C CNN
-F 2 "" H 700 2950 50  0001 C CNN
-F 3 "" H 700 2950 50  0001 C CNN
-	1    700  2950
+P 700 2200
+F 0 "#FLG04" H 700 2275 50  0001 C CNN
+F 1 "PWR_FLAG" H 700 2350 50  0000 C CNN
+F 2 "" H 700 2200 50  0001 C CNN
+F 3 "" H 700 2200 50  0001 C CNN
+	1    700  2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG06
+L PWR_FLAG #FLG05
 U 1 1 594C1F95
-P 1100 2950
-F 0 "#FLG06" H 1100 3025 50  0001 C CNN
-F 1 "PWR_FLAG" H 1100 3100 50  0000 C CNN
-F 2 "" H 1100 2950 50  0001 C CNN
-F 3 "" H 1100 2950 50  0001 C CNN
-	1    1100 2950
+P 1100 2200
+F 0 "#FLG05" H 1100 2275 50  0001 C CNN
+F 1 "PWR_FLAG" H 1100 2350 50  0000 C CNN
+F 2 "" H 1100 2200 50  0001 C CNN
+F 3 "" H 1100 2200 50  0001 C CNN
+	1    1100 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDD #PWR07
-U 1 1 594C20AE
-P 700 2950
-F 0 "#PWR07" H 700 2800 50  0001 C CNN
-F 1 "VDD" H 700 3100 50  0000 C CNN
-F 2 "" H 700 2950 50  0001 C CNN
-F 3 "" H 700 2950 50  0001 C CNN
-	1    700  2950
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR08
+L GND #PWR06
 U 1 1 594C20D4
-P 1100 2950
-F 0 "#PWR08" H 1100 2700 50  0001 C CNN
-F 1 "GND" H 1100 2800 50  0000 C CNN
-F 2 "" H 1100 2950 50  0001 C CNN
-F 3 "" H 1100 2950 50  0001 C CNN
-	1    1100 2950
+P 1100 2200
+F 0 "#PWR06" H 1100 1950 50  0001 C CNN
+F 1 "GND" H 1100 2050 50  0000 C CNN
+F 2 "" H 1100 2200 50  0001 C CNN
+F 3 "" H 1100 2200 50  0001 C CNN
+	1    1100 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L Screw_Terminal_1x01 J1
-U 1 1 594C33F7
-P 800 1000
-F 0 "J1" H 800 1150 50  0000 C TNN
-F 1 "VDD" V 650 1000 50  0000 C TNN
-F 2 "custom:1pin" H 800 875 50  0001 C CNN
-F 3 "" H 800 900 50  0001 C CNN
-	1    800  1000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J2
-U 1 1 594C3430
-P 800 1600
-F 0 "J2" H 800 1750 50  0000 C TNN
-F 1 "GND" V 650 1600 50  0000 C TNN
-F 2 "custom:1pin" H 800 1475 50  0001 C CNN
-F 3 "" H 800 1500 50  0001 C CNN
-	1    800  1600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J4
-U 1 1 594C355C
-P 4600 1050
-F 0 "J4" H 4600 1200 50  0000 C TNN
-F 1 "+5V" V 4450 1050 50  0000 C TNN
-F 2 "custom:1pin" H 4600 925 50  0001 C CNN
-F 3 "" H 4600 950 50  0001 C CNN
-	1    4600 1050
-	-1   0    0    1   
-$EndComp
-$Comp
-L Screw_Terminal_1x01 J3
-U 1 1 594C35C3
-P 4600 2100
-F 0 "J3" H 4600 2250 50  0000 C TNN
-F 1 "GND" V 4450 2100 50  0000 C TNN
-F 2 "custom:1pin" H 4600 1975 50  0001 C CNN
-F 3 "" H 4600 2000 50  0001 C CNN
-	1    4600 2100
-	-1   0    0    1   
-$EndComp
-$Comp
 L R_Small R1
 U 1 1 595E706C
 P 1000 1300
 F 0 "R1" H 1030 1320 50  0000 L CNN
-F 1 "430K" H 1030 1260 50  0000 L CNN
+F 1 "830K" H 1030 1260 50  0000 L CNN
 F 2 "Resistors_SMD:R_1206" H 1000 1300 50  0001 C CNN
 F 3 "" H 1000 1300 50  0001 C CNN
 	1    1000 1300
@@ -233,38 +167,6 @@ F 3 "" H 2800 850 50  0001 C CNN
 	1    2800 850 
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1000 1600 1600 1600
-Wire Wire Line
-	1000 1400 1600 1400
-Wire Wire Line
-	2650 1600 2800 1600
-Wire Wire Line
-	2650 1400 2650 1600
-Wire Wire Line
-	2650 1600 2650 1700
-Wire Wire Line
-	2400 1000 2400 750 
-Wire Wire Line
-	2400 750  2800 750 
-Wire Wire Line
-	2400 1200 2400 1050
-Wire Wire Line
-	2400 1050 2800 1050
-Wire Wire Line
-	2800 1050 3100 1050
-Wire Wire Line
-	2800 950  2800 1050
-Wire Wire Line
-	2800 1050 2800 1300
-Connection ~ 2800 1050
-Wire Wire Line
-	3400 1050 3700 1050
-Wire Wire Line
-	3700 1050 4100 1050
-Wire Wire Line
-	4100 1050 4400 1050
-Connection ~ 2650 1600
 $Comp
 L D_Small_ALT D1
 U 1 1 595E82D7
@@ -309,11 +211,6 @@ F 3 "" H 3400 1300 50  0001 C CNN
 	1    3400 1300
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2800 1300 2900 1300
-Wire Wire Line
-	3200 1550 3200 2100
-Connection ~ 3200 2100
 $Comp
 L CP1_Small C1
 U 1 1 595E8CC0
@@ -325,28 +222,6 @@ F 3 "" H 2650 1800 50  0001 C CNN
 	1    2650 1800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3500 1300 3700 1300
-Wire Wire Line
-	3700 1050 3700 1300
-Wire Wire Line
-	3700 1300 3700 1600
-Wire Wire Line
-	3700 1600 3700 1900
-Connection ~ 3700 1050
-Connection ~ 3700 1300
-Wire Wire Line
-	3700 1600 3000 1600
-Wire Wire Line
-	2650 1400 2400 1400
-Wire Wire Line
-	2400 1600 2400 2100
-Wire Wire Line
-	2400 2100 3200 2100
-Wire Wire Line
-	3200 2100 3700 2100
-Connection ~ 4100 1050
-Connection ~ 3700 1600
 $Comp
 L R_Small R5
 U 1 1 595E91C6
@@ -369,8 +244,6 @@ F 3 "" H 3700 2200 50  0001 C CNN
 	1    3700 2200
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4100 1050 4100 1500
 $Comp
 L CP1_Small C5
 U 1 1 595E9526
@@ -383,101 +256,497 @@ F 3 "" H 4100 1600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR07
 U 1 1 595E9577
 P 4100 2300
-F 0 "#PWR09" H 4100 2050 50  0001 C CNN
+F 0 "#PWR07" H 4100 2050 50  0001 C CNN
 F 1 "GND" H 4100 2150 50  0000 C CNN
 F 2 "" H 4100 2300 50  0001 C CNN
 F 3 "" H 4100 2300 50  0001 C CNN
 	1    4100 2300
 	1    0    0    -1  
 $EndComp
+$Comp
+L LM5017MR U1
+U 1 1 595EB5EC
+P 2000 1300
+F 0 "U1" H 1700 1850 50  0000 L CNN
+F 1 "LM5017MR" H 1700 1750 50  0000 L CNN
+F 2 "w_smd_dil:so-8" H 2000 850 50  0001 C CIN
+F 3 "" H 2000 1300 50  0001 C CNN
+	1    2000 1300
+	1    0    0    -1  
+$EndComp
+Text Label 6150 800  0    60   ~ 0
+VBAT
+$Comp
+L GND #PWR08
+U 1 1 59609FDC
+P 6200 1300
+F 0 "#PWR08" H 6200 1050 50  0001 C CNN
+F 1 "GND" H 6200 1150 50  0000 C CNN
+F 2 "" H 6200 1300 50  0001 C CNN
+F 3 "" H 6200 1300 50  0001 C CNN
+	1    6200 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R9
+U 1 1 5960A014
+P 6400 900
+F 0 "R9" H 6430 920 50  0000 L CNN
+F 1 "1M" H 6430 860 50  0000 L CNN
+F 2 "" H 6400 900 50  0001 C CNN
+F 3 "" H 6400 900 50  0001 C CNN
+	1    6400 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R10
+U 1 1 5960A0C0
+P 6400 1200
+F 0 "R10" H 6430 1220 50  0000 L CNN
+F 1 "30K" H 6430 1160 50  0000 L CNN
+F 2 "" H 6400 1200 50  0001 C CNN
+F 3 "" H 6400 1200 50  0001 C CNN
+	1    6400 1200
+	1    0    0    -1  
+$EndComp
+Text Label 6500 1050 0    60   ~ 0
+BAT_SIG
+$Comp
+L stm32bb U2
+U 1 1 59679263
+P 11550 1850
+F 0 "U2" H 11550 2900 60  0000 C CNN
+F 1 "stm32bb" H 11500 2700 60  0000 C CNN
+F 2 "" H 10500 2600 60  0001 C CNN
+F 3 "" H 10500 2600 60  0001 C CNN
+	1    11550 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_01X06 J1
+U 1 1 59679F11
+P 1750 3400
+F 0 "J1" H 1750 3750 50  0000 C CNN
+F 1 "controller connector" V 1850 3400 50  0000 C CNN
+F 2 "" H 1750 3400 50  0001 C CNN
+F 3 "" H 1750 3400 50  0001 C CNN
+	1    1750 3400
+	1    0    0    -1  
+$EndComp
+Text Label 950  3150 0    60   ~ 0
+VBAT
+$Comp
+L GND #PWR09
+U 1 1 5967A19D
+P 900 3250
+F 0 "#PWR09" H 900 3000 50  0001 C CNN
+F 1 "GND" H 900 3100 50  0000 C CNN
+F 2 "" H 900 3250 50  0001 C CNN
+F 3 "" H 900 3250 50  0001 C CNN
+	1    900  3250
+	1    0    0    -1  
+$EndComp
+Text Label 650  1000 0    60   ~ 0
+VBAT
+Wire Wire Line
+	1000 1600 1600 1600
 Wire Wire Line
-	1000 1000 1300 1000
+	1000 1400 1600 1400
+Wire Wire Line
+	2650 1600 2800 1600
+Wire Wire Line
+	2650 1400 2650 1700
+Wire Wire Line
+	2400 1000 2400 750 
+Wire Wire Line
+	2400 750  2800 750 
+Wire Wire Line
+	2400 1200 2400 1050
+Wire Wire Line
+	2400 1050 3100 1050
+Wire Wire Line
+	2800 950  2800 1300
+Connection ~ 2800 1050
+Wire Wire Line
+	3400 1050 4400 1050
+Connection ~ 2650 1600
+Wire Wire Line
+	2800 1300 2900 1300
+Wire Wire Line
+	3200 1550 3200 2100
+Connection ~ 3200 2100
+Wire Wire Line
+	3500 1300 3700 1300
+Wire Wire Line
+	3700 1050 3700 1900
+Connection ~ 3700 1050
+Connection ~ 3700 1300
+Wire Wire Line
+	3700 1600 3000 1600
+Wire Wire Line
+	2650 1400 2400 1400
+Wire Wire Line
+	2400 1600 2400 2100
+Wire Wire Line
+	2400 2100 3700 2100
+Connection ~ 4100 1050
+Connection ~ 3700 1600
+Wire Wire Line
+	4100 1050 4100 1500
 Wire Wire Line
-	1300 1000 1600 1000
+	650  1000 1600 1000
 Wire Wire Line
 	1000 1000 1000 1200
 Wire Wire Line
 	1000 1200 1400 1200
 Connection ~ 1000 1000
 Wire Wire Line
-	4100 2100 4400 2100
+	4100 1700 4100 2300
 Wire Wire Line
-	4100 1700 4100 2100
+	3100 1300 3300 1300
 Wire Wire Line
-	4100 2100 4100 2300
-Connection ~ 4100 2100
+	3200 1350 3200 1300
+Connection ~ 3200 1300
 Wire Wire Line
-	3100 1300 3200 1300
+	6150 800  6400 800 
 Wire Wire Line
-	3200 1300 3300 1300
+	6200 1300 6400 1300
 Wire Wire Line
-	3200 1350 3200 1300
-Connection ~ 3200 1300
+	6400 1000 6400 1100
+Wire Wire Line
+	6400 1050 6500 1050
+Connection ~ 6400 1050
+Wire Wire Line
+	950  3150 1550 3150
+Wire Wire Line
+	1550 3250 900  3250
 $Comp
-L LM5017MR U1
-U 1 1 595EB5EC
-P 2000 1300
-F 0 "U1" H 1700 1850 50  0000 L CNN
-F 1 "LM5017MR" H 1700 1750 50  0000 L CNN
-F 2 "w_smd_dil:so-8" H 2000 850 50  0001 C CIN
-F 3 "" H 2000 1300 50  0001 C CNN
-	1    2000 1300
+L VDD #PWR010
+U 1 1 594C20AE
+P 700 2200
+F 0 "#PWR010" H 700 2050 50  0001 C CNN
+F 1 "VDD" H 700 2350 50  0000 C CNN
+F 2 "" H 700 2200 50  0001 C CNN
+F 3 "" H 700 2200 50  0001 C CNN
+	1    700  2200
+	-1   0    0    1   
+$EndComp
+$Comp
+L VDD #PWR011
+U 1 1 5967AA09
+P 1300 3150
+F 0 "#PWR011" H 1300 3000 50  0001 C CNN
+F 1 "VDD" H 1300 3300 50  0000 C CNN
+F 2 "" H 1300 3150 50  0001 C CNN
+F 3 "" H 1300 3150 50  0001 C CNN
+	1    1300 3150
 	1    0    0    -1  
 $EndComp
+Connection ~ 1300 3150
+Wire Wire Line
+	1550 3350 1100 3350
+Text Label 1100 3350 0    60   ~ 0
+AMP_LO
+Wire Wire Line
+	1550 3450 1100 3450
+Text Label 1100 3450 0    60   ~ 0
+AMP_HI
+Wire Wire Line
+	1550 3550 1100 3550
+Text Label 1100 3550 0    60   ~ 0
+HALL
+Wire Wire Line
+	1550 3650 1100 3650
+Text Label 1100 3650 0    60   ~ 0
+THROTTLE
+Text Label 4400 1050 0    60   ~ 0
+5V
+Text Label 6200 1750 0    60   ~ 0
+AMP_LO
+$Comp
+L GND #PWR012
+U 1 1 5967C1CD
+P 6200 2250
+F 0 "#PWR012" H 6200 2000 50  0001 C CNN
+F 1 "GND" H 6200 2100 50  0000 C CNN
+F 2 "" H 6200 2250 50  0001 C CNN
+F 3 "" H 6200 2250 50  0001 C CNN
+	1    6200 2250
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R11
+U 1 1 5967C1D3
+P 6400 1850
+F 0 "R11" H 6430 1870 50  0000 L CNN
+F 1 "1M" H 6430 1810 50  0000 L CNN
+F 2 "" H 6400 1850 50  0001 C CNN
+F 3 "" H 6400 1850 50  0001 C CNN
+	1    6400 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R12
+U 1 1 5967C1D9
+P 6400 2150
+F 0 "R12" H 6430 2170 50  0000 L CNN
+F 1 "30K" H 6430 2110 50  0000 L CNN
+F 2 "" H 6400 2150 50  0001 C CNN
+F 3 "" H 6400 2150 50  0001 C CNN
+	1    6400 2150
+	1    0    0    -1  
+$EndComp
+Text Label 6500 2000 0    60   ~ 0
+AMP_LO_SIG
+Wire Wire Line
+	6200 1750 6400 1750
 Wire Wire Line
-	1300 1000 1300 750 
-Text Label 1300 750  0    60   ~ 0
-HV
-Connection ~ 1300 1000
+	6200 2250 6400 2250
 Wire Wire Line
-	1350 4350 1650 4350
+	6400 1950 6400 2050
 Wire Wire Line
-	1350 4950 1650 4950
-Text Label 1350 4350 0    60   ~ 0
-HV
+	6400 2000 6500 2000
+Connection ~ 6400 2000
+Text Label 7000 1750 0    60   ~ 0
+AMP_HI
 $Comp
-L GND #PWR?
-U 1 1 59609FDC
-P 1350 4950
-F 0 "#PWR?" H 1350 4700 50  0001 C CNN
-F 1 "GND" H 1350 4800 50  0000 C CNN
-F 2 "" H 1350 4950 50  0001 C CNN
-F 3 "" H 1350 4950 50  0001 C CNN
-	1    1350 4950
+L GND #PWR013
+U 1 1 5967C95A
+P 7000 2250
+F 0 "#PWR013" H 7000 2000 50  0001 C CNN
+F 1 "GND" H 7000 2100 50  0000 C CNN
+F 2 "" H 7000 2250 50  0001 C CNN
+F 3 "" H 7000 2250 50  0001 C CNN
+	1    7000 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_Small R?
-U 1 1 5960A014
-P 1650 4450
-F 0 "R?" H 1680 4470 50  0000 L CNN
-F 1 "1M" H 1680 4410 50  0000 L CNN
-F 2 "" H 1650 4450 50  0001 C CNN
-F 3 "" H 1650 4450 50  0001 C CNN
-	1    1650 4450
+L R_Small R13
+U 1 1 5967C960
+P 7200 1850
+F 0 "R13" H 7230 1870 50  0000 L CNN
+F 1 "1M" H 7230 1810 50  0000 L CNN
+F 2 "" H 7200 1850 50  0001 C CNN
+F 3 "" H 7200 1850 50  0001 C CNN
+	1    7200 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_Small R?
-U 1 1 5960A0C0
-P 1650 4850
-F 0 "R?" H 1680 4870 50  0000 L CNN
-F 1 "30K" H 1680 4810 50  0000 L CNN
-F 2 "" H 1650 4850 50  0001 C CNN
-F 3 "" H 1650 4850 50  0001 C CNN
-	1    1650 4850
+L R_Small R14
+U 1 1 5967C966
+P 7200 2150
+F 0 "R14" H 7230 2170 50  0000 L CNN
+F 1 "30K" H 7230 2110 50  0000 L CNN
+F 2 "" H 7200 2150 50  0001 C CNN
+F 3 "" H 7200 2150 50  0001 C CNN
+	1    7200 2150
+	1    0    0    -1  
+$EndComp
+Text Label 7300 2000 0    60   ~ 0
+AMP_HI_SIG
+Wire Wire Line
+	7000 1750 7200 1750
+Wire Wire Line
+	7000 2250 7200 2250
+Wire Wire Line
+	7200 1950 7200 2050
+Wire Wire Line
+	7200 2000 7300 2000
+Connection ~ 7200 2000
+Text Label 6150 2600 0    60   ~ 0
+HALL
+$Comp
+L GND #PWR014
+U 1 1 5967CD93
+P 6150 3100
+F 0 "#PWR014" H 6150 2850 50  0001 C CNN
+F 1 "GND" H 6150 2950 50  0000 C CNN
+F 2 "" H 6150 3100 50  0001 C CNN
+F 3 "" H 6150 3100 50  0001 C CNN
+	1    6150 3100
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R7
+U 1 1 5967CD99
+P 6350 2700
+F 0 "R7" H 6380 2720 50  0000 L CNN
+F 1 "1M" H 6380 2660 50  0000 L CNN
+F 2 "" H 6350 2700 50  0001 C CNN
+F 3 "" H 6350 2700 50  0001 C CNN
+	1    6350 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R_Small R8
+U 1 1 5967CD9F
+P 6350 3000
+F 0 "R8" H 6380 3020 50  0000 L CNN
+F 1 "30K" H 6380 2960 50  0000 L CNN
+F 2 "" H 6350 3000 50  0001 C CNN
+F 3 "" H 6350 3000 50  0001 C CNN
+	1    6350 3000
 	1    0    0    -1  
 $EndComp
+Text Label 6450 2850 0    60   ~ 0
+HALL_SIG
 Wire Wire Line
-	1650 4550 1650 4650
+	6150 2600 6350 2600
 Wire Wire Line
-	1650 4650 1650 4750
+	6150 3100 6350 3100
 Wire Wire Line
-	1650 4650 1850 4650
-Connection ~ 1650 4650
-Text Label 1850 4650 0    60   ~ 0
+	6350 2800 6350 2900
+Wire Wire Line
+	6350 2850 6450 2850
+Connection ~ 6350 2850
+$Comp
+L GND #PWR015
+U 1 1 5967D7B9
+P 9600 2800
+F 0 "#PWR015" H 9600 2550 50  0001 C CNN
+F 1 "GND" H 9600 2650 50  0000 C CNN
+F 2 "" H 9600 2800 50  0001 C CNN
+F 3 "" H 9600 2800 50  0001 C CNN
+	1    9600 2800
+	1    0    0    -1  
+$EndComp
+NoConn ~ 9600 1000
+NoConn ~ 9600 2600
+Wire Wire Line
+	13500 1000 13850 1000
+Text Label 13850 1000 0    60   ~ 0
+5V
+Wire Wire Line
+	9600 1400 9000 1400
+Text Label 9000 1400 0    60   ~ 0
 BAT_SIG
+Wire Wire Line
+	9600 1500 9000 1500
+Text Label 9000 1500 0    60   ~ 0
+AMP_LO_SIG
+Wire Wire Line
+	9600 1600 9000 1600
+Text Label 9000 1600 0    60   ~ 0
+AMP_HI_SIG
+Wire Wire Line
+	9600 1200 9000 1200
+Text Label 9000 1200 0    60   ~ 0
+HALL_SIG
+NoConn ~ 9600 1100
+NoConn ~ 9600 1300
+Wire Wire Line
+	9600 1800 9000 1800
+Text Label 9000 1800 0    60   ~ 0
+THROTTLE
+NoConn ~ 9600 1700
+NoConn ~ 9600 2300
+NoConn ~ 9600 2200
+NoConn ~ 9600 2100
+NoConn ~ 9600 2000
+NoConn ~ 9600 1900
+NoConn ~ 13500 1100
+NoConn ~ 13500 1200
+NoConn ~ 13500 1300
+NoConn ~ 13500 1400
+NoConn ~ 13500 1500
+NoConn ~ 13500 1600
+NoConn ~ 13500 1700
+NoConn ~ 13500 1800
+NoConn ~ 13500 1900
+NoConn ~ 13500 2000
+NoConn ~ 13500 2300
+NoConn ~ 13500 2400
+NoConn ~ 13500 2500
+NoConn ~ 13500 2600
+NoConn ~ 13500 2700
+$Comp
+L CONN_01X04 J3
+U 1 1 59682402
+P 3200 4050
+F 0 "J3" H 3200 4300 50  0000 C CNN
+F 1 "program" V 3300 4050 50  0000 C CNN
+F 2 "" H 3200 4050 50  0001 C CNN
+F 3 "" H 3200 4050 50  0001 C CNN
+	1    3200 4050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2400 3900 3000 3900
+Text Label 2400 3900 0    60   ~ 0
+5V
+Wire Wire Line
+	3000 4000 2300 4000
+$Comp
+L GND #PWR016
+U 1 1 5968273D
+P 2300 4000
+F 0 "#PWR016" H 2300 3750 50  0001 C CNN
+F 1 "GND" H 2300 3850 50  0000 C CNN
+F 2 "" H 2300 4000 50  0001 C CNN
+F 3 "" H 2300 4000 50  0001 C CNN
+	1    2300 4000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 4100 2450 4100
+Wire Wire Line
+	3000 4200 2450 4200
+Wire Wire Line
+	13500 2100 14050 2100
+Wire Wire Line
+	13500 2200 14050 2200
+Text Label 14050 2100 0    60   ~ 0
+SERIAL_RX
+Text Label 14050 2200 0    60   ~ 0
+SERIAL_TX
+Text Label 2450 4100 0    60   ~ 0
+SERIAL_RX
+Text Label 2450 4200 0    60   ~ 0
+SERIAL_TX
+$Comp
+L CONN_01X04 J2
+U 1 1 596837D3
+P 2800 3300
+F 0 "J2" H 2800 3550 50  0000 C CNN
+F 1 "screen" V 2900 3300 50  0000 C CNN
+F 2 "" H 2800 3300 50  0001 C CNN
+F 3 "" H 2800 3300 50  0001 C CNN
+	1    2800 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9600 2700 9000 2700
+Text Label 9000 2700 0    60   ~ 0
+3V
+Wire Wire Line
+	2600 3150 2200 3150
+Text Label 2200 3150 0    60   ~ 0
+3V
+Wire Wire Line
+	2600 3250 2200 3250
+Wire Wire Line
+	1100 2200 1400 2200
+Text Label 1400 2200 0    60   ~ 0
+GND
+Text Label 2200 3250 0    60   ~ 0
+GND
+Wire Wire Line
+	2600 3350 2200 3350
+Wire Wire Line
+	2600 3450 2200 3450
+Text Label 2200 3350 0    60   ~ 0
+I2C_SCL
+Text Label 2200 3450 0    60   ~ 0
+I2C_SDA
+Wire Wire Line
+	9600 2400 9000 2400
+Wire Wire Line
+	9600 2500 9000 2500
+Text Label 9000 2400 0    60   ~ 0
+I2C_SCL
+Text Label 9000 2500 0    60   ~ 0
+I2C_SDA
 $EndSCHEMATC