diff --git a/hardware/lollipop/lollipop-cache.lib b/hardware/lollipop/lollipop-cache.lib
index 96fe5307..240b669d 100644
--- a/hardware/lollipop/lollipop-cache.lib
+++ b/hardware/lollipop/lollipop-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Thu May 17 17:24:32 2012
+EESchema-LIBRARY Version 2.3  Date: Fri May 18 11:10:22 2012
 #encoding utf-8
 #
 # BALUN
diff --git a/hardware/lollipop/lollipop.sch b/hardware/lollipop/lollipop.sch
index bfe7c19f..ceb37022 100644
--- a/hardware/lollipop/lollipop.sch
+++ b/hardware/lollipop/lollipop.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Thu May 17 17:24:32 2012
+EESchema Schematic File Version 2  date Fri May 18 11:10:22 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -37,7 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "17 may 2012"
+Date "18 may 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,6 +45,126 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L SKY13351 U?
+U 1 1 4FB68137
+P 13200 1200
+F 0 "U?" H 13200 1400 60  0000 C CNN
+F 1 "SKY13351" H 13200 1000 60  0000 C CNN
+F 4 "Skyworks" H 13200 1200 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 13200 1200 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 13200 1200 60  0001 C CNN "Description"
+	1    13200 1200
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB68133
+P 13200 2400
+F 0 "U?" H 13200 2600 60  0000 C CNN
+F 1 "SKY13351" H 13200 2200 60  0000 C CNN
+F 4 "Skyworks" H 13200 2400 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 13200 2400 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 13200 2400 60  0001 C CNN "Description"
+	1    13200 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB68130
+P 13200 8050
+F 0 "U?" H 13200 8250 60  0000 C CNN
+F 1 "SKY13351" H 13200 7850 60  0000 C CNN
+F 4 "Skyworks" H 13200 8050 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 13200 8050 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 13200 8050 60  0001 C CNN "Description"
+	1    13200 8050
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB6812A
+P 13200 9250
+F 0 "U?" H 13200 9450 60  0000 C CNN
+F 1 "SKY13351" H 13200 9050 60  0000 C CNN
+F 4 "Skyworks" H 13200 9250 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 13200 9250 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 13200 9250 60  0001 C CNN "Description"
+	1    13200 9250
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB68127
+P 9350 6900
+F 0 "U?" H 9350 7100 60  0000 C CNN
+F 1 "SKY13351" H 9350 6700 60  0000 C CNN
+F 4 "Skyworks" H 9350 6900 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 9350 6900 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 9350 6900 60  0001 C CNN "Description"
+	1    9350 6900
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB68124
+P 9350 5700
+F 0 "U?" H 9350 5900 60  0000 C CNN
+F 1 "SKY13351" H 9350 5500 60  0000 C CNN
+F 4 "Skyworks" H 9350 5700 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 9350 5700 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 9350 5700 60  0001 C CNN "Description"
+	1    9350 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB68122
+P 9350 4600
+F 0 "U?" H 9350 4800 60  0000 C CNN
+F 1 "SKY13351" H 9350 4400 60  0000 C CNN
+F 4 "Skyworks" H 9350 4600 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 9350 4600 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 9350 4600 60  0001 C CNN "Description"
+	1    9350 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB6811F
+P 9350 3400
+F 0 "U?" H 9350 3600 60  0000 C CNN
+F 1 "SKY13351" H 9350 3200 60  0000 C CNN
+F 4 "Skyworks" H 9350 3400 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 9350 3400 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 9350 3400 60  0001 C CNN "Description"
+	1    9350 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13351 U?
+U 1 1 4FB680FF
+P 2950 5650
+F 0 "U?" H 2950 5850 60  0000 C CNN
+F 1 "SKY13351" H 2950 5450 60  0000 C CNN
+F 4 "Skyworks" H 2950 5650 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 2950 5650 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 2950 5650 60  0001 C CNN "Description"
+	1    2950 5650
+	1    0    0    -1  
+$EndComp
+$Comp
+L SKY13317 U15
+U 1 1 4FB68075
+P 5050 7900
+F 0 "U15" H 5050 7900 60  0000 C CNN
+F 1 "SKY13317" H 5050 8150 60  0000 C CNN
+F 4 "Skyworks" H 5050 7900 60  0001 C CNN "Manufacturer"
+F 5 "SKY13317-373LF" H 5050 7900 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz pHEMT GaAs SP3T Switch" H 5050 7900 60  0001 C CNN "Description"
+	1    5050 7900
+	1    0    0    -1  
+$EndComp
 Connection ~ 14750 6800
 Wire Wire Line
 	14750 6800 14750 6300
@@ -1399,6 +1519,9 @@ U 1 1 4FB2F586
 P 1500 8850
 F 0 "U17" V 1450 8850 60  0000 C CNN
 F 1 "GSG-74HC04" V 1550 8850 60  0000 C CNN
+F 4 "Texas Instruments" H 1500 8850 60  0001 C CNN "Manufacturer"
+F 5 "SN74AHC04RGYR" H 1500 8850 60  0001 C CNN "Part Number"
+F 6 "IC HEX INVERTERS 14-QFN" H 1500 8850 60  0001 C CNN "Description"
 	1    1500 8850
 	1    0    0    -1  
 $EndComp
@@ -1408,6 +1531,9 @@ U 1 1 4FB2F209
 P 1500 9950
 F 0 "U19" V 1450 9950 60  0000 C CNN
 F 1 "GSG-74HC08" V 1550 9950 60  0000 C CNN
+F 4 "Texas Instruments" H 1500 9950 60  0001 C CNN "Manufacturer"
+F 5 "SN74AHC08RGYR" H 1500 9950 60  0001 C CNN "Part Number"
+F 6 "IC QUAD 2IN POS-AND GATE 14-QFN" H 1500 9950 60  0001 C CNN "Description"
 	1    1500 9950
 	1    0    0    -1  
 $EndComp
@@ -2133,20 +2259,14 @@ F 1 "33pF" H 2100 3950 50  0000 L CNN
 	0    1    -1   0   
 $EndComp
 $Comp
-L SKY13351 U10
-U 1 1 4FAA1576
-P 2950 5650
-F 0 "U10" H 2950 5850 60  0000 C CNN
-F 1 "SKY13351" H 2950 5450 60  0000 C CNN
-	1    2950 5650
-	1    0    0    -1  
-$EndComp
-$Comp
 L SKY13351 U7
 U 1 1 4FAA1575
 P 2950 4450
 F 0 "U7" H 2950 4650 60  0000 C CNN
 F 1 "SKY13351" H 2950 4250 60  0000 C CNN
+F 4 "Skyworks" H 2950 4450 60  0001 C CNN "Manufacturer"
+F 5 "SKY13351-378LF" H 2950 4450 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 2950 4450 60  0001 C CNN "Description"
 	1    2950 4450
 	-1   0    0    -1  
 $EndComp
@@ -2462,42 +2582,6 @@ F 1 "33pF" H 10300 5200 50  0000 L CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SKY13351 U14
-U 1 1 4FAA0C5C
-P 9350 6900
-F 0 "U14" H 9350 7100 60  0000 C CNN
-F 1 "SKY13351" H 9350 6700 60  0000 C CNN
-	1    9350 6900
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U12
-U 1 1 4FAA0C5B
-P 9350 5700
-F 0 "U12" H 9350 5900 60  0000 C CNN
-F 1 "SKY13351" H 9350 5500 60  0000 C CNN
-	1    9350 5700
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U6
-U 1 1 4FAA0C5A
-P 9350 3400
-F 0 "U6" H 9350 3600 60  0000 C CNN
-F 1 "SKY13351" H 9350 3200 60  0000 C CNN
-	1    9350 3400
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U9
-U 1 1 4FAA0C59
-P 9350 4600
-F 0 "U9" H 9350 4800 60  0000 C CNN
-F 1 "SKY13351" H 9350 4400 60  0000 C CNN
-	1    9350 4600
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C15
 U 1 1 4FAA0C58
 P 10250 3000
@@ -2650,24 +2734,6 @@ F 1 "GND" H 16150 8980 30  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SKY13351 U16
-U 1 1 4FAA08F6
-P 13200 8050
-F 0 "U16" H 13200 8250 60  0000 C CNN
-F 1 "SKY13351" H 13200 7850 60  0000 C CNN
-	1    13200 8050
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U18
-U 1 1 4FAA08F5
-P 13200 9250
-F 0 "U18" H 13200 9450 60  0000 C CNN
-F 1 "SKY13351" H 13200 9050 60  0000 C CNN
-	1    13200 9250
-	1    0    0    -1  
-$EndComp
-$Comp
 L BALUN T8
 U 1 1 4FAA08F4
 P 15050 8650
@@ -3103,6 +3169,9 @@ U 1 1 4F957166
 P 12050 5150
 F 0 "U1" H 12050 5250 60  0000 C CNN
 F 1 "RFFC5071" H 12050 5050 60  0000 C CNN
+F 4 "RFMD" H 12050 5150 60  0001 C CNN "Manufacturer"
+F 5 "RFFC5071" H 12050 5150 60  0001 C CNN "Part Number"
+F 6 "IC SYNTH VCO 6GHZ MIXER 32-QFN" H 12050 5150 60  0001 C CNN "Description"
 	1    12050 5150
 	-1   0    0    1   
 $EndComp
@@ -3154,6 +3223,9 @@ U 1 1 4F94CFA9
 P 5050 1600
 F 0 "U3" H 5050 1600 60  0000 C CNN
 F 1 "SKY13317" H 5050 1850 60  0000 C CNN
+F 4 "Skyworks" H 5050 1600 60  0001 C CNN "Manufacturer"
+F 5 "SKY13317-373LF" H 5050 1600 60  0001 C CNN "Part Number"
+F 6 "20 MHz-6.0 GHz pHEMT GaAs SP3T Switch" H 5050 1600 60  0001 C CNN "Description"
 	1    5050 1600
 	1    0    0    -1  
 $EndComp
@@ -3181,31 +3253,4 @@ F 6 "FILTER HIGHPASS WLAN&BLUETOOTH" H 5700 4450 60  0001 C CNN "Description"
 	1    5700 4450
 	1    0    0    -1  
 $EndComp
-$Comp
-L SKY13351 U4
-U 1 1 4F94CBAF
-P 13200 2400
-F 0 "U4" H 13200 2600 60  0000 C CNN
-F 1 "SKY13351" H 13200 2200 60  0000 C CNN
-	1    13200 2400
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13351 U2
-U 1 1 4F94CB86
-P 13200 1200
-F 0 "U2" H 13200 1400 60  0000 C CNN
-F 1 "SKY13351" H 13200 1000 60  0000 C CNN
-	1    13200 1200
-	1    0    0    -1  
-$EndComp
-$Comp
-L SKY13317 U15
-U 1 1 4F94CB80
-P 5050 7900
-F 0 "U15" H 5050 7900 60  0000 C CNN
-F 1 "SKY13317" H 5050 8150 60  0000 C CNN
-	1    5050 7900
-	1    0    0    -1  
-$EndComp
 $EndSCHEMATC