diff --git a/hardware/bubblegum/bubblegum-cache.lib b/hardware/bubblegum/bubblegum-cache.lib
index eb8b72e2..f215ba74 100644
--- a/hardware/bubblegum/bubblegum-cache.lib
+++ b/hardware/bubblegum/bubblegum-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Sun Jul  1 07:30:52 2012
+EESchema-LIBRARY Version 2.3  Date: Sun Jul  1 13:58:35 2012
 #encoding utf-8
 #
 # BALUN
@@ -83,6 +83,22 @@ X ~ 10 400 -200 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
+# DMC2400
+#
+DEF DMC2400 U 0 40 Y Y 1 F N
+F0 "U" -50 0 60 V V C CNN
+F1 "DMC2400" 50 0 60 V V C CNN
+DRAW
+S -250 250 250 -250 0 1 0 N
+X S1 1 -400 100 150 R 50 50 1 1 B
+X G1 2 -400 0 150 R 50 50 1 1 I
+X D2 3 -400 -100 150 R 50 50 1 1 B
+X S2 4 400 -100 150 L 50 50 1 1 B
+X G2 5 400 0 150 L 50 50 1 1 I
+X D1 6 400 100 150 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # FIL-DEA
 #
 DEF FIL-DEA U 0 40 Y Y 1 F N
@@ -197,42 +213,18 @@ X 2 2 0 -300 100 U 70 70 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MOS_N
+# NCP699
 #
-DEF MOS_N Q 0 0 N Y 1 F N
-F0 "Q" 10 170 60 H V R CNN
-F1 "MOS_N" 10 -150 60 H V R CNN
-ALIAS MOSFET_N
+DEF NCP699 U 0 40 Y Y 1 F N
+F0 "U" 0 200 60 H V C CNN
+F1 "NCP699" 0 -200 60 H V C CNN
 DRAW
-P 2 0 1 8  -50 -100  -50 100 N
-P 2 0 1 10  0 -150  0 150 N
-P 2 0 1 0  100 -100  0 -100 N
-P 2 0 1 0  100 100  0 100 N
-P 3 0 1 8  100 -100  100 0  50 0 N
-P 5 0 1 8  50 30  50 -30  0 0  50 30  50 30 N
-X D D 100 200 100 D 40 40 1 1 P
-X G G -200 0 150 R 40 40 1 1 I
-X S S 100 -200 100 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# MOS_P
-#
-DEF MOS_P Q 0 40 Y N 1 F N
-F0 "Q" 0 190 60 H V R CNN
-F1 "MOS_P" 0 -180 60 H V R CNN
-ALIAS MOSFET_P
-DRAW
-P 2 0 1 8  -50 -100  -50 100 N
-P 2 0 1 10  0 -150  0 150 N
-P 2 0 1 8  30 0  0 0 N
-P 2 0 1 0  100 -100  0 -100 N
-P 2 0 1 0  100 100  0 100 N
-P 3 0 1 0  80 0  100 0  100 -100 N
-P 5 0 1 8  30 40  30 -30  80 0  30 40  30 40 N
-X D D 100 200 100 D 40 40 1 1 P
-X G G -200 0 150 R 40 40 1 1 I
-X S S 100 -200 100 U 40 40 1 1 P
+S -250 250 250 -250 0 1 0 N
+X VIN 1 -400 100 150 R 50 50 1 1 W
+X GND 2 -400 0 150 R 50 50 1 1 W
+X EN 3 -400 -100 150 R 50 50 1 1 I
+X NC 4 400 -100 150 L 50 50 1 1 N
+X VOUT 5 400 100 150 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/bubblegum/bubblegum.sch b/hardware/bubblegum/bubblegum.sch
index 5f9c9fab..8b26151b 100644
--- a/hardware/bubblegum/bubblegum.sch
+++ b/hardware/bubblegum/bubblegum.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sun Jul  1 07:30:52 2012
+EESchema Schematic File Version 2  date Sun Jul  1 13:58:34 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -45,46 +45,140 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 11100 2450 0    40   ~ 0
-FIXME: This should be pulled below GND in bypass\nmode, or perhaps everything could be biased to 1V8\nin normal mode.
+Wire Wire Line
+	9450 7900 9450 7800
+Wire Wire Line
+	9900 6350 9900 6250
+Wire Wire Line
+	9900 6250 8950 6250
+Connection ~ 10600 2450
+Wire Wire Line
+	10600 2450 10450 2450
+Wire Wire Line
+	10450 2450 10450 2550
+Wire Wire Line
+	8200 5900 8200 5800
+Wire Wire Line
+	8650 5500 8650 5400
+Connection ~ 11800 1650
+Wire Wire Line
+	11800 1950 11800 1650
+Connection ~ 7300 3450
+Wire Wire Line
+	7650 3450 7300 3450
+Connection ~ 11750 8500
+Wire Wire Line
+	11750 8800 11750 8500
+Connection ~ 7200 7400
+Wire Wire Line
+	7550 7400 7200 7400
+Connection ~ 8250 9600
+Wire Wire Line
+	8550 9600 8000 9600
+Wire Wire Line
+	6800 10200 6800 10100
+Connection ~ 7000 9600
+Wire Wire Line
+	7200 9600 6800 9600
+Wire Wire Line
+	7100 9700 7200 9700
+Wire Wire Line
+	1500 9800 1100 9800
+Wire Wire Line
+	7300 3550 7300 3250
+Wire Wire Line
+	7300 3250 7400 3250
+Wire Wire Line
+	11400 2100 11100 2100
+Wire Wire Line
+	11100 2100 11100 2200
+Wire Wire Line
+	10900 3200 10900 3000
+Wire Wire Line
+	11100 3000 11100 3100
+Wire Wire Line
+	11100 3100 10600 3100
+Wire Wire Line
+	10600 3100 10600 2100
+Wire Wire Line
+	10600 2100 10900 2100
+Wire Wire Line
+	10900 2100 10900 2200
+Wire Wire Line
+	11000 3000 11000 3200
+Wire Wire Line
+	11000 3200 11400 3200
+Wire Wire Line
+	11000 2200 11000 2000
+Wire Wire Line
+	11000 2000 11400 2000
+Wire Wire Line
+	10400 6950 10000 6950
+Wire Wire Line
+	10000 6950 10000 7150
+Wire Wire Line
+	10400 8150 10000 8150
+Wire Wire Line
+	10000 8150 10000 7950
+Wire Wire Line
+	9900 6950 9900 7150
+Wire Wire Line
+	8150 4800 8150 4900
+Wire Wire Line
+	7800 5000 8250 5000
+Wire Wire Line
+	8250 5000 8250 4800
+Wire Wire Line
+	8350 3800 8350 4000
+Wire Wire Line
+	8350 4800 8350 4900
+Wire Wire Line
+	8350 4900 8650 4900
+Wire Wire Line
+	8150 4000 8150 3900
+Wire Wire Line
+	8150 3900 8650 3900
+Wire Wire Line
+	8150 4900 7800 4900
+Wire Wire Line
+	8250 4000 8250 3800
+Wire Wire Line
+	8250 3800 7800 3800
+Wire Wire Line
+	7200 5200 7650 5200
+Wire Wire Line
+	7650 5200 7650 5400
+Wire Wire Line
+	7200 6300 7550 6300
+Connection ~ 8050 6050
+Wire Wire Line
+	8050 5300 8050 6300
+Wire Wire Line
+	7550 5400 7550 5300
 Connection ~ 13600 6050
 Wire Wire Line
 	13600 6050 13600 6300
-Connection ~ 3150 9300
+Connection ~ 3300 9300
 Wire Wire Line
-	3150 9200 3150 9400
+	3300 9200 3300 9400
 Wire Wire Line
-	3150 9900 3150 9800
+	3300 9900 3300 9800
 Wire Wire Line
-	11850 8500 11950 8500
+	11950 8500 11450 8500
 Wire Wire Line
-	11850 1650 11950 1650
-Wire Wire Line
-	10900 2550 11000 2550
-Wire Wire Line
-	11000 2550 11000 2450
-Wire Wire Line
-	10500 2250 10600 2250
-Wire Wire Line
-	10600 2250 10600 2350
-Wire Wire Line
-	10050 7250 10050 7350
-Wire Wire Line
-	10050 7350 9950 7350
-Wire Wire Line
-	9650 7050 9650 7150
+	11950 1650 11500 1650
 Wire Wire Line
 	6900 1950 6900 2050
 Connection ~ 6300 8050
 Wire Wire Line
-	6300 8050 6550 8050
+	6550 8050 6300 8050
 Wire Wire Line
 	6300 7650 6300 8150
 Wire Wire Line
 	6400 5900 6400 6000
 Connection ~ 6600 3550
 Wire Wire Line
-	6600 3550 6850 3550
+	6850 3550 6600 3550
 Wire Wire Line
 	6600 4150 6600 4050
 Wire Wire Line
@@ -100,11 +194,11 @@ Wire Wire Line
 Wire Wire Line
 	8850 8700 8850 7500
 Wire Wire Line
-	7000 7650 7000 7750
+	6850 7650 6850 7750
 Wire Wire Line
-	7300 6800 7000 6800
+	7300 6800 6850 6800
 Wire Wire Line
-	7000 7750 6400 7750
+	6850 7750 6400 7750
 Wire Wire Line
 	6400 7750 6400 7650
 Wire Wire Line
@@ -124,7 +218,7 @@ Wire Wire Line
 Wire Wire Line
 	6450 3450 6500 3450
 Wire Wire Line
-	7000 2950 7000 2850
+	7100 2950 7100 2850
 Wire Wire Line
 	6700 3150 6700 3450
 Wire Wire Line
@@ -136,7 +230,7 @@ Wire Wire Line
 Wire Wire Line
 	6500 3450 6500 3150
 Wire Wire Line
-	2700 9800 2800 9800
+	2700 9800 3100 9800
 Connection ~ 16000 8800
 Wire Wire Line
 	16000 8800 15900 8800
@@ -160,25 +254,19 @@ Connection ~ 5150 9600
 Wire Wire Line
 	5150 9600 5050 9600
 Wire Wire Line
-	3850 9900 4250 9900
+	3900 9900 4250 9900
 Wire Wire Line
-	3850 9700 4250 9700
+	3900 9700 4250 9700
 Wire Wire Line
-	4250 9500 3850 9500
+	4250 9500 3900 9500
 Wire Wire Line
 	2100 10350 2100 10250
 Wire Wire Line
-	2700 9700 2900 9700
+	2700 9700 3100 9700
 Wire Wire Line
-	1250 9600 1500 9600
+	1100 9600 1500 9600
 Wire Wire Line
-	1250 9400 1500 9400
-Connection ~ 7100 5350
-Wire Wire Line
-	7000 5350 7550 5350
-Connection ~ 7700 4150
-Wire Wire Line
-	7600 4150 8150 4150
+	1100 9400 1500 9400
 Connection ~ 1950 6250
 Wire Wire Line
 	1750 6250 2250 6250
@@ -264,7 +352,7 @@ Wire Wire Line
 Wire Wire Line
 	13400 5850 13400 5750
 Wire Wire Line
-	14100 5750 14100 6050
+	14100 6050 14100 5750
 Wire Wire Line
 	12750 5250 13500 5250
 Connection ~ 14100 5250
@@ -272,7 +360,7 @@ Wire Wire Line
 	14100 5350 14100 5250
 Connection ~ 13400 5250
 Wire Wire Line
-	13100 5350 13100 5250
+	13100 5250 13100 5350
 Wire Wire Line
 	11450 3950 11450 4050
 Wire Wire Line
@@ -368,35 +456,21 @@ Wire Wire Line
 	13450 8900 13550 8900
 Wire Wire Line
 	13550 8900 13550 9300
-Wire Wire Line
-	7850 5050 7850 5150
 Wire Wire Line
 	9800 4650 9800 4850
 Wire Wire Line
 	9800 4850 10850 4850
 Wire Wire Line
-	9650 6350 8950 6350
+	8950 6250 8950 6600
 Wire Wire Line
-	8950 6350 8950 6600
+	8850 6150 9350 6150
 Wire Wire Line
-	8850 6250 9350 6250
-Wire Wire Line
-	8850 6250 8850 6600
+	8850 6150 8850 6600
 Wire Wire Line
 	9650 5450 9650 5150
 Wire Wire Line
 	9650 5150 10850 5150
 Connection ~ 9350 6050
-Wire Wire Line
-	8150 6050 8050 6050
-Wire Wire Line
-	8050 6050 8050 5650
-Wire Wire Line
-	7300 4450 7700 4450
-Wire Wire Line
-	8150 4750 7700 4750
-Wire Wire Line
-	8450 4350 8450 4550
 Connection ~ 9500 4150
 Wire Wire Line
 	9350 4150 9500 4150
@@ -420,8 +494,6 @@ Wire Wire Line
 	2350 6150 2350 6250
 Wire Wire Line
 	2250 5250 2250 5150
-Wire Wire Line
-	7300 3250 7400 3250
 Wire Wire Line
 	4150 3450 4150 3150
 Wire Wire Line
@@ -429,7 +501,7 @@ Wire Wire Line
 Wire Wire Line
 	6050 3750 5950 3750
 Wire Wire Line
-	7200 7200 7300 7200
+	7300 7200 7200 7200
 Wire Wire Line
 	8750 7500 8750 7600
 Wire Wire Line
@@ -534,34 +606,6 @@ Wire Wire Line
 	9400 2950 9500 2950
 Wire Wire Line
 	9500 2950 9500 4250
-Wire Wire Line
-	8450 5050 8450 4950
-Wire Wire Line
-	8450 4450 8650 4450
-Connection ~ 8450 4450
-Wire Wire Line
-	8650 4450 8650 4150
-Wire Wire Line
-	8650 4150 8750 4150
-Wire Wire Line
-	8450 3850 8450 3950
-Wire Wire Line
-	7700 4750 7700 4150
-Connection ~ 7700 4450
-Connection ~ 7100 5650
-Wire Wire Line
-	7100 5350 7100 5950
-Connection ~ 7850 5650
-Wire Wire Line
-	8050 5650 7850 5650
-Wire Wire Line
-	7850 6250 7850 6150
-Wire Wire Line
-	7850 5750 7850 5550
-Wire Wire Line
-	7100 5950 7550 5950
-Wire Wire Line
-	6700 5650 7100 5650
 Wire Wire Line
 	8750 6050 9350 6050
 Wire Wire Line
@@ -571,14 +615,14 @@ Wire Wire Line
 Wire Wire Line
 	9400 6800 9300 6800
 Wire Wire Line
-	9350 6250 9350 5850
+	9350 6150 9350 5850
 Wire Wire Line
 	9500 4650 9500 4950
 Wire Wire Line
 	9500 4950 10850 4950
 Wire Wire Line
-	9650 6450 9650 5850
-Connection ~ 9650 6350
+	9650 6250 9650 5850
+Connection ~ 9650 6250
 Wire Wire Line
 	9800 4250 9800 2250
 Connection ~ 9800 2850
@@ -658,7 +702,7 @@ Wire Wire Line
 Wire Wire Line
 	12750 4850 15400 4850
 Wire Wire Line
-	13400 5250 13400 5350
+	13400 5350 13400 5250
 Connection ~ 13100 5250
 Wire Wire Line
 	14000 5250 14200 5250
@@ -755,23 +799,19 @@ Wire Wire Line
 Wire Wire Line
 	1950 6850 1950 6750
 Wire Wire Line
-	7000 4150 7100 4150
+	1500 9300 1100 9300
 Wire Wire Line
-	6400 5350 6500 5350
+	1500 9500 1100 9500
 Wire Wire Line
-	1500 9300 1250 9300
-Wire Wire Line
-	1500 9500 1250 9500
-Wire Wire Line
-	2700 9600 2900 9600
+	2700 9600 3100 9600
 Wire Wire Line
 	1400 10000 1400 9900
 Wire Wire Line
 	1400 9900 1500 9900
 Wire Wire Line
-	3850 9600 4250 9600
+	3900 9600 4250 9600
 Wire Wire Line
-	4250 9800 3850 9800
+	4250 9800 3900 9800
 Wire Wire Line
 	5150 10000 5150 9500
 Wire Wire Line
@@ -799,17 +839,17 @@ Connection ~ 16000 8700
 Wire Wire Line
 	16000 8700 15900 8700
 Wire Wire Line
-	1400 9700 1500 9700
+	1100 9700 1500 9700
 Wire Wire Line
 	6600 1750 6600 2250
 Wire Wire Line
-	7000 2850 7400 2850
+	7100 2850 7400 2850
 Wire Wire Line
 	8200 2850 8500 2850
 Wire Wire Line
-	6700 3450 7000 3450
+	6700 3450 7100 3450
 Wire Wire Line
-	7000 3450 7000 3350
+	7100 3450 7100 3350
 Wire Wire Line
 	5950 3450 6050 3450
 Wire Wire Line
@@ -833,7 +873,7 @@ Wire Wire Line
 Wire Wire Line
 	6200 6650 6200 6750
 Wire Wire Line
-	7000 6800 7000 7250
+	6850 6800 6850 7250
 Wire Wire Line
 	11950 8300 8950 8300
 Wire Wire Line
@@ -855,19 +895,413 @@ Wire Wire Line
 	2650 4650 3400 4650
 Wire Wire Line
 	3400 4650 3400 3150
-Wire Wire Line
-	9650 7550 9650 7650
-Wire Wire Line
-	10600 2850 10600 2750
 Wire Wire Line
 	9800 2250 9900 2250
 Wire Wire Line
-	3150 9300 2700 9300
+	3300 9300 2700 9300
 Wire Wire Line
 	2700 9400 2800 9400
 Wire Wire Line
 	2800 9400 2800 9300
 Connection ~ 2800 9300
+Wire Wire Line
+	8150 6050 8050 6050
+Wire Wire Line
+	8050 6300 7750 6300
+Wire Wire Line
+	7750 6300 7750 6200
+Wire Wire Line
+	7750 5200 7750 5400
+Wire Wire Line
+	7650 6200 7650 6400
+Wire Wire Line
+	7650 6400 7200 6400
+Wire Wire Line
+	7550 6300 7550 6200
+Wire Wire Line
+	8750 4150 8650 4150
+Connection ~ 8650 4150
+Wire Wire Line
+	9900 7050 9600 7050
+Connection ~ 9900 7050
+Wire Wire Line
+	9600 7050 9600 8050
+Wire Wire Line
+	9600 8050 10100 8050
+Wire Wire Line
+	10100 8050 10100 7950
+Wire Wire Line
+	9900 8150 9900 7950
+Wire Wire Line
+	10100 7150 10100 7050
+Wire Wire Line
+	10100 7050 10400 7050
+Wire Wire Line
+	10500 2250 10600 2250
+Connection ~ 10600 2250
+Wire Wire Line
+	7200 7200 7200 7500
+Wire Wire Line
+	2700 9900 3100 9900
+Wire Wire Line
+	7200 9800 7000 9800
+Wire Wire Line
+	7000 9800 7000 9600
+Wire Wire Line
+	6800 9500 6800 9700
+Connection ~ 6800 9600
+Wire Wire Line
+	8250 9600 8250 9700
+Wire Wire Line
+	8250 10200 8250 10100
+Wire Wire Line
+	7200 8000 7200 7900
+Wire Wire Line
+	11750 9300 11750 9200
+Wire Wire Line
+	7300 4050 7300 3950
+Wire Wire Line
+	11800 2450 11800 2350
+Wire Wire Line
+	8650 3900 8650 5000
+Connection ~ 8650 4900
+Wire Wire Line
+	8200 5400 8200 5300
+Wire Wire Line
+	8200 5300 7550 5300
+Connection ~ 8050 5300
+Wire Wire Line
+	10450 3050 10450 2950
+Wire Wire Line
+	9600 7300 9450 7300
+Wire Wire Line
+	9450 7300 9450 7400
+Connection ~ 9600 7300
+$Comp
+L GND #PWR?
+U 1 1 4FF0A59E
+P 9450 7900
+F 0 "#PWR?" H 9450 7900 30  0001 C CNN
+F 1 "GND" H 9450 7830 30  0001 C CNN
+	1    9450 7900
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A563
+P 9450 7600
+F 0 "C?" H 9500 7700 50  0000 L CNN
+F 1 "100nF" H 9500 7500 50  0000 L CNN
+	1    9450 7600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A55E
+P 10450 3050
+F 0 "#PWR?" H 10450 3050 30  0001 C CNN
+F 1 "GND" H 10450 2980 30  0001 C CNN
+	1    10450 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A552
+P 10450 2750
+F 0 "C?" H 10500 2850 50  0000 L CNN
+F 1 "100nF" H 10500 2650 50  0000 L CNN
+	1    10450 2750
+	-1   0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A549
+P 8200 5900
+F 0 "#PWR?" H 8200 5900 30  0001 C CNN
+F 1 "GND" H 8200 5830 30  0001 C CNN
+	1    8200 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A543
+P 8200 5600
+F 0 "C?" H 8250 5700 50  0000 L CNN
+F 1 "100nF" H 8250 5500 50  0000 L CNN
+	1    8200 5600
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A53B
+P 8650 5500
+F 0 "#PWR?" H 8650 5500 30  0001 C CNN
+F 1 "GND" H 8650 5430 30  0001 C CNN
+	1    8650 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A536
+P 8650 5200
+F 0 "C?" H 8700 5300 50  0000 L CNN
+F 1 "100nF" H 8700 5100 50  0000 L CNN
+	1    8650 5200
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A51D
+P 11800 2450
+F 0 "#PWR?" H 11800 2450 30  0001 C CNN
+F 1 "GND" H 11800 2380 30  0001 C CNN
+	1    11800 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A511
+P 11800 2150
+F 0 "C?" H 11850 2250 50  0000 L CNN
+F 1 "100nF" H 11850 2050 50  0000 L CNN
+	1    11800 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A50C
+P 7300 4050
+F 0 "#PWR?" H 7300 4050 30  0001 C CNN
+F 1 "GND" H 7300 3980 30  0001 C CNN
+	1    7300 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A4DC
+P 7300 3750
+F 0 "C?" H 7350 3850 50  0000 L CNN
+F 1 "100nF" H 7350 3650 50  0000 L CNN
+	1    7300 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A4BF
+P 11750 9300
+F 0 "#PWR?" H 11750 9300 30  0001 C CNN
+F 1 "GND" H 11750 9230 30  0001 C CNN
+	1    11750 9300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A4B3
+P 11750 9000
+F 0 "C?" H 11800 9100 50  0000 L CNN
+F 1 "100nF" H 11800 8900 50  0000 L CNN
+	1    11750 9000
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF0A4AE
+P 7200 8000
+F 0 "#PWR?" H 7200 8000 30  0001 C CNN
+F 1 "GND" H 7200 7930 30  0001 C CNN
+	1    7200 8000
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF0A494
+P 7200 7700
+F 0 "C?" H 7250 7800 50  0000 L CNN
+F 1 "100nF" H 7250 7600 50  0000 L CNN
+	1    7200 7700
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF08E3E
+P 8250 10200
+F 0 "#PWR?" H 8250 10200 30  0001 C CNN
+F 1 "GND" H 8250 10130 30  0001 C CNN
+	1    8250 10200
+	1    0    0    -1  
+$EndComp
+Text Label 8550 9600 2    40   ~ 0
+MIX_BIAS
+$Comp
+L C C?
+U 1 1 4FF08E2E
+P 8250 9900
+F 0 "C?" H 8300 10000 50  0000 L CNN
+F 1 "1uF" H 8300 9800 50  0000 L CNN
+	1    8250 9900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF08E28
+P 6800 10200
+F 0 "#PWR?" H 6800 10200 30  0001 C CNN
+F 1 "GND" H 6800 10130 30  0001 C CNN
+	1    6800 10200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCC #PWR?
+U 1 1 4FF08E20
+P 6800 9500
+F 0 "#PWR?" H 6800 9600 30  0001 C CNN
+F 1 "VCC" H 6800 9600 30  0000 C CNN
+	1    6800 9500
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 4FF08E0E
+P 6800 9900
+F 0 "C?" H 6850 10000 50  0000 L CNN
+F 1 "1uF" H 6850 9800 50  0000 L CNN
+	1    6800 9900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 4FF08E09
+P 7100 9700
+F 0 "#PWR?" H 7100 9700 30  0001 C CNN
+F 1 "GND" H 7100 9630 30  0001 C CNN
+	1    7100 9700
+	0    1    1    0   
+$EndComp
+$Comp
+L NCP699 U?
+U 1 1 4FF08E02
+P 7600 9700
+F 0 "U?" H 7600 9900 60  0000 C CNN
+F 1 "NCP699" H 7600 9500 60  0000 C CNN
+F 4 "ON Semiconductor" H 7600 9700 60  0001 C CNN "Manufacturer"
+F 5 "NCP699SN15T1G" H 7600 9700 60  0001 C CNN "Part Number"
+F 6 "IC REG LDO 150MA 1.5V 5TSOP" H 7600 9700 60  0001 C CNN "Description"
+	1    7600 9700
+	1    0    0    -1  
+$EndComp
+$Comp
+L DMC2400 U?
+U 1 1 4FF07EB1
+P 11000 2600
+F 0 "U?" V 10950 2600 60  0000 C CNN
+F 1 "DMN2400" V 11050 2600 60  0000 C CNN
+F 4 "Diodes Inc." H 11000 2600 60  0001 C CNN "Manufacturer"
+F 5 "DMN2400UV-7" H 11000 2600 60  0001 C CNN "Part Number"
+F 6 "MOSFET 2N-CH 20V 1.33A SOT563" H 11000 2600 60  0001 C CNN "Description"
+	1    11000 2600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L DMC2400 U?
+U 1 1 4FF07E88
+P 7650 5800
+F 0 "U?" V 7600 5800 60  0000 C CNN
+F 1 "DMC2400" V 7700 5800 60  0000 C CNN
+F 4 "Diodes Inc." H 7650 5800 60  0001 C CNN "Manufacturer"
+F 5 "DMC2400UV-7" H 7650 5800 60  0001 C CNN "Part Number"
+F 6 "MOSFET N P CH 20V SOT563" H 7650 5800 60  0001 C CNN "Description"
+	1    7650 5800
+	0    -1   -1   0   
+$EndComp
+Text Label 3100 9900 2    40   ~ 0
+!TX_BYPASS
+Text Label 3100 9800 2    40   ~ 0
+TX_BYPASS
+Text Label 1100 9800 0    40   ~ 0
+!RX_BYPASS
+Text Label 1100 9700 0    40   ~ 0
+RX_BYPASS
+Text Label 11450 8500 0    40   ~ 0
+MIX_BIAS
+Text Label 7550 7400 2    40   ~ 0
+MIX_BIAS
+Text Label 7650 3450 2    40   ~ 0
+MIX_BIAS
+Text Label 11500 1650 0    40   ~ 0
+MIX_BIAS
+$Comp
+L GND #PWR?
+U 1 1 4FF07B92
+P 10900 3200
+F 0 "#PWR?" H 10900 3200 30  0001 C CNN
+F 1 "GND" H 10900 3130 30  0001 C CNN
+	1    10900 3200
+	1    0    0    -1  
+$EndComp
+Text Label 11400 2100 2    40   ~ 0
+MIX_BIAS
+Text Label 11400 3200 2    40   ~ 0
+RX_BYPASS
+Text Label 11400 2000 2    40   ~ 0
+!RX_BYPASS
+Text Label 10400 6950 2    40   ~ 0
+!TX_BYPASS
+Text Label 10400 8150 2    40   ~ 0
+TX_BYPASS
+Text Label 10400 7050 2    40   ~ 0
+MIX_BIAS
+$Comp
+L GND #PWR?
+U 1 1 4FF07A67
+P 9900 8150
+F 0 "#PWR?" H 9900 8150 30  0001 C CNN
+F 1 "GND" H 9900 8080 30  0001 C CNN
+	1    9900 8150
+	1    0    0    -1  
+$EndComp
+$Comp
+L DMC2400 U?
+U 1 1 4FF07A29
+P 10000 7550
+F 0 "U?" V 9950 7550 60  0000 C CNN
+F 1 "DMN2400" V 10050 7550 60  0000 C CNN
+F 4 "Diodes Inc." H 10000 7550 60  0001 C CNN "Manufacturer"
+F 5 "DMN2400UV-7" H 10000 7550 60  0001 C CNN "Part Number"
+F 6 "MOSFET 2N-CH 20V 1.33A SOT563" H 10000 7550 60  0001 C CNN "Description"
+	1    10000 7550
+	0    -1   -1   0   
+$EndComp
+Text Label 7800 5000 0    40   ~ 0
+!RX_BYPASS
+$Comp
+L VCC #PWR?
+U 1 1 4FF07993
+P 8350 3800
+F 0 "#PWR?" H 8350 3900 30  0001 C CNN
+F 1 "VCC" H 8350 3900 30  0000 C CNN
+	1    8350 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L DMC2400 U?
+U 1 1 4FF07992
+P 8250 4400
+F 0 "U?" V 8200 4400 60  0000 C CNN
+F 1 "DMC2400" V 8300 4400 60  0000 C CNN
+F 4 "Diodes Inc." H 8250 4400 60  0001 C CNN "Manufacturer"
+F 5 "DMC2400UV-7" H 8250 4400 60  0001 C CNN "Part Number"
+F 6 "MOSFET N P CH 20V SOT563" H 8250 4400 60  0001 C CNN "Description"
+	1    8250 4400
+	0    -1   -1   0   
+$EndComp
+Text Label 7800 4900 0    40   ~ 0
+MIX_BIAS
+Text Label 7800 3800 0    40   ~ 0
+!RX_BYPASS
+Text Label 7200 5200 0    40   ~ 0
+!TX_BYPASS
+Text Label 7200 6300 0    40   ~ 0
+MIX_BIAS
 $Comp
 L GND #PWR?
 U 1 1 4FEF438B
@@ -882,81 +1316,25 @@ switch control logic ensures valid switch configurations
 $Comp
 L GND #PWR?
 U 1 1 4FEBDCB9
-P 3150 9900
-F 0 "#PWR?" H 3150 9900 30  0001 C CNN
-F 1 "GND" H 3150 9830 30  0001 C CNN
-	1    3150 9900
+P 3300 9900
+F 0 "#PWR?" H 3300 9900 30  0001 C CNN
+F 1 "GND" H 3300 9830 30  0001 C CNN
+	1    3300 9900
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 4FEBDCA5
-P 3150 9600
-F 0 "C?" H 3200 9700 50  0000 L CNN
-F 1 "100nF" H 3200 9500 50  0000 L CNN
-	1    3150 9600
+P 3300 9600
+F 0 "C?" H 3350 9700 50  0000 L CNN
+F 1 "100nF" H 3350 9500 50  0000 L CNN
+	1    3300 9600
 	1    0    0    -1  
 $EndComp
-$Comp
-L GND #PWR?
-U 1 1 4FE2B858
-P 11850 8500
-F 0 "#PWR?" H 11850 8500 30  0001 C CNN
-F 1 "GND" H 11850 8430 30  0001 C CNN
-	1    11850 8500
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR9
-U 1 1 4FE0F3BF
-P 11850 1650
-F 0 "#PWR9" H 11850 1650 30  0001 C CNN
-F 1 "GND" H 11850 1580 30  0001 C CNN
-	1    11850 1650
-	0    1    1    0   
-$EndComp
-$Comp
-L VCC #PWR?
-U 1 1 4FEBD54F
-P 11000 2450
-F 0 "#PWR?" H 11000 2550 30  0001 C CNN
-F 1 "VCC" H 11000 2550 30  0000 C CNN
-	1    11000 2450
-	1    0    0    -1  
-$EndComp
-$Comp
-L MOSFET_N Q?
-U 1 1 4FEBD52A
-P 10700 2550
-F 0 "Q?" H 10710 2720 60  0000 R CNN
-F 1 "MOSFET_N" H 10710 2400 60  0000 R CNN
-F 4 "DMN2300UFB4" H 10700 2550 60  0001 C CNN "Part Number"
-	1    10700 2550
-	-1   0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR?
-U 1 1 4FEBD516
-P 10050 7250
-F 0 "#PWR?" H 10050 7350 30  0001 C CNN
-F 1 "VCC" H 10050 7350 30  0000 C CNN
-	1    10050 7250
-	1    0    0    -1  
-$EndComp
-$Comp
-L MOSFET_N Q?
-U 1 1 4FEBD4FB
-P 9750 7350
-F 0 "Q?" H 9760 7520 60  0000 R CNN
-F 1 "MOSFET_N" H 9760 7200 60  0000 R CNN
-F 4 "DMN2300UFB4" H 9750 7350 60  0001 C CNN "Part Number"
-	1    9750 7350
-	-1   0    0    -1  
-$EndComp
-Text Notes 7400 7750 0    40   ~ 0
-DC connection to GND required on IF1, IF2?
-Text Notes 7700 3450 0    40   ~ 0
-DC connection to GND required on RF1, RF2?
+Text Notes 7950 7700 0    40   ~ 0
+DC connection to MIX_BIAS\nrequired on IF1, IF2?
+Text Notes 8200 3400 0    40   ~ 0
+DC connection to MIX_BIAS\nrequired on RF1, RF2?
 NoConn ~ 8100 7000
 $Comp
 L BALUN T2
@@ -972,7 +1350,7 @@ F 6 "Ultra Low Profile 0805 Balun 50 to 100 Balanced" H 7800 3050 60  0001 C CNN
 $EndComp
 NoConn ~ 8200 3050
 Text Notes 11850 1150 0    40   ~ 0
-balun here may not not be needed if\ndirect connection to MAX2837 is made
+balun here may not be needed if\ndirect connection to MAX2837 is made
 Text Notes 3450 4550 0    40   ~ 0
 amplifier will likely\nend up here
 Text Notes 2450 6900 0    40   ~ 0
@@ -1044,10 +1422,10 @@ $EndComp
 $Comp
 L C C?
 U 1 1 4FE2B83E
-P 7000 7450
-F 0 "C?" H 7050 7550 50  0000 L CNN
-F 1 "10nF" H 7050 7350 50  0000 L CNN
-	1    7000 7450
+P 6850 7450
+F 0 "C?" H 6900 7550 50  0000 L CNN
+F 1 "10nF" H 6900 7350 50  0000 L CNN
+	1    6850 7450
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -1139,10 +1517,10 @@ $EndComp
 $Comp
 L C C?
 U 1 1 4FE2B5DE
-P 7000 3150
-F 0 "C?" H 7050 3250 50  0000 L CNN
-F 1 "10nF" H 7050 3050 50  0000 L CNN
-	1    7000 3150
+P 7100 3150
+F 0 "C?" H 7150 3250 50  0000 L CNN
+F 1 "10nF" H 7150 3050 50  0000 L CNN
+	1    7100 3150
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -1160,24 +1538,6 @@ $EndComp
 NoConn ~ 10850 4750
 NoConn ~ 10850 4650
 $Comp
-L VCC #PWR?
-U 1 1 4FE23D21
-P 1400 9700
-F 0 "#PWR?" H 1400 9800 30  0001 C CNN
-F 1 "VCC" H 1400 9800 30  0000 C CNN
-	1    1400 9700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L VCC #PWR?
-U 1 1 4FE23D1E
-P 2800 9800
-F 0 "#PWR?" H 2800 9900 30  0001 C CNN
-F 1 "VCC" H 2800 9900 30  0000 C CNN
-	1    2800 9800
-	0    1    1    0   
-$EndComp
-$Comp
 L VCC #PWR76
 U 1 1 4FE104E0
 P 16000 8600
@@ -1213,16 +1573,16 @@ F 1 "GND" H 5150 9930 30  0001 C CNN
 	1    5150 10000
 	1    0    0    -1  
 $EndComp
-Text Label 3850 9900 0    40   ~ 0
+Text Label 3900 9900 0    40   ~ 0
 SWD1
-Text Label 3850 9800 0    40   ~ 0
+Text Label 3900 9800 0    40   ~ 0
 SWTX1
-Text Label 3850 9700 0    40   ~ 0
+Text Label 3900 9700 0    40   ~ 0
 SWRX1
-Text Label 3850 9600 0    40   ~ 0
-!TX_BYPASS
-Text Label 3850 9500 0    40   ~ 0
-!RX_BYPASS
+Text Label 3900 9600 0    40   ~ 0
+TX_BYPASS
+Text Label 3900 9500 0    40   ~ 0
+RX_BYPASS
 $Comp
 L CONN_5X2 P8
 U 1 1 4FE10458
@@ -1232,8 +1592,6 @@ F 1 "SWITCH_CTRL" V 4650 9700 50  0000 C CNN
 	1    4650 9700
 	1    0    0    -1  
 $EndComp
-NoConn ~ 1500 9800
-NoConn ~ 2700 9900
 NoConn ~ 2700 9500
 $Comp
 L GND #PWR84
@@ -1256,23 +1614,23 @@ $EndComp
 $Comp
 L VCC #PWR81
 U 1 1 4FE10413
-P 3150 9200
-F 0 "#PWR81" H 3150 9300 30  0001 C CNN
-F 1 "VCC" H 3150 9300 30  0000 C CNN
-	1    3150 9200
+P 3300 9200
+F 0 "#PWR81" H 3300 9300 30  0001 C CNN
+F 1 "VCC" H 3300 9300 30  0000 C CNN
+	1    3300 9200
 	1    0    0    -1  
 $EndComp
-Text Label 2900 9700 2    40   ~ 0
+Text Label 3100 9700 2    40   ~ 0
 SWD2
-Text Label 2900 9600 2    40   ~ 0
+Text Label 3100 9600 2    40   ~ 0
 SWD1
-Text Label 1250 9600 0    40   ~ 0
+Text Label 1100 9600 0    40   ~ 0
 SWRX2
-Text Label 1250 9500 0    40   ~ 0
+Text Label 1100 9500 0    40   ~ 0
 SWRX1
-Text Label 1250 9400 0    40   ~ 0
+Text Label 1100 9400 0    40   ~ 0
 SWTX2
-Text Label 1250 9300 0    40   ~ 0
+Text Label 1100 9300 0    40   ~ 0
 SWTX1
 $Comp
 L GSG-74HC04 U16
@@ -1288,50 +1646,14 @@ F 6 "IC HEX INVERTERS 14-QFN" H 2100 9600 60  0001 C CNN "Description"
 $EndComp
 Text Notes 14900 6650 0    40   ~ 0
 ferrite beads needed?
-Text Notes 5800 4900 0    40   ~ 0
-Bypass control signals (active low) allow the LO to\nbe bypassed (essentially a zero Hz LO). The LO\nshould be switched off when bypass is enabled.
+Text Notes 5450 5000 0    40   ~ 0
+Bypass control signals allow the LO to be\nbypassed (essentially a zero Hz LO). The LO\nshould be switched off when bypass is enabled.
 Text Notes 11850 8000 0    40   ~ 0
-balun here may not not be needed if\ndirect connection to MAX2837 is made
+balun here may not be needed if\ndirect connection to MAX2837 is made
 Text Notes 1600 3100 0    40   ~ 0
 antenna diversity switches
 Text Notes 13600 5550 0    40   ~ 0
 loop filter\n(1.6 MHz)
-$Comp
-L VCC #PWR47
-U 1 1 4FE1013E
-P 6400 5350
-F 0 "#PWR47" H 6400 5450 30  0001 C CNN
-F 1 "VCC" H 6400 5450 30  0000 C CNN
-	1    6400 5350
-	0    -1   -1   0   
-$EndComp
-$Comp
-L R R8
-U 1 1 4FE1013B
-P 6750 5350
-F 0 "R8" V 6830 5350 50  0000 C CNN
-F 1 "10k" V 6750 5350 50  0000 C CNN
-	1    6750 5350
-	0    1    1    0   
-$EndComp
-$Comp
-L VCC #PWR35
-U 1 1 4FE10133
-P 7000 4150
-F 0 "#PWR35" H 7000 4250 30  0001 C CNN
-F 1 "VCC" H 7000 4250 30  0000 C CNN
-	1    7000 4150
-	0    -1   -1   0   
-$EndComp
-$Comp
-L R R1
-U 1 1 4FE1012B
-P 7350 4150
-F 0 "R1" V 7430 4150 50  0000 C CNN
-F 1 "10k" V 7350 4150 50  0000 C CNN
-	1    7350 4150
-	0    1    1    0   
-$EndComp
 Text Label 1750 6250 0    40   ~ 0
 SWD1
 $Comp
@@ -2057,28 +2379,19 @@ $EndComp
 $Comp
 L VCC #PWR42
 U 1 1 4FE0F129
-P 7850 5050
-F 0 "#PWR42" H 7850 5150 30  0001 C CNN
-F 1 "VCC" H 7850 5150 30  0000 C CNN
-	1    7850 5050
+P 7750 5200
+F 0 "#PWR42" H 7750 5300 30  0001 C CNN
+F 1 "VCC" H 7750 5300 30  0000 C CNN
+	1    7750 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L INDUCTOR L6
 U 1 1 4FE0EFB0
-P 9650 6750
-F 0 "L6" V 9600 6750 40  0000 C CNN
-F 1 "INDUCTOR" V 9750 6750 40  0000 C CNN
-	1    9650 6750
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR66
-U 1 1 4FE0EFAF
-P 9650 7650
-F 0 "#PWR66" H 9650 7650 30  0001 C CNN
-F 1 "GND" H 9650 7580 30  0001 C CNN
-	1    9650 7650
+P 9900 6650
+F 0 "L6" V 9850 6650 40  0000 C CNN
+F 1 "4n7" V 10000 6650 40  0000 C CNN
+	1    9900 6650
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -2113,94 +2426,18 @@ L INDUCTOR L5
 U 1 1 4FE0EEDD
 P 8450 6050
 F 0 "L5" V 8400 6050 40  0000 C CNN
-F 1 "INDUCTOR" V 8550 6050 40  0000 C CNN
+F 1 "4n7" V 8550 6050 40  0000 C CNN
 	1    8450 6050
 	0    1    1    0   
 $EndComp
-$Comp
-L MOSFET_P Q3
-U 1 1 4FE0EEDC
-P 7750 5350
-F 0 "Q3" H 7750 5540 60  0000 R CNN
-F 1 "MOSFET_P" H 7750 5170 60  0000 R CNN
-	1    7750 5350
-	1    0    0    1   
-$EndComp
-$Comp
-L MOSFET_N Q4
-U 1 1 4FE0EEDB
-P 7750 5950
-F 0 "Q4" H 7760 6120 60  0000 R CNN
-F 1 "MOSFET_N" H 7760 5800 60  0000 R CNN
-F 4 "DMN2300UFB4" H 7750 5950 60  0001 C CNN "Part Number"
-	1    7750 5950
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR57
-U 1 1 4FE0EEDA
-P 7850 6250
-F 0 "#PWR57" H 7850 6250 30  0001 C CNN
-F 1 "GND" H 7850 6180 30  0001 C CNN
-	1    7850 6250
-	1    0    0    -1  
-$EndComp
-Text Label 6700 5650 0    40   ~ 0
+Text Label 7200 6400 0    40   ~ 0
 !TX_BYPASS
-Text Label 7300 4450 0    40   ~ 0
-!RX_BYPASS
-$Comp
-L VCC #PWR27
-U 1 1 4FE0EE44
-P 8450 3850
-F 0 "#PWR27" H 8450 3950 30  0001 C CNN
-F 1 "VCC" H 8450 3950 30  0000 C CNN
-	1    8450 3850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR43
-U 1 1 4FE0EE26
-P 8450 5050
-F 0 "#PWR43" H 8450 5050 30  0001 C CNN
-F 1 "GND" H 8450 4980 30  0001 C CNN
-	1    8450 5050
-	1    0    0    -1  
-$EndComp
-$Comp
-L MOSFET_N Q2
-U 1 1 4FE0EE1A
-P 8350 4750
-F 0 "Q2" H 8360 4920 60  0000 R CNN
-F 1 "MOSFET_N" H 8360 4600 60  0000 R CNN
-F 4 "DMN2300UFB4" H 8350 4750 60  0001 C CNN "Part Number"
-	1    8350 4750
-	1    0    0    -1  
-$EndComp
-$Comp
-L MOSFET_P Q1
-U 1 1 4FE0EE12
-P 8350 4150
-F 0 "Q1" H 8350 4340 60  0000 R CNN
-F 1 "MOSFET_P" H 8350 3970 60  0000 R CNN
-	1    8350 4150
-	1    0    0    1   
-$EndComp
-$Comp
-L GND #PWR16
-U 1 1 4FE0EDCF
-P 10600 2850
-F 0 "#PWR16" H 10600 2850 30  0001 C CNN
-F 1 "GND" H 10600 2780 30  0001 C CNN
-	1    10600 2850
-	1    0    0    -1  
-$EndComp
 $Comp
 L INDUCTOR L3
 U 1 1 4FE0EDC7
 P 10200 2250
 F 0 "L3" V 10150 2250 40  0000 C CNN
-F 1 "INDUCTOR" V 10300 2250 40  0000 C CNN
+F 1 "4n7" V 10300 2250 40  0000 C CNN
 	1    10200 2250
 	0    1    1    0   
 $EndComp
@@ -2209,7 +2446,7 @@ L INDUCTOR L4
 U 1 1 4FE0EDBE
 P 9050 4150
 F 0 "L4" V 9000 4150 40  0000 C CNN
-F 1 "INDUCTOR" V 9150 4150 40  0000 C CNN
+F 1 "4n7" V 9150 4150 40  0000 C CNN
 	1    9050 4150
 	0    1    1    0   
 $EndComp
@@ -2340,15 +2577,6 @@ F 1 "GND" H 4750 1680 30  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR13
-U 1 1 4FE0E7A2
-P 7300 3250
-F 0 "#PWR13" H 7300 3250 30  0001 C CNN
-F 1 "GND" H 7300 3180 30  0001 C CNN
-	1    7300 3250
-	0    1    1    0   
-$EndComp
-$Comp
 L GND #PWR25
 U 1 1 4FE0E783
 P 4650 3750
@@ -2367,15 +2595,6 @@ F 1 "GND" H 6050 3680 30  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR64
-U 1 1 4FE0E746
-P 7200 7200
-F 0 "#PWR64" H 7200 7200 30  0001 C CNN
-F 1 "GND" H 7200 7130 30  0001 C CNN
-	1    7200 7200
-	0    1    1    0   
-$EndComp
-$Comp
 L GND #PWR62
 U 1 1 4FE0E743
 P 5350 6800
diff --git a/hardware/kicad/hackrf.dcm b/hardware/kicad/hackrf.dcm
index 51176511..5f01b207 100644
--- a/hardware/kicad/hackrf.dcm
+++ b/hardware/kicad/hackrf.dcm
@@ -1,4 +1,4 @@
-EESchema-DOCLIB  Version 2.0  Date: Thu Jun 21 18:14:36 2012
+EESchema-DOCLIB  Version 2.0  Date: Sun Jul  1 11:50:49 2012
 #
 $CMP GSG-DIODE-TVS-BI
 D Diode zener
diff --git a/hardware/kicad/hackrf.lib b/hardware/kicad/hackrf.lib
index 45afdfb8..05c60d06 100644
--- a/hardware/kicad/hackrf.lib
+++ b/hardware/kicad/hackrf.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Thu Jun 21 18:14:36 2012
+EESchema-LIBRARY Version 2.3  Date: Sun Jul  1 11:50:49 2012
 #encoding utf-8
 #
 # BALUN
@@ -120,6 +120,22 @@ X P29 29 -400 -650 300 R 60 30 1 1 P I
 ENDDRAW
 ENDDEF
 #
+# DMC2400
+#
+DEF DMC2400 U 0 40 Y Y 1 F N
+F0 "U" -50 0 60 V V C CNN
+F1 "DMC2400" 50 0 60 V V C CNN
+DRAW
+S -250 250 250 -250 0 1 0 N
+X S1 1 -400 100 150 R 50 50 1 1 B
+X G1 2 -400 0 150 R 50 50 1 1 I
+X D2 3 -400 -100 150 R 50 50 1 1 B
+X S2 4 400 -100 150 L 50 50 1 1 B
+X G2 5 400 0 150 L 50 50 1 1 I
+X D1 6 400 100 150 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # FIL-DEA
 #
 DEF FIL-DEA U 0 40 Y Y 1 F N
@@ -662,6 +678,21 @@ X VDD 39 350 1200 300 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# NCP699
+#
+DEF NCP699 U 0 40 Y Y 1 F N
+F0 "U" 0 200 60 H V C CNN
+F1 "NCP699" 0 -200 60 H V C CNN
+DRAW
+S -250 250 250 -250 0 1 0 N
+X VIN 1 -400 100 150 R 50 50 1 1 W
+X GND 2 -400 0 150 R 50 50 1 1 W
+X EN 3 -400 -100 150 R 50 50 1 1 I
+X NC 4 400 -100 150 L 50 50 1 1 N
+X VOUT 5 400 100 150 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
 # PE4140
 #
 DEF PE4140 U 0 40 Y Y 1 F N