diff --git a/Electronics/EggbotWireless/5vBoost.sch b/Electronics/EggbotWireless/5vBoost.sch
index 5dc94c4..d06e8be 100644
--- a/Electronics/EggbotWireless/5vBoost.sch
+++ b/Electronics/EggbotWireless/5vBoost.sch
@@ -14,297 +14,253 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L LM2621:LM2621 U9
-U 1 1 5E1189F9
-P 4250 3400
-F 0 "U9" H 4225 3565 50  0000 C CNN
-F 1 "LM2621" H 4225 3474 50  0000 C CNN
-F 2 "Package_SO:VSSOP-8_3.0x3.0mm_P0.65mm" H 4150 3350 50  0001 C CNN
-F 3 "" H 4250 3400 50  0001 C CNN
-	1    4250 3400
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+5V #PWR0109
 U 1 1 5E119508
-P 3000 3400
-F 0 "#PWR0109" H 3000 3250 50  0001 C CNN
-F 1 "+5V" H 3015 3573 50  0000 C CNN
-F 2 "" H 3000 3400 50  0001 C CNN
-F 3 "" H 3000 3400 50  0001 C CNN
-	1    3000 3400
+P 3500 3900
+F 0 "#PWR0109" H 3500 3750 50  0001 C CNN
+F 1 "+5V" H 3515 4073 50  0000 C CNN
+F 2 "" H 3500 3900 50  0001 C CNN
+F 3 "" H 3500 3900 50  0001 C CNN
+	1    3500 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0154
 U 1 1 5E119E30
-P 4200 4950
-F 0 "#PWR0154" H 4200 4700 50  0001 C CNN
-F 1 "GND" H 4205 4777 50  0000 C CNN
-F 2 "" H 4200 4950 50  0001 C CNN
-F 3 "" H 4200 4950 50  0001 C CNN
-	1    4200 4950
+P 5150 4400
+F 0 "#PWR0154" H 5150 4150 50  0001 C CNN
+F 1 "GND" H 5155 4227 50  0000 C CNN
+F 2 "" H 5150 4400 50  0001 C CNN
+F 3 "" H 5150 4400 50  0001 C CNN
+	1    5150 4400
 	1    0    0    -1  
 $EndComp
-Text GLabel 5950 3500 2    50   Input ~ 0
+Text GLabel 5350 3250 1    50   Input ~ 0
 SERVOPWR
 $Comp
 L EggbotWireless-rescue:L-Device L?
 U 1 1 5E1F4797
-P 3500 3500
+P 4850 2800
 AR Path="/5E1F4797" Ref="L?"  Part="1" 
 AR Path="/5E1045DA/5E1F4797" Ref="L3"  Part="1" 
-F 0 "L3" V 3450 3500 50  0000 C CNN
-F 1 "6.8uH" V 3350 3500 50  0000 C CNN
-F 2 "Inductor_SMD:L_6.3x6.3_H3" H 3500 3500 50  0001 C CNN
-F 3 "~" H 3500 3500 50  0001 C CNN
-F 4 "CKCS6028" V 3500 3500 50  0001 C CNN "Part"
-	1    3500 3500
-	0    -1   -1   0   
-$EndComp
-$Comp
-L EggbotWireless-rescue:CP-Device C?
-U 1 1 5E2063BC
-P 3000 3650
-AR Path="/5E2063BC" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E2063BC" Ref="C18"  Part="1" 
-F 0 "C18" H 3118 3696 50  0000 L CNN
-F 1 "10uF" H 3118 3605 50  0000 L CNN
-F 2 "Capacitor_SMD:CP_Elec_4x5.4" H 3038 3500 50  0001 C CNN
-F 3 "~" H 3000 3650 50  0001 C CNN
-	1    3000 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L EggbotWireless-rescue:D_Schottky-Device D?
-U 1 1 5E2179C0
-P 4200 3100
-AR Path="/5E2179C0" Ref="D?"  Part="1" 
-AR Path="/5E1045DA/5E2179C0" Ref="D5"  Part="1" 
-F 0 "D5" H 4200 2884 50  0000 C CNN
-F 1 "SSB43L" H 4200 2975 50  0000 C CNN
-F 2 "Diode_SMD:D_SMB_Handsoldering" H 4200 3100 50  0001 C CNN
-F 3 "~" H 4200 3100 50  0001 C CNN
-	1    4200 3100
-	-1   0    0    1   
-$EndComp
-$Comp
-L EggbotWireless-rescue:CP-Device C?
-U 1 1 5E217A35
-P 5700 3750
-AR Path="/5E217A35" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E217A35" Ref="C21"  Part="1" 
-F 0 "C21" H 5818 3796 50  0000 L CNN
-F 1 "68uF" H 5818 3705 50  0000 L CNN
-F 2 "Capacitor_SMD:CP_Elec_4x5.8" H 5738 3600 50  0001 C CNN
-F 3 "~" H 5700 3750 50  0001 C CNN
-	1    5700 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L EggbotWireless-rescue:C-Device-Catfi-rescue C?
-U 1 1 5E229464
-P 4550 4550
-AR Path="/5E229464" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E229464" Ref="C19"  Part="1" 
-F 0 "C19" H 4450 4450 50  0000 R CNN
-F 1 "22pF" H 4450 4550 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4588 4400 50  0001 C CNN
-F 3 "~" H 4550 4550 50  0001 C CNN
-	1    4550 4550
+F 0 "L3" V 4800 2800 50  0000 C CNN
+F 1 "1uH" V 4700 2800 50  0000 C CNN
+F 2 "Inductor_SMD:L_6.3x6.3_H3" H 4850 2800 50  0001 C CNN
+F 3 "~" H 4850 2800 50  0001 C CNN
+F 4 "SPM5030T-1R0M" V 4850 2800 50  0001 C CNN "Part"
+	1    4850 2800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L EggbotWireless-rescue:R-Device R?
 U 1 1 5E23A737
-P 4550 4350
+P 4650 3300
 AR Path="/5E23A737" Ref="R?"  Part="1" 
 AR Path="/5E1045DA/5E23A737" Ref="R28"  Part="1" 
-F 0 "R28" H 4620 4396 50  0000 L CNN
-F 1 "150K" H 4620 4305 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4480 4350 50  0001 C CNN
-F 3 "~" H 4550 4350 50  0001 C CNN
-	1    4550 4350
+F 0 "R28" H 4720 3346 50  0000 L CNN
+F 1 "750K" H 4720 3255 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4580 3300 50  0001 C CNN
+F 3 "~" H 4650 3300 50  0001 C CNN
+	1    4650 3300
 	0    1    -1   0   
 $EndComp
 $Comp
 L EggbotWireless-rescue:R-Device R?
 U 1 1 5E23AC93
-P 4200 4750
+P 4100 3500
 AR Path="/5E23AC93" Ref="R?"  Part="1" 
 AR Path="/5E1045DA/5E23AC93" Ref="R23"  Part="1" 
-F 0 "R23" H 4270 4796 50  0000 L CNN
-F 1 "50K" H 4270 4705 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4130 4750 50  0001 C CNN
-F 3 "~" H 4200 4750 50  0001 C CNN
-	1    4200 4750
+F 0 "R23" H 4170 3546 50  0000 L CNN
+F 1 "100K" H 4170 3455 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4030 3500 50  0001 C CNN
+F 3 "~" H 4100 3500 50  0001 C CNN
+	1    4100 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0159
-U 1 1 5E23B033
-P 3850 4050
-F 0 "#PWR0159" H 3850 3800 50  0001 C CNN
-F 1 "GND" H 3855 3877 50  0000 C CNN
-F 2 "" H 3850 4050 50  0001 C CNN
-F 3 "" H 3850 4050 50  0001 C CNN
-	1    3850 4050
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3850 3600 3850 4000
-Wire Wire Line
-	3850 4000 4100 4000
-Connection ~ 3850 4000
-Wire Wire Line
-	3850 4000 3850 4050
-Wire Wire Line
-	3000 3500 3350 3500
-Wire Wire Line
-	3650 3500 3750 3500
-$Comp
 L power:GND #PWR0160
 U 1 1 5E23D1E6
-P 3000 3900
-F 0 "#PWR0160" H 3000 3650 50  0001 C CNN
-F 1 "GND" H 3005 3727 50  0000 C CNN
-F 2 "" H 3000 3900 50  0001 C CNN
-F 3 "" H 3000 3900 50  0001 C CNN
-	1    3000 3900
+P 3500 4400
+F 0 "#PWR0160" H 3500 4150 50  0001 C CNN
+F 1 "GND" H 3505 4227 50  0000 C CNN
+F 2 "" H 3500 4400 50  0001 C CNN
+F 3 "" H 3500 4400 50  0001 C CNN
+	1    3500 4400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3000 3800 3000 3900
+	3500 4300 3500 4400
 Wire Wire Line
-	3000 3400 3000 3500
-Connection ~ 3000 3500
-Wire Wire Line
-	3750 3500 3750 3100
-Wire Wire Line
-	3750 3100 4050 3100
-Connection ~ 3750 3500
-Wire Wire Line
-	3750 3500 3850 3500
-Wire Wire Line
-	4350 3100 4750 3100
-Wire Wire Line
-	4750 3100 4750 3500
-Wire Wire Line
-	4750 3500 4600 3500
-Wire Wire Line
-	4750 3500 5400 3500
-Connection ~ 4750 3500
-Wire Wire Line
-	5700 3600 5700 3500
-Connection ~ 5700 3500
-Wire Wire Line
-	5700 3500 5950 3500
+	3500 3900 3500 4000
 $Comp
 L power:GND #PWR0161
 U 1 1 5E23F6D5
-P 5700 3900
-F 0 "#PWR0161" H 5700 3650 50  0001 C CNN
-F 1 "GND" H 5705 3727 50  0000 C CNN
-F 2 "" H 5700 3900 50  0001 C CNN
-F 3 "" H 5700 3900 50  0001 C CNN
-	1    5700 3900
+P 5750 3700
+F 0 "#PWR0161" H 5750 3450 50  0001 C CNN
+F 1 "GND" H 5755 3527 50  0000 C CNN
+F 2 "" H 5750 3700 50  0001 C CNN
+F 3 "" H 5750 3700 50  0001 C CNN
+	1    5750 3700
+	0    -1   -1   0   
+$EndComp
+$Comp
+L tps61023:TPS61023 U?
+U 1 1 5F047171
+P 4800 3600
+F 0 "U?" H 4825 3715 50  0000 C CNN
+F 1 "TPS61023" H 4825 3624 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-563" H 4800 3600 50  0001 C CNN
+F 3 "" H 4800 3600 50  0001 C CNN
+	1    4800 3600
+	1    0    0    -1  
+$EndComp
+Connection ~ 3500 4000
+$Comp
+L EggbotWireless-rescue:CP-Device C?
+U 1 1 5E2063BC
+P 3500 4150
+AR Path="/5E2063BC" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5E2063BC" Ref="C18"  Part="1" 
+F 0 "C18" H 3618 4196 50  0000 L CNN
+F 1 "68uF" H 3618 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:CP_Elec_4x5.8" H 3538 4000 50  0001 C CNN
+F 3 "~" H 3500 4150 50  0001 C CNN
+	1    3500 4150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4600 3600 4700 3600
+	4500 4000 4350 4000
 Wire Wire Line
-	4700 3600 4700 3700
+	4500 3900 4350 3900
 Wire Wire Line
-	4700 3700 4600 3700
+	4350 3900 4350 4000
+Wire Wire Line
+	5150 4000 5150 4400
+Wire Wire Line
+	3500 4000 3850 4000
+Wire Wire Line
+	3850 2800 3850 4000
+Connection ~ 3850 4000
+Wire Wire Line
+	3850 4000 4000 4000
+Wire Wire Line
+	5150 3800 5250 3800
+Wire Wire Line
+	6050 3900 6050 2800
+Wire Wire Line
+	5150 3900 6050 3900
+Wire Wire Line
+	5000 2800 6050 2800
 $Comp
-L EggbotWireless-rescue:R-Device R?
-U 1 1 5E24016D
-P 4700 3850
-AR Path="/5E24016D" Ref="R?"  Part="1" 
-AR Path="/5E1045DA/5E24016D" Ref="R29"  Part="1" 
-F 0 "R29" H 4770 3896 50  0000 L CNN
-F 1 "200K" H 4770 3805 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4630 3850 50  0001 C CNN
-F 3 "~" H 4700 3850 50  0001 C CNN
-	1    4700 3850
+L power:GND #PWR?
+U 1 1 5F057A38
+P 4100 3750
+F 0 "#PWR?" H 4100 3500 50  0001 C CNN
+F 1 "GND" H 4105 3577 50  0000 C CNN
+F 2 "" H 4100 3750 50  0001 C CNN
+F 3 "" H 4100 3750 50  0001 C CNN
+	1    4100 3750
 	1    0    0    -1  
 $EndComp
-Connection ~ 4700 3700
+Connection ~ 4350 4000
 Wire Wire Line
-	4600 3800 4600 4000
+	3850 2800 4700 2800
 Wire Wire Line
-	4600 4000 4700 4000
+	4100 3750 4100 3650
+Wire Wire Line
+	4100 3350 4100 3300
+Wire Wire Line
+	4100 3300 4400 3300
+Wire Wire Line
+	4400 3300 4400 3800
+Wire Wire Line
+	4400 3800 4500 3800
+Connection ~ 4400 3300
+Wire Wire Line
+	4400 3300 4500 3300
+Wire Wire Line
+	4800 3300 5250 3300
+Wire Wire Line
+	5250 3300 5250 3800
+Connection ~ 5250 3800
+Wire Wire Line
+	5250 3800 5350 3800
 $Comp
-L EggbotWireless-rescue:R-Device R?
-U 1 1 5E240CB4
-P 5250 3700
-AR Path="/5E240CB4" Ref="R?"  Part="1" 
-AR Path="/5E1045DA/5E240CB4" Ref="R30"  Part="1" 
-F 0 "R30" H 5320 3746 50  0000 L CNN
-F 1 "500" H 5320 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5180 3700 50  0001 C CNN
-F 3 "~" H 5250 3700 50  0001 C CNN
-	1    5250 3700
-	0    1    1    0   
+L EggbotWireless-rescue:C-Device C?
+U 1 1 5F074742
+P 4000 4150
+AR Path="/5F074742" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5F074742" Ref="C?"  Part="1" 
+F 0 "C?" H 4115 4196 50  0000 L CNN
+F 1 "10uF" H 4115 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4038 4000 50  0001 C CNN
+F 3 "~" H 4000 4150 50  0001 C CNN
+	1    4000 4150
+	1    0    0    -1  
 $EndComp
+Connection ~ 4000 4000
 Wire Wire Line
-	4700 3700 5000 3700
-Wire Wire Line
-	5400 3700 5400 3500
-Connection ~ 5400 3500
-Wire Wire Line
-	5400 3500 5500 3500
+	4000 4000 4350 4000
 $Comp
-L EggbotWireless-rescue:C-Device-Catfi-rescue C?
-U 1 1 5E2417C9
-P 5000 4050
-AR Path="/5E2417C9" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E2417C9" Ref="C20"  Part="1" 
-F 0 "C20" H 4900 3950 50  0000 R CNN
-F 1 "100nF" H 4900 4050 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5038 3900 50  0001 C CNN
-F 3 "~" H 5000 4050 50  0001 C CNN
-	1    5000 4050
-	-1   0    0    -1  
-$EndComp
-Connection ~ 5000 3700
-Wire Wire Line
-	5000 3700 5100 3700
-$Comp
-L power:GND #PWR0162
-U 1 1 5E243BDD
-P 5000 4200
-F 0 "#PWR0162" H 5000 3950 50  0001 C CNN
-F 1 "GND" H 5005 4027 50  0000 C CNN
-F 2 "" H 5000 4200 50  0001 C CNN
-F 3 "" H 5000 4200 50  0001 C CNN
-	1    5000 4200
+L power:GND #PWR?
+U 1 1 5F077512
+P 4000 4400
+F 0 "#PWR?" H 4000 4150 50  0001 C CNN
+F 1 "GND" H 4005 4227 50  0000 C CNN
+F 2 "" H 4000 4400 50  0001 C CNN
+F 3 "" H 4000 4400 50  0001 C CNN
+	1    4000 4400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4200 4950 4200 4900
+	4000 4400 4000 4300
 Wire Wire Line
-	4400 4550 4200 4550
-Connection ~ 4200 4550
+	5350 3250 5350 3300
+$Comp
+L EggbotWireless-rescue:C-Device C?
+U 1 1 5F078162
+P 5600 3300
+AR Path="/5F078162" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5F078162" Ref="C?"  Part="1" 
+F 0 "C?" H 5715 3346 50  0000 L CNN
+F 1 "10uF" H 5715 3255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5638 3150 50  0001 C CNN
+F 3 "~" H 5600 3300 50  0001 C CNN
+	1    5600 3300
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	4200 4550 4200 4600
+	5350 3300 5450 3300
+Connection ~ 5350 3300
 Wire Wire Line
-	4400 4350 4200 4350
-Connection ~ 4200 4350
+	5350 3300 5350 3700
 Wire Wire Line
-	4200 4350 4200 4550
+	5350 3700 5450 3700
+Connection ~ 5350 3700
 Wire Wire Line
-	4200 4000 4200 4350
-Wire Wire Line
-	4700 4350 4700 4550
-Wire Wire Line
-	4700 4550 5500 4550
-Wire Wire Line
-	5500 4550 5500 3500
-Connection ~ 4700 4550
-Connection ~ 5500 3500
-Wire Wire Line
-	5500 3500 5700 3500
-Wire Wire Line
-	5000 3700 5000 3900
+	5350 3700 5350 3800
+$Comp
+L power:GND #PWR?
+U 1 1 5F07A4BB
+P 5750 3300
+F 0 "#PWR?" H 5750 3050 50  0001 C CNN
+F 1 "GND" H 5755 3127 50  0000 C CNN
+F 2 "" H 5750 3300 50  0001 C CNN
+F 3 "" H 5750 3300 50  0001 C CNN
+	1    5750 3300
+	0    -1   -1   0   
+$EndComp
+$Comp
+L EggbotWireless-rescue:CP-Device C?
+U 1 1 5E217A35
+P 5600 3700
+AR Path="/5E217A35" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5E217A35" Ref="C21"  Part="1" 
+F 0 "C21" H 5718 3746 50  0000 L CNN
+F 1 "220uF" H 5718 3655 50  0000 L CNN
+F 2 "Capacitor_SMD:CP_Elec_8x10.5" H 5638 3550 50  0001 C CNN
+F 3 "~" H 5600 3700 50  0001 C CNN
+	1    5600 3700
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/Electronics/EggbotWireless/5vBoost.sch-bak b/Electronics/EggbotWireless/5vBoost.sch-bak
index 5dc94c4..866fce9 100644
--- a/Electronics/EggbotWireless/5vBoost.sch-bak
+++ b/Electronics/EggbotWireless/5vBoost.sch-bak
@@ -14,297 +14,253 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L LM2621:LM2621 U9
-U 1 1 5E1189F9
-P 4250 3400
-F 0 "U9" H 4225 3565 50  0000 C CNN
-F 1 "LM2621" H 4225 3474 50  0000 C CNN
-F 2 "Package_SO:VSSOP-8_3.0x3.0mm_P0.65mm" H 4150 3350 50  0001 C CNN
-F 3 "" H 4250 3400 50  0001 C CNN
-	1    4250 3400
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+5V #PWR0109
 U 1 1 5E119508
-P 3000 3400
-F 0 "#PWR0109" H 3000 3250 50  0001 C CNN
-F 1 "+5V" H 3015 3573 50  0000 C CNN
-F 2 "" H 3000 3400 50  0001 C CNN
-F 3 "" H 3000 3400 50  0001 C CNN
-	1    3000 3400
+P 3500 3900
+F 0 "#PWR0109" H 3500 3750 50  0001 C CNN
+F 1 "+5V" H 3515 4073 50  0000 C CNN
+F 2 "" H 3500 3900 50  0001 C CNN
+F 3 "" H 3500 3900 50  0001 C CNN
+	1    3500 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0154
 U 1 1 5E119E30
-P 4200 4950
-F 0 "#PWR0154" H 4200 4700 50  0001 C CNN
-F 1 "GND" H 4205 4777 50  0000 C CNN
-F 2 "" H 4200 4950 50  0001 C CNN
-F 3 "" H 4200 4950 50  0001 C CNN
-	1    4200 4950
+P 5150 4400
+F 0 "#PWR0154" H 5150 4150 50  0001 C CNN
+F 1 "GND" H 5155 4227 50  0000 C CNN
+F 2 "" H 5150 4400 50  0001 C CNN
+F 3 "" H 5150 4400 50  0001 C CNN
+	1    5150 4400
 	1    0    0    -1  
 $EndComp
-Text GLabel 5950 3500 2    50   Input ~ 0
+Text GLabel 5350 3250 1    50   Input ~ 0
 SERVOPWR
 $Comp
 L EggbotWireless-rescue:L-Device L?
 U 1 1 5E1F4797
-P 3500 3500
+P 4850 2800
 AR Path="/5E1F4797" Ref="L?"  Part="1" 
 AR Path="/5E1045DA/5E1F4797" Ref="L3"  Part="1" 
-F 0 "L3" V 3450 3500 50  0000 C CNN
-F 1 "6.8uH" V 3350 3500 50  0000 C CNN
-F 2 "Inductor_SMD:L_6.3x6.3_H3" H 3500 3500 50  0001 C CNN
-F 3 "~" H 3500 3500 50  0001 C CNN
-F 4 "CKCS6028" V 3500 3500 50  0001 C CNN "Part"
-	1    3500 3500
-	0    -1   -1   0   
-$EndComp
-$Comp
-L EggbotWireless-rescue:CP-Device C?
-U 1 1 5E2063BC
-P 3000 3650
-AR Path="/5E2063BC" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E2063BC" Ref="C18"  Part="1" 
-F 0 "C18" H 3118 3696 50  0000 L CNN
-F 1 "10uF" H 3118 3605 50  0000 L CNN
-F 2 "Capacitor_SMD:CP_Elec_4x5.4" H 3038 3500 50  0001 C CNN
-F 3 "~" H 3000 3650 50  0001 C CNN
-	1    3000 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L EggbotWireless-rescue:D_Schottky-Device D?
-U 1 1 5E2179C0
-P 4200 3100
-AR Path="/5E2179C0" Ref="D?"  Part="1" 
-AR Path="/5E1045DA/5E2179C0" Ref="D5"  Part="1" 
-F 0 "D5" H 4200 2884 50  0000 C CNN
-F 1 "SSB43L" H 4200 2975 50  0000 C CNN
-F 2 "Diode_SMD:D_SMB_Handsoldering" H 4200 3100 50  0001 C CNN
-F 3 "~" H 4200 3100 50  0001 C CNN
-	1    4200 3100
-	-1   0    0    1   
-$EndComp
-$Comp
-L EggbotWireless-rescue:CP-Device C?
-U 1 1 5E217A35
-P 5700 3750
-AR Path="/5E217A35" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E217A35" Ref="C21"  Part="1" 
-F 0 "C21" H 5818 3796 50  0000 L CNN
-F 1 "68uF" H 5818 3705 50  0000 L CNN
-F 2 "Capacitor_SMD:CP_Elec_4x5.8" H 5738 3600 50  0001 C CNN
-F 3 "~" H 5700 3750 50  0001 C CNN
-	1    5700 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L EggbotWireless-rescue:C-Device-Catfi-rescue C?
-U 1 1 5E229464
-P 4550 4550
-AR Path="/5E229464" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E229464" Ref="C19"  Part="1" 
-F 0 "C19" H 4450 4450 50  0000 R CNN
-F 1 "22pF" H 4450 4550 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4588 4400 50  0001 C CNN
-F 3 "~" H 4550 4550 50  0001 C CNN
-	1    4550 4550
+F 0 "L3" V 4800 2800 50  0000 C CNN
+F 1 "1uH" V 4700 2800 50  0000 C CNN
+F 2 "Inductor_SMD:L_6.3x6.3_H3" H 4850 2800 50  0001 C CNN
+F 3 "~" H 4850 2800 50  0001 C CNN
+F 4 "SPM5030T-1R0M" V 4850 2800 50  0001 C CNN "Part"
+	1    4850 2800
 	0    -1   -1   0   
 $EndComp
 $Comp
 L EggbotWireless-rescue:R-Device R?
 U 1 1 5E23A737
-P 4550 4350
+P 4650 3300
 AR Path="/5E23A737" Ref="R?"  Part="1" 
 AR Path="/5E1045DA/5E23A737" Ref="R28"  Part="1" 
-F 0 "R28" H 4620 4396 50  0000 L CNN
-F 1 "150K" H 4620 4305 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4480 4350 50  0001 C CNN
-F 3 "~" H 4550 4350 50  0001 C CNN
-	1    4550 4350
+F 0 "R28" H 4720 3346 50  0000 L CNN
+F 1 "732K" H 4720 3255 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4580 3300 50  0001 C CNN
+F 3 "~" H 4650 3300 50  0001 C CNN
+	1    4650 3300
 	0    1    -1   0   
 $EndComp
 $Comp
 L EggbotWireless-rescue:R-Device R?
 U 1 1 5E23AC93
-P 4200 4750
+P 4100 3500
 AR Path="/5E23AC93" Ref="R?"  Part="1" 
 AR Path="/5E1045DA/5E23AC93" Ref="R23"  Part="1" 
-F 0 "R23" H 4270 4796 50  0000 L CNN
-F 1 "50K" H 4270 4705 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4130 4750 50  0001 C CNN
-F 3 "~" H 4200 4750 50  0001 C CNN
-	1    4200 4750
+F 0 "R23" H 4170 3546 50  0000 L CNN
+F 1 "100K" H 4170 3455 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4030 3500 50  0001 C CNN
+F 3 "~" H 4100 3500 50  0001 C CNN
+	1    4100 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0159
-U 1 1 5E23B033
-P 3850 4050
-F 0 "#PWR0159" H 3850 3800 50  0001 C CNN
-F 1 "GND" H 3855 3877 50  0000 C CNN
-F 2 "" H 3850 4050 50  0001 C CNN
-F 3 "" H 3850 4050 50  0001 C CNN
-	1    3850 4050
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3850 3600 3850 4000
-Wire Wire Line
-	3850 4000 4100 4000
-Connection ~ 3850 4000
-Wire Wire Line
-	3850 4000 3850 4050
-Wire Wire Line
-	3000 3500 3350 3500
-Wire Wire Line
-	3650 3500 3750 3500
-$Comp
 L power:GND #PWR0160
 U 1 1 5E23D1E6
-P 3000 3900
-F 0 "#PWR0160" H 3000 3650 50  0001 C CNN
-F 1 "GND" H 3005 3727 50  0000 C CNN
-F 2 "" H 3000 3900 50  0001 C CNN
-F 3 "" H 3000 3900 50  0001 C CNN
-	1    3000 3900
+P 3500 4400
+F 0 "#PWR0160" H 3500 4150 50  0001 C CNN
+F 1 "GND" H 3505 4227 50  0000 C CNN
+F 2 "" H 3500 4400 50  0001 C CNN
+F 3 "" H 3500 4400 50  0001 C CNN
+	1    3500 4400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3000 3800 3000 3900
+	3500 4300 3500 4400
 Wire Wire Line
-	3000 3400 3000 3500
-Connection ~ 3000 3500
-Wire Wire Line
-	3750 3500 3750 3100
-Wire Wire Line
-	3750 3100 4050 3100
-Connection ~ 3750 3500
-Wire Wire Line
-	3750 3500 3850 3500
-Wire Wire Line
-	4350 3100 4750 3100
-Wire Wire Line
-	4750 3100 4750 3500
-Wire Wire Line
-	4750 3500 4600 3500
-Wire Wire Line
-	4750 3500 5400 3500
-Connection ~ 4750 3500
-Wire Wire Line
-	5700 3600 5700 3500
-Connection ~ 5700 3500
-Wire Wire Line
-	5700 3500 5950 3500
+	3500 3900 3500 4000
 $Comp
 L power:GND #PWR0161
 U 1 1 5E23F6D5
-P 5700 3900
-F 0 "#PWR0161" H 5700 3650 50  0001 C CNN
-F 1 "GND" H 5705 3727 50  0000 C CNN
-F 2 "" H 5700 3900 50  0001 C CNN
-F 3 "" H 5700 3900 50  0001 C CNN
-	1    5700 3900
+P 5750 3700
+F 0 "#PWR0161" H 5750 3450 50  0001 C CNN
+F 1 "GND" H 5755 3527 50  0000 C CNN
+F 2 "" H 5750 3700 50  0001 C CNN
+F 3 "" H 5750 3700 50  0001 C CNN
+	1    5750 3700
+	0    -1   -1   0   
+$EndComp
+$Comp
+L tps61023:TPS61023 U?
+U 1 1 5F047171
+P 4800 3600
+F 0 "U?" H 4825 3715 50  0000 C CNN
+F 1 "TPS61023" H 4825 3624 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-563" H 4800 3600 50  0001 C CNN
+F 3 "" H 4800 3600 50  0001 C CNN
+	1    4800 3600
+	1    0    0    -1  
+$EndComp
+Connection ~ 3500 4000
+$Comp
+L EggbotWireless-rescue:CP-Device C?
+U 1 1 5E2063BC
+P 3500 4150
+AR Path="/5E2063BC" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5E2063BC" Ref="C18"  Part="1" 
+F 0 "C18" H 3618 4196 50  0000 L CNN
+F 1 "68uF" H 3618 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:CP_Elec_4x5.8" H 3538 4000 50  0001 C CNN
+F 3 "~" H 3500 4150 50  0001 C CNN
+	1    3500 4150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4600 3600 4700 3600
+	4500 4000 4350 4000
 Wire Wire Line
-	4700 3600 4700 3700
+	4500 3900 4350 3900
 Wire Wire Line
-	4700 3700 4600 3700
+	4350 3900 4350 4000
+Wire Wire Line
+	5150 4000 5150 4400
+Wire Wire Line
+	3500 4000 3850 4000
+Wire Wire Line
+	3850 2800 3850 4000
+Connection ~ 3850 4000
+Wire Wire Line
+	3850 4000 4000 4000
+Wire Wire Line
+	5150 3800 5250 3800
+Wire Wire Line
+	6050 3900 6050 2800
+Wire Wire Line
+	5150 3900 6050 3900
+Wire Wire Line
+	5000 2800 6050 2800
 $Comp
-L EggbotWireless-rescue:R-Device R?
-U 1 1 5E24016D
-P 4700 3850
-AR Path="/5E24016D" Ref="R?"  Part="1" 
-AR Path="/5E1045DA/5E24016D" Ref="R29"  Part="1" 
-F 0 "R29" H 4770 3896 50  0000 L CNN
-F 1 "200K" H 4770 3805 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 4630 3850 50  0001 C CNN
-F 3 "~" H 4700 3850 50  0001 C CNN
-	1    4700 3850
+L power:GND #PWR?
+U 1 1 5F057A38
+P 4100 3750
+F 0 "#PWR?" H 4100 3500 50  0001 C CNN
+F 1 "GND" H 4105 3577 50  0000 C CNN
+F 2 "" H 4100 3750 50  0001 C CNN
+F 3 "" H 4100 3750 50  0001 C CNN
+	1    4100 3750
 	1    0    0    -1  
 $EndComp
-Connection ~ 4700 3700
+Connection ~ 4350 4000
 Wire Wire Line
-	4600 3800 4600 4000
+	3850 2800 4700 2800
 Wire Wire Line
-	4600 4000 4700 4000
+	4100 3750 4100 3650
+Wire Wire Line
+	4100 3350 4100 3300
+Wire Wire Line
+	4100 3300 4400 3300
+Wire Wire Line
+	4400 3300 4400 3800
+Wire Wire Line
+	4400 3800 4500 3800
+Connection ~ 4400 3300
+Wire Wire Line
+	4400 3300 4500 3300
+Wire Wire Line
+	4800 3300 5250 3300
+Wire Wire Line
+	5250 3300 5250 3800
+Connection ~ 5250 3800
+Wire Wire Line
+	5250 3800 5350 3800
 $Comp
-L EggbotWireless-rescue:R-Device R?
-U 1 1 5E240CB4
-P 5250 3700
-AR Path="/5E240CB4" Ref="R?"  Part="1" 
-AR Path="/5E1045DA/5E240CB4" Ref="R30"  Part="1" 
-F 0 "R30" H 5320 3746 50  0000 L CNN
-F 1 "500" H 5320 3655 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5180 3700 50  0001 C CNN
-F 3 "~" H 5250 3700 50  0001 C CNN
-	1    5250 3700
-	0    1    1    0   
+L EggbotWireless-rescue:C-Device C?
+U 1 1 5F074742
+P 4000 4150
+AR Path="/5F074742" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5F074742" Ref="C?"  Part="1" 
+F 0 "C?" H 4115 4196 50  0000 L CNN
+F 1 "10uF" H 4115 4105 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4038 4000 50  0001 C CNN
+F 3 "~" H 4000 4150 50  0001 C CNN
+	1    4000 4150
+	1    0    0    -1  
 $EndComp
+Connection ~ 4000 4000
 Wire Wire Line
-	4700 3700 5000 3700
-Wire Wire Line
-	5400 3700 5400 3500
-Connection ~ 5400 3500
-Wire Wire Line
-	5400 3500 5500 3500
+	4000 4000 4350 4000
 $Comp
-L EggbotWireless-rescue:C-Device-Catfi-rescue C?
-U 1 1 5E2417C9
-P 5000 4050
-AR Path="/5E2417C9" Ref="C?"  Part="1" 
-AR Path="/5E1045DA/5E2417C9" Ref="C20"  Part="1" 
-F 0 "C20" H 4900 3950 50  0000 R CNN
-F 1 "100nF" H 4900 4050 50  0000 R CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5038 3900 50  0001 C CNN
-F 3 "~" H 5000 4050 50  0001 C CNN
-	1    5000 4050
-	-1   0    0    -1  
-$EndComp
-Connection ~ 5000 3700
-Wire Wire Line
-	5000 3700 5100 3700
-$Comp
-L power:GND #PWR0162
-U 1 1 5E243BDD
-P 5000 4200
-F 0 "#PWR0162" H 5000 3950 50  0001 C CNN
-F 1 "GND" H 5005 4027 50  0000 C CNN
-F 2 "" H 5000 4200 50  0001 C CNN
-F 3 "" H 5000 4200 50  0001 C CNN
-	1    5000 4200
+L power:GND #PWR?
+U 1 1 5F077512
+P 4000 4400
+F 0 "#PWR?" H 4000 4150 50  0001 C CNN
+F 1 "GND" H 4005 4227 50  0000 C CNN
+F 2 "" H 4000 4400 50  0001 C CNN
+F 3 "" H 4000 4400 50  0001 C CNN
+	1    4000 4400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4200 4950 4200 4900
+	4000 4400 4000 4300
 Wire Wire Line
-	4400 4550 4200 4550
-Connection ~ 4200 4550
+	5350 3250 5350 3300
+$Comp
+L EggbotWireless-rescue:C-Device C?
+U 1 1 5F078162
+P 5600 3300
+AR Path="/5F078162" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5F078162" Ref="C?"  Part="1" 
+F 0 "C?" H 5715 3346 50  0000 L CNN
+F 1 "10uF" H 5715 3255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 5638 3150 50  0001 C CNN
+F 3 "~" H 5600 3300 50  0001 C CNN
+	1    5600 3300
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	4200 4550 4200 4600
+	5350 3300 5450 3300
+Connection ~ 5350 3300
 Wire Wire Line
-	4400 4350 4200 4350
-Connection ~ 4200 4350
+	5350 3300 5350 3700
 Wire Wire Line
-	4200 4350 4200 4550
+	5350 3700 5450 3700
+Connection ~ 5350 3700
 Wire Wire Line
-	4200 4000 4200 4350
-Wire Wire Line
-	4700 4350 4700 4550
-Wire Wire Line
-	4700 4550 5500 4550
-Wire Wire Line
-	5500 4550 5500 3500
-Connection ~ 4700 4550
-Connection ~ 5500 3500
-Wire Wire Line
-	5500 3500 5700 3500
-Wire Wire Line
-	5000 3700 5000 3900
+	5350 3700 5350 3800
+$Comp
+L power:GND #PWR?
+U 1 1 5F07A4BB
+P 5750 3300
+F 0 "#PWR?" H 5750 3050 50  0001 C CNN
+F 1 "GND" H 5755 3127 50  0000 C CNN
+F 2 "" H 5750 3300 50  0001 C CNN
+F 3 "" H 5750 3300 50  0001 C CNN
+	1    5750 3300
+	0    -1   -1   0   
+$EndComp
+$Comp
+L EggbotWireless-rescue:CP-Device C?
+U 1 1 5E217A35
+P 5600 3700
+AR Path="/5E217A35" Ref="C?"  Part="1" 
+AR Path="/5E1045DA/5E217A35" Ref="C21"  Part="1" 
+F 0 "C21" H 5718 3746 50  0000 L CNN
+F 1 "220uF" H 5718 3655 50  0000 L CNN
+F 2 "Capacitor_SMD:CP_Elec_8x10.5" H 5638 3550 50  0001 C CNN
+F 3 "~" H 5600 3700 50  0001 C CNN
+	1    5600 3700
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
diff --git a/Electronics/EggbotWireless/EggbotWireless-cache.lib b/Electronics/EggbotWireless/EggbotWireless-cache.lib
index e4f70b2..0d45b8c 100644
--- a/Electronics/EggbotWireless/EggbotWireless-cache.lib
+++ b/Electronics/EggbotWireless/EggbotWireless-cache.lib
@@ -882,26 +882,6 @@ X Shield 6 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LM2621_LM2621
-#
-DEF LM2621_LM2621 U 0 40 Y Y 1 F N
-F0 "U" 0 50 50 H V C CNN
-F1 "LM2621_LM2621" 0 150 50 H V C CNN
-F2 "Package_SO:VSSOP-8_3.0x3.0mm_P0.65mm" -100 -50 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -300 0 250 -500 0 1 0 f
-X PGND 1 -400 -200 100 R 50 50 1 1 W
-X EN 2 350 -200 100 L 50 50 1 1 I
-X FREQ 3 350 -400 100 L 50 50 1 1 I
-X FB 4 -50 -600 100 U 50 50 1 1 I
-X SGND 5 -150 -600 100 U 50 50 1 1 W
-X VDD 6 350 -300 100 L 50 50 1 1 W
-X BOOT 7 350 -100 100 L 50 50 1 1 O
-X SW 8 -400 -100 100 R 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
 # LM3478_LM3478
 #
 DEF LM3478_LM3478 U 0 40 Y Y 1 F N
@@ -950,4 +930,22 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# tps61023_TPS61023
+#
+DEF tps61023_TPS61023 U 0 40 Y Y 1 F N
+F0 "U" -100 50 50 H V C CNN
+F1 "tps61023_TPS61023" 200 50 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-563" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -200 -50 250 -500 0 1 0 f
+X FB 1 -300 -200 100 R 50 50 1 1 I
+X EN 2 -300 -300 100 R 50 50 1 1 I
+X VIN 3 -300 -400 100 R 50 50 1 1 W
+X GND 4 350 -400 100 L 50 50 1 1 w
+X SW 5 350 -300 100 L 50 50 1 1 w
+X VOUT 6 350 -200 100 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/Electronics/EggbotWireless/EggbotWireless.sch b/Electronics/EggbotWireless/EggbotWireless.sch
index 7fb0c9d..e27d279 100644
--- a/Electronics/EggbotWireless/EggbotWireless.sch
+++ b/Electronics/EggbotWireless/EggbotWireless.sch
@@ -2015,12 +2015,6 @@ Connection ~ 4400 4350
 Wire Wire Line
 	4400 4350 4400 6100
 Connection ~ 4350 4550
-$Sheet
-S 5450 6600 1200 950 
-U 5E1045DA
-F0 "5v Boost" 50
-F1 "5vBoost.sch" 50
-$EndSheet
 Wire Wire Line
 	10450 1400 10550 1400
 Connection ~ 10450 1400
@@ -2151,4 +2145,10 @@ F 3 "~" H 2950 4350 50  0001 C CNN
 $EndComp
 Text GLabel 3250 4350 3    50   Input ~ 0
 SERVOPWR
+$Sheet
+S 5450 6600 1200 950 
+U 5E1045DA
+F0 "5v Boost" 50
+F1 "5vBoost.sch" 50
+$EndSheet
 $EndSCHEMATC
diff --git a/Electronics/EggbotWireless/EggbotWireless.sch-bak b/Electronics/EggbotWireless/EggbotWireless.sch-bak
index 5dacc99..e27d279 100644
--- a/Electronics/EggbotWireless/EggbotWireless.sch-bak
+++ b/Electronics/EggbotWireless/EggbotWireless.sch-bak
@@ -2015,12 +2015,6 @@ Connection ~ 4400 4350
 Wire Wire Line
 	4400 4350 4400 6100
 Connection ~ 4350 4550
-$Sheet
-S 5450 6600 1200 950 
-U 5E1045DA
-F0 "5v Boost" 50
-F1 "5vBoost.sch" 50
-$EndSheet
 Wire Wire Line
 	10450 1400 10550 1400
 Connection ~ 10450 1400
@@ -2128,10 +2122,10 @@ Wire Wire Line
 Text GLabel 3200 3600 0    50   Input ~ 0
 SERVOPWR
 $Comp
-L EggbotWireless-rescue:+5V-power #PWR?
+L EggbotWireless-rescue:+5V-power #PWR0163
 U 1 1 5F040FF3
 P 2650 4350
-F 0 "#PWR?" H 2650 4200 50  0001 C CNN
+F 0 "#PWR0163" H 2650 4200 50  0001 C CNN
 F 1 "+5V" H 2665 4523 50  0000 C CNN
 F 2 "" H 2650 4350 50  0001 C CNN
 F 3 "" H 2650 4350 50  0001 C CNN
@@ -2139,10 +2133,10 @@ F 3 "" H 2650 4350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:Jumper JP?
+L Device:Jumper JP4
 U 1 1 5F042E8B
 P 2950 4350
-F 0 "JP?" H 2950 4614 50  0000 C CNN
+F 0 "JP4" H 2950 4614 50  0000 C CNN
 F 1 "Jumper" H 2950 4523 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 2950 4350 50  0001 C CNN
 F 3 "~" H 2950 4350 50  0001 C CNN
@@ -2151,4 +2145,10 @@ F 3 "~" H 2950 4350 50  0001 C CNN
 $EndComp
 Text GLabel 3250 4350 3    50   Input ~ 0
 SERVOPWR
+$Sheet
+S 5450 6600 1200 950 
+U 5E1045DA
+F0 "5v Boost" 50
+F1 "5vBoost.sch" 50
+$EndSheet
 $EndSCHEMATC