diff --git a/gpstracker-cache.lib b/gpstracker-cache.lib
index f50d63a..cf83eb2 100644
--- a/gpstracker-cache.lib
+++ b/gpstracker-cache.lib
@@ -16,6 +16,54 @@ X +1V8 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# +3V3
+#
+DEF +3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +3V3_FTDI
+#
+DEF +3V3_FTDI #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3_FTDI" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V_FDTI
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3_FDTI 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +3V3_REGUL
+#
+DEF +3V3_REGUL #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3_REGUL" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V_REGUL
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3_REGUL 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 # +BATT
 #
 DEF +BATT #PWR 0 0 Y Y 1 F P
@@ -211,6 +259,24 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MCP1700T-3002E/TT
+#
+DEF MCP1700T-3002E/TT U 0 30 Y Y 1 F N
+F0 "U" 100 -200 50 H V C CNN
+F1 "MCP1700T-3002E/TT" 0 300 50 H V C CNN
+F2 "" 0 100 50 H I C CNN
+F3 "" 0 100 50 H I C CNN
+$FPLIST
+ SOT-23*
+$ENDFPLIST
+DRAW
+S -200 200 200 -100 0 1 10 f
+X GND 1 0 -200 100 U 50 50 1 1 W
+X VO 2 300 100 100 L 50 50 1 1 w
+X VI 3 -300 100 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # MCP73832-2-OT
 #
 DEF MCP73832-2-OT U 0 40 Y Y 1 F N
@@ -259,6 +325,19 @@ X SHIELD 9 800 -600 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 75 50 H I C CNN
+F1 "PWR_FLAG" 0 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+X pwr 1 0 0 0 U 50 50 0 0 w
+P 6 0 1 0 0 0 0 50 -40 75 0 100 40 75 0 50 N
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
@@ -409,6 +488,27 @@ X IO5 6 200 450 200 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SW_DPDT_x2
+#
+DEF SW_DPDT_x2 SW 0 0 Y N 2 F N
+F0 "SW" 0 170 50 H V C CNN
+F1 "SW_DPDT_x2" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C -80 0 20 0 0 0 N
+C 80 -100 20 0 0 0 N
+C 80 100 20 0 1 0 N
+P 2 0 1 0 -60 10 65 90 N
+X A 1 200 100 100 L 50 50 1 1 P
+X B 2 -200 0 100 R 50 50 1 1 P
+X C 3 200 -100 100 L 50 50 1 1 P
+X A 3 200 100 100 L 50 50 2 1 P
+X B 4 -200 0 100 R 50 50 2 1 P
+X C 5 200 -100 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
 # SW_Push_Dual_x2
 #
 DEF SW_Push_Dual_x2 SW 0 40 Y N 2 F N
@@ -426,18 +526,4 @@ X B 4 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# VCC
-#
-DEF VCC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VCC" 0 150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VCC 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
 #End Library
diff --git a/gpstracker.pro b/gpstracker.pro
index 413dc3a..512a27c 100644
--- a/gpstracker.pro
+++ b/gpstracker.pro
@@ -1,4 +1,4 @@
-update=08/27/17 19:22:16
+update=12/13/17 00:11:32
 version=1
 last_client=kicad
 [pcbnew]
@@ -68,3 +68,4 @@ LibName36=C:/Apps/Engineering/KiCad/share/kicad/library/power
 LibName37=library/SIM808
 LibName38=C:/Apps/Engineering/KiCad/share/kicad/library/diode
 LibName39=library/freetronics/freetronics_schematic
+LibName40=library/custom-power
diff --git a/gpstracker.sch b/gpstracker.sch
index 24a439b..e1d9d7b 100644
--- a/gpstracker.sch
+++ b/gpstracker.sch
@@ -36,6 +36,7 @@ LIBS:nxp
 LIBS:SIM808
 LIBS:diode
 LIBS:freetronics_schematic
+LIBS:custom-power
 LIBS:gpstracker-cache
 EELAYER 25 0
 EELAYER END
@@ -54,843 +55,1117 @@ $EndDescr
 $Comp
 L ATMEGA328P-AU U1
 U 1 1 59A2B62B
-P 1900 2700
-F 0 "U1" H 1150 3950 50  0000 L BNN
-F 1 "ATMEGA328P-AU" H 2300 1300 50  0000 L BNN
-F 2 "TQFP32" H 1900 2700 50  0001 C CIN
-F 3 "" H 1900 2700 50  0001 C CNN
-	1    1900 2700
+P 2000 4600
+F 0 "U1" H 1250 5850 50  0000 L BNN
+F 1 "ATMEGA328P-AU" H 2400 3200 50  0000 L BNN
+F 2 "TQFP32" H 2000 4600 50  0001 C CIN
+F 3 "" H 2000 4600 50  0001 C CNN
+	1    2000 4600
 	1    0    0    -1  
 $EndComp
-Text Notes 8150 850  0    120  ~ 24
+Text Notes 1800 800  0    120  ~ 24
 Battery charger
 $Comp
 L C C?
 U 1 1 59A2CCEB
-P 8100 1700
-F 0 "C?" H 8125 1800 50  0000 L CNN
-F 1 "4.7uF" H 8125 1600 50  0000 L CNN
-F 2 "" H 8138 1550 50  0001 C CNN
-F 3 "" H 8100 1700 50  0001 C CNN
-	1    8100 1700
-	1    0    0    -1  
+P 850 1700
+F 0 "C?" H 875 1800 50  0000 L CNN
+F 1 "4.7uF" H 875 1600 50  0000 L CNN
+F 2 "" H 888 1550 50  0001 C CNN
+F 3 "" H 850 1700 50  0001 C CNN
+	1    850  1700
+	-1   0    0    1   
 $EndComp
 $Comp
 L C C?
 U 1 1 59A2CDFC
-P 10000 2050
-F 0 "C?" H 10025 2150 50  0000 L CNN
-F 1 "4.7uF" H 10025 1950 50  0000 L CNN
-F 2 "" H 10038 1900 50  0001 C CNN
-F 3 "" H 10000 2050 50  0001 C CNN
-	1    10000 2050
+P 2750 2400
+F 0 "C?" H 2775 2500 50  0000 L CNN
+F 1 "4.7uF" H 2775 2300 50  0000 L CNN
+F 2 "" H 2788 2250 50  0001 C CNN
+F 3 "" H 2750 2400 50  0001 C CNN
+	1    2750 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 59A2CE67
-P 8500 2200
-F 0 "R?" V 8580 2200 50  0000 C CNN
-F 1 "2k" V 8500 2200 50  0000 C CNN
-F 2 "" V 8430 2200 50  0001 C CNN
-F 3 "" H 8500 2200 50  0001 C CNN
-	1    8500 2200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 59A2CECC
-P 8500 2450
-F 0 "#PWR?" H 8500 2200 50  0001 C CNN
-F 1 "GND" H 8500 2300 50  0000 C CNN
-F 2 "" H 8500 2450 50  0001 C CNN
-F 3 "" H 8500 2450 50  0001 C CNN
-	1    8500 2450
-	1    0    0    -1  
+P 1100 2000
+F 0 "R?" V 1180 2000 50  0000 C CNN
+F 1 "2k" V 1100 2000 50  0000 C CNN
+F 2 "" V 1030 2000 50  0001 C CNN
+F 3 "" H 1100 2000 50  0001 C CNN
+	1    1100 2000
+	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR02
 U 1 1 59A2CEED
-P 10000 2300
-F 0 "#PWR?" H 10000 2050 50  0001 C CNN
-F 1 "GND" H 10000 2150 50  0000 C CNN
-F 2 "" H 10000 2300 50  0001 C CNN
-F 3 "" H 10000 2300 50  0001 C CNN
-	1    10000 2300
+P 2250 2800
+F 0 "#PWR02" H 2250 2550 50  0001 C CNN
+F 1 "GND" H 2250 2650 50  0000 C CNN
+F 2 "" H 2250 2800 50  0001 C CNN
+F 3 "" H 2250 2800 50  0001 C CNN
+	1    2250 2800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
-U 1 1 59A2CF07
-P 9000 2250
-F 0 "#PWR?" H 9000 2000 50  0001 C CNN
-F 1 "GND" H 9000 2100 50  0000 C CNN
-F 2 "" H 9000 2250 50  0001 C CNN
-F 3 "" H 9000 2250 50  0001 C CNN
-	1    9000 2250
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
+L GND #PWR04
 U 1 1 59A2CFA6
-P 7350 5750
-F 0 "#PWR?" H 7350 5500 50  0001 C CNN
-F 1 "GND" H 7350 5600 50  0000 C CNN
-F 2 "" H 7350 5750 50  0001 C CNN
-F 3 "" H 7350 5750 50  0001 C CNN
-	1    7350 5750
+P 9850 4050
+F 0 "#PWR04" H 9850 3800 50  0001 C CNN
+F 1 "GND" H 9850 3900 50  0000 C CNN
+F 2 "" H 9850 4050 50  0001 C CNN
+F 3 "" H 9850 4050 50  0001 C CNN
+	1    9850 4050
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 59A2CFC5
-P 9650 1950
-F 0 "R?" V 9730 1950 50  0000 C CNN
-F 1 "470R" V 9650 1950 50  0000 C CNN
-F 2 "" V 9580 1950 50  0001 C CNN
-F 3 "" H 9650 1950 50  0001 C CNN
-	1    9650 1950
+P 2400 1500
+F 0 "R?" V 2480 1500 50  0000 C CNN
+F 1 "470R" V 2400 1500 50  0000 C CNN
+F 2 "" V 2330 1500 50  0001 C CNN
+F 3 "" H 2400 1500 50  0001 C CNN
+	1    2400 1500
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LED D?
 U 1 1 59A2D0D5
-P 9600 1450
-F 0 "D?" H 9600 1550 50  0000 C CNN
-F 1 "LED" H 9600 1350 50  0000 C CNN
-F 2 "" H 9600 1450 50  0001 C CNN
-F 3 "" H 9600 1450 50  0001 C CNN
-	1    9600 1450
+P 2000 1500
+F 0 "D?" H 2000 1600 50  0000 C CNN
+F 1 "CHRG" H 2000 1400 50  0000 C CNN
+F 2 "" H 2000 1500 50  0001 C CNN
+F 3 "" H 2000 1500 50  0001 C CNN
+	1    2000 1500
 	-1   0    0    1   
 $EndComp
-Text Label 7900 1450 0    60   ~ 0
-VIN
 $Comp
 L R R?
 U 1 1 59A3118C
-P 9500 2100
-F 0 "R?" V 9580 2100 50  0000 C CNN
-F 1 "1k" V 9500 2100 50  0000 C CNN
-F 2 "" V 9430 2100 50  0001 C CNN
-F 3 "" H 9500 2100 50  0001 C CNN
-	1    9500 2100
+P 2250 2200
+F 0 "R?" V 2330 2200 50  0000 C CNN
+F 1 "1k" V 2250 2200 50  0000 C CNN
+F 2 "" V 2180 2200 50  0001 C CNN
+F 3 "" H 2250 2200 50  0001 C CNN
+	1    2250 2200
 	-1   0    0    1   
 $EndComp
 $Comp
 L LED D?
 U 1 1 59A311D1
-P 9500 2500
-F 0 "D?" H 9500 2600 50  0000 C CNN
-F 1 "LED" H 9500 2400 50  0000 C CNN
-F 2 "" H 9500 2500 50  0001 C CNN
-F 3 "" H 9500 2500 50  0001 C CNN
-	1    9500 2500
+P 2250 2550
+F 0 "D?" H 2250 2650 50  0000 C CNN
+F 1 "DONE" H 2250 2450 50  0000 C CNN
+F 2 "" H 2250 2550 50  0001 C CNN
+F 3 "" H 2250 2550 50  0001 C CNN
+	1    2250 2550
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR05
 U 1 1 59A31622
-P 8100 1950
-F 0 "#PWR?" H 8100 1700 50  0001 C CNN
-F 1 "GND" H 8100 1800 50  0000 C CNN
-F 2 "" H 8100 1950 50  0001 C CNN
-F 3 "" H 8100 1950 50  0001 C CNN
-	1    8100 1950
+P 850 2100
+F 0 "#PWR05" H 850 1850 50  0001 C CNN
+F 1 "GND" H 850 1950 50  0000 C CNN
+F 2 "" H 850 2100 50  0001 C CNN
+F 3 "" H 850 2100 50  0001 C CNN
+	1    850  2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L +BATT #PWR?
+L +BATT #PWR06
 U 1 1 59A350C2
-P 10150 1650
-F 0 "#PWR?" H 10150 1500 50  0001 C CNN
-F 1 "+BATT" H 10150 1790 50  0000 C CNN
-F 2 "" H 10150 1650 50  0001 C CNN
-F 3 "" H 10150 1650 50  0001 C CNN
-	1    10150 1650
+P 2750 1700
+F 0 "#PWR06" H 2750 1550 50  0001 C CNN
+F 1 "+BATT" H 2750 1840 50  0000 C CNN
+F 2 "" H 2750 1700 50  0001 C CNN
+F 3 "" H 2750 1700 50  0001 C CNN
+	1    2750 1700
 	1    0    0    -1  
 $EndComp
-Text Notes 7150 1150 0    60   ~ 0
-Needs modifications for load sharing, as a starting point see :\nsee http://blog.zakkemble.co.uk/a-lithium-battery-charger-with-load-sharing/ 
+Text Notes 750  1100 0    60   ~ 0
+Needs modifications for load sharing, as a starting point see :\nhttp://blog.zakkemble.co.uk/a-lithium-battery-charger-with-load-sharing/ 
 $Comp
 L R R?
 U 1 1 59A361E6
-P 3750 2800
-F 0 "R?" V 3830 2800 50  0000 C CNN
-F 1 "10k" V 3750 2800 50  0000 C CNN
-F 2 "" V 3680 2800 50  0001 C CNN
-F 3 "" H 3750 2800 50  0001 C CNN
-	1    3750 2800
+P 3850 4700
+F 0 "R?" V 3930 4700 50  0000 C CNN
+F 1 "10k" V 3850 4700 50  0000 C CNN
+F 2 "" V 3780 4700 50  0001 C CNN
+F 3 "" H 3850 4700 50  0001 C CNN
+	1    3850 4700
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C?
 U 1 1 59A3625C
-P 4000 3050
-F 0 "C?" H 4025 3150 50  0000 L CNN
-F 1 "0.1uF" H 4025 2950 50  0000 L CNN
-F 2 "" H 4038 2900 50  0001 C CNN
-F 3 "" H 4000 3050 50  0001 C CNN
-	1    4000 3050
+P 4100 4950
+F 0 "C?" H 4125 5050 50  0000 L CNN
+F 1 "0.1uF" H 4125 4850 50  0000 L CNN
+F 2 "" H 4138 4800 50  0001 C CNN
+F 3 "" H 4100 4950 50  0001 C CNN
+	1    4100 4950
 	0    -1   -1   0   
 $EndComp
 $Comp
 L SW_Push_Dual_x2 SW?
 U 1 1 59A363CE
-P 3750 3350
-F 0 "SW?" H 3800 3450 50  0000 L CNN
-F 1 "Reset" H 3750 3290 50  0000 C CNN
-F 2 "" H 3750 3550 50  0001 C CNN
-F 3 "" H 3750 3550 50  0001 C CNN
-	1    3750 3350
+P 3850 5250
+F 0 "SW?" H 3900 5350 50  0000 L CNN
+F 1 "Reset" H 3850 5190 50  0000 C CNN
+F 2 "" H 3850 5450 50  0001 C CNN
+F 3 "" H 3850 5450 50  0001 C CNN
+	1    3850 5250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L MCP73832-5-OT U?
 U 1 1 59A36575
-P 9000 1850
-F 0 "U?" H 8700 2100 50  0000 L CNN
-F 1 "MCP73832-5-OT" H 9050 2100 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-5" H 9050 1600 50  0001 L CIN
-F 3 "" H 8850 1800 50  0001 C CNN
-	1    9000 1850
+P 1750 1900
+F 0 "U?" H 1450 2150 50  0000 L CNN
+F 1 "MCP73832-5-OT" H 1800 2150 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-5" H 1800 1650 50  0001 L CIN
+F 3 "" H 1600 1850 50  0001 C CNN
+	1    1750 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR?
-U 1 1 59A378FB
-P 3750 2550
-F 0 "#PWR?" H 3750 2400 50  0001 C CNN
-F 1 "VCC" H 3750 2700 50  0000 C CNN
-F 2 "" H 3750 2550 50  0001 C CNN
-F 3 "" H 3750 2550 50  0001 C CNN
-	1    3750 2550
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
+L GND #PWR08
 U 1 1 59A381AA
-P 3750 3650
-F 0 "#PWR?" H 3750 3400 50  0001 C CNN
-F 1 "GND" H 3750 3500 50  0000 C CNN
-F 2 "" H 3750 3650 50  0001 C CNN
-F 3 "" H 3750 3650 50  0001 C CNN
-	1    3750 3650
+P 3850 5550
+F 0 "#PWR08" H 3850 5300 50  0001 C CNN
+F 1 "GND" H 3850 5400 50  0000 C CNN
+F 2 "" H 3850 5550 50  0001 C CNN
+F 3 "" H 3850 5550 50  0001 C CNN
+	1    3850 5550
 	1    0    0    -1  
 $EndComp
-Text Label 4400 3050 2    60   ~ 0
+Text Label 4500 4950 2    60   ~ 0
 DTR
 $Comp
-L VCC #PWR?
-U 1 1 59A38782
-P 900 1500
-F 0 "#PWR?" H 900 1350 50  0001 C CNN
-F 1 "VCC" H 900 1650 50  0000 C CNN
-F 2 "" H 900 1500 50  0001 C CNN
-F 3 "" H 900 1500 50  0001 C CNN
-	1    900  1500
-	1    0    0    -1  
-$EndComp
-$Comp
 L SIM808 IC?
 U 1 1 59A38866
-P 6850 2950
-F 0 "IC?" H 7550 3100 50  0000 C CNN
-F 1 "SIM808" H 7550 -500 50  0000 C CNN
-F 2 "SIM808" H 7550 -600 50  0001 C CNN
-F 3 "http://simcom.ee/documents/SIM808/SIM808_Hardware Design_V1.02.pdf" H 7550 -700 50  0001 C CNN
-F 4 "GSM GPRS CELLULAR MODULE" H 7550 -800 50  0001 C CNN "Description"
-F 5 "RS" H 7550 -900 50  0001 C CNN "Supplier_Name"
-F 6 "" H 7550 -1000 50  0001 C CNN "RS Part Number"
-F 7 "SIMCOM" H 7550 -1100 50  0001 C CNN "Manufacturer_Name"
-F 8 "SIM808" H 7550 -1200 50  0001 C CNN "Manufacturer_Part_Number"
-F 9 "" H 7550 -1300 50  0001 C CNN "Allied_Number"
-F 10 "" H 7550 -1400 50  0001 C CNN "Other Part Number"
-F 11 "" H 8100 -1500 50  0001 C CNN "Height"
-	1    6850 2950
-	1    0    0    -1  
-$EndComp
-Text Notes 1000 850  0    120  ~ 24
+P 9350 1250
+F 0 "IC?" H 10050 1400 50  0000 C CNN
+F 1 "SIM808" H 10050 -2200 50  0000 C CNN
+F 2 "SIM808" H 10050 -2300 50  0001 C CNN
+F 3 "http://simcom.ee/documents/SIM808/SIM808_Hardware Design_V1.02.pdf" H 10050 -2400 50  0001 C CNN
+F 4 "GSM GPRS CELLULAR MODULE" H 10050 -2500 50  0001 C CNN "Description"
+F 5 "RS" H 10050 -2600 50  0001 C CNN "Supplier_Name"
+F 6 "" H 10050 -2700 50  0001 C CNN "RS Part Number"
+F 7 "SIMCOM" H 10050 -2800 50  0001 C CNN "Manufacturer_Name"
+F 8 "SIM808" H 10050 -2900 50  0001 C CNN "Manufacturer_Part_Number"
+F 9 "" H 10050 -3000 50  0001 C CNN "Allied_Number"
+F 10 "" H 10050 -3100 50  0001 C CNN "Other Part Number"
+F 11 "" H 10600 -3200 50  0001 C CNN "Height"
+	1    9350 1250
+	1    0    0    -1  
+$EndComp
+Text Notes 4700 750  0    120  ~ 24
 Power supply
-Text Notes 1550 1350 0    120  ~ 24
+Text Notes 1650 3250 0    120  ~ 24
 Arduino
 $Comp
-L GND #PWR?
+L GND #PWR010
 U 1 1 59A39108
-P 900 4000
-F 0 "#PWR?" H 900 3750 50  0001 C CNN
-F 1 "GND" H 900 3850 50  0000 C CNN
-F 2 "" H 900 4000 50  0001 C CNN
-F 3 "" H 900 4000 50  0001 C CNN
-	1    900  4000
+P 1000 5900
+F 0 "#PWR010" H 1000 5650 50  0001 C CNN
+F 1 "GND" H 1000 5750 50  0000 C CNN
+F 2 "" H 1000 5900 50  0001 C CNN
+F 3 "" H 1000 5900 50  0001 C CNN
+	1    1000 5900
 	1    0    0    -1  
 $EndComp
 $Comp
 L SIM_Card J?
 U 1 1 59A3994A
-P 9600 5550
-F 0 "J?" H 9500 6050 50  0000 R CNN
-F 1 "SIM_Card" H 9550 5950 50  0000 R CNN
-F 2 "" H 9600 5900 50  0000 C CNN
-F 3 "" H 9550 5550 50  0000 C CNN
-	1    9600 5550
+P 10100 5950
+F 0 "J?" H 10000 6450 50  0000 R CNN
+F 1 "SIM_Card" H 10050 6350 50  0000 R CNN
+F 2 "" H 10100 6300 50  0000 C CNN
+F 3 "" H 10050 5950 50  0000 C CNN
+	1    10100 5950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_01X02 J?
 U 1 1 59A39AC9
-P 10500 1800
-F 0 "J?" H 10500 1950 50  0000 C CNN
-F 1 "CONN_01X02" V 10600 1800 50  0000 C CNN
-F 2 "" H 10500 1800 50  0001 C CNN
-F 3 "" H 10500 1800 50  0001 C CNN
-	1    10500 1800
+P 3400 1850
+F 0 "J?" H 3400 2000 50  0000 C CNN
+F 1 "CONN_01X02" V 3500 1850 50  0000 C CNN
+F 2 "" H 3400 1850 50  0001 C CNN
+F 3 "" H 3400 1850 50  0001 C CNN
+	1    3400 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
-U 1 1 59A39BDC
-P 10300 2300
-F 0 "#PWR?" H 10300 2050 50  0001 C CNN
-F 1 "GND" H 10300 2150 50  0000 C CNN
-F 2 "" H 10300 2300 50  0001 C CNN
-F 3 "" H 10300 2300 50  0001 C CNN
-	1    10300 2300
-	1    0    0    -1  
-$EndComp
-$Comp
-L +1V8 #PWR?
+L +1V8 #PWR012
 U 1 1 59A3A14C
-P 9000 5150
-F 0 "#PWR?" H 9000 5000 50  0001 C CNN
-F 1 "+1V8" H 9000 5290 50  0000 C CNN
-F 2 "" H 9000 5150 50  0001 C CNN
-F 3 "" H 9000 5150 50  0001 C CNN
-	1    9000 5150
+P 9500 5550
+F 0 "#PWR012" H 9500 5400 50  0001 C CNN
+F 1 "+1V8" H 9500 5690 50  0000 C CNN
+F 2 "" H 9500 5550 50  0001 C CNN
+F 3 "" H 9500 5550 50  0001 C CNN
+	1    9500 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR013
 U 1 1 59A3A71A
-P 9000 5850
-F 0 "#PWR?" H 9000 5600 50  0001 C CNN
-F 1 "GND" H 9000 5700 50  0000 C CNN
-F 2 "" H 9000 5850 50  0001 C CNN
-F 3 "" H 9000 5850 50  0001 C CNN
-	1    9000 5850
+P 9500 6250
+F 0 "#PWR013" H 9500 6000 50  0001 C CNN
+F 1 "GND" H 9500 6100 50  0000 C CNN
+F 2 "" H 9500 6250 50  0001 C CNN
+F 3 "" H 9500 6250 50  0001 C CNN
+	1    9500 6250
 	1    0    0    -1  
 $EndComp
-NoConn ~ 9100 5650
-Text Label 8600 5750 0    60   ~ 0
+NoConn ~ 9600 6050
+Text Label 9100 6150 0    60   ~ 0
 SIMDATA
-Text Label 8600 5350 0    60   ~ 0
+Text Label 9100 5750 0    60   ~ 0
 SIMRST
-Text Label 8600 5450 0    60   ~ 0
+Text Label 9100 5850 0    60   ~ 0
 SIMCLK
-Text Notes 9400 4750 0    120  ~ 24
+Text Notes 9050 5200 0    120  ~ 24
 SIM card
 $Comp
 L SMF05C TV?
 U 1 1 59A3AE00
-P 10700 5450
-F 0 "TV?" H 10450 5200 60  0000 C CNN
-F 1 "SMF05C" H 11000 5100 60  0000 C CNN
-F 2 "FT:SOT363" H 11000 5000 60  0001 C CNN
-F 3 "" H 11000 5200 60  0000 C CNN
-	1    10700 5450
-	1    0    0    -1  
+P 8550 5850
+F 0 "TV?" H 8300 5600 60  0000 C CNN
+F 1 "SMF05C" H 8850 5500 60  0000 C CNN
+F 2 "FT:SOT363" H 8850 5400 60  0001 C CNN
+F 3 "" H 8850 5600 60  0000 C CNN
+	1    8550 5850
+	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR014
 U 1 1 59A3AEDD
-P 10650 6050
-F 0 "#PWR?" H 10650 5800 50  0001 C CNN
-F 1 "GND" H 10650 5900 50  0000 C CNN
-F 2 "" H 10650 6050 50  0001 C CNN
-F 3 "" H 10650 6050 50  0001 C CNN
-	1    10650 6050
+P 7950 6250
+F 0 "#PWR014" H 7950 6000 50  0001 C CNN
+F 1 "GND" H 7950 6100 50  0000 C CNN
+F 2 "" H 7950 6250 50  0001 C CNN
+F 3 "" H 7950 6250 50  0001 C CNN
+	1    7950 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V8 #PWR?
-U 1 1 59A3AF67
-P 10500 4500
-F 0 "#PWR?" H 10500 4350 50  0001 C CNN
-F 1 "+1V8" H 10500 4640 50  0000 C CNN
-F 2 "" H 10500 4500 50  0001 C CNN
-F 3 "" H 10500 4500 50  0001 C CNN
-	1    10500 4500
-	1    0    0    -1  
-$EndComp
-Text Label 10600 4600 3    60   ~ 0
-SIMRST
-Text Label 10700 4600 3    60   ~ 0
-SIMCLK
-Text Label 10800 4600 3    60   ~ 0
-SIMDATA
-NoConn ~ 10900 5000
-$Comp
-L +1V8 #PWR?
+L +1V8 #PWR016
 U 1 1 59A3C174
-P 6450 5650
-F 0 "#PWR?" H 6450 5500 50  0001 C CNN
-F 1 "+1V8" H 6450 5790 50  0000 C CNN
-F 2 "" H 6450 5650 50  0001 C CNN
-F 3 "" H 6450 5650 50  0001 C CNN
-	1    6450 5650
+P 8950 3950
+F 0 "#PWR016" H 8950 3800 50  0001 C CNN
+F 1 "+1V8" H 8950 4090 50  0000 C CNN
+F 2 "" H 8950 3950 50  0001 C CNN
+F 3 "" H 8950 3950 50  0001 C CNN
+	1    8950 3950
 	1    0    0    -1  
 $EndComp
-Text Label 6450 5850 0    60   ~ 0
+Text Label 8950 4150 0    60   ~ 0
 SIMDATA
-Text Label 6450 5950 0    60   ~ 0
+Text Label 8950 4250 0    60   ~ 0
 SIMCLK
-Text Label 6450 6050 0    60   ~ 0
+Text Label 8950 4350 0    60   ~ 0
 SIMRST
-NoConn ~ 6850 6150
-NoConn ~ 2900 2200
-NoConn ~ 2900 2300
-Text Label 3350 3500 2    60   ~ 0
+NoConn ~ 9350 4450
+NoConn ~ 3000 4100
+NoConn ~ 3000 4200
+Text Label 3450 5400 2    60   ~ 0
 ARD_HTX
-Text Label 3350 3400 2    60   ~ 0
+Text Label 3450 5300 2    60   ~ 0
 ARD_HRX
-Text Label 6400 4350 0    60   ~ 0
+Text Label 8900 2650 0    60   ~ 0
 ARD_HTX
-Text Label 6400 4250 0    60   ~ 0
+Text Label 8900 2550 0    60   ~ 0
 ARD_HRX
-Text Label 6400 3650 0    60   ~ 0
+Text Label 8900 1950 0    60   ~ 0
 ARD_IO9
-Text Label 3350 1700 2    60   ~ 0
+Text Label 3450 3600 2    60   ~ 0
 ARD_IO9
-Text Label 3350 1600 2    60   ~ 0
+Text Label 3450 3500 2    60   ~ 0
 ARD_IO8
-Text Label 8700 4350 2    60   ~ 0
+Text Label 11200 2650 2    60   ~ 0
 ARD_IO10
 $Comp
 L Micro_SD_Card J?
 U 1 1 5A2F1BF7
-P 2650 6450
-F 0 "J?" H 2000 7050 50  0000 C CNN
-F 1 "Micro_SD_Card" H 3300 7050 50  0000 R CNN
-F 2 "" H 3800 6750 50  0001 C CNN
-F 3 "" H 2650 6450 50  0001 C CNN
-	1    2650 6450
+P 5800 6650
+F 0 "J?" H 5150 7250 50  0000 C CNN
+F 1 "Micro_SD_Card" H 6450 7250 50  0000 R CNN
+F 2 "" H 6950 6950 50  0001 C CNN
+F 3 "" H 5800 6650 50  0001 C CNN
+	1    5800 6650
 	1    0    0    -1  
 $EndComp
-Text Notes 2000 5550 0    120  ~ 24
+Text Notes 5150 5750 0    120  ~ 24
 SD card
 $Comp
-L GND #PWR?
+L GND #PWR017
 U 1 1 5A2F2761
-P 1600 7350
-F 0 "#PWR?" H 1600 7100 50  0001 C CNN
-F 1 "GND" H 1600 7200 50  0000 C CNN
-F 2 "" H 1600 7350 50  0001 C CNN
-F 3 "" H 1600 7350 50  0001 C CNN
-	1    1600 7350
-	1    0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR?
-U 1 1 5A2F2C2C
-P 1600 5700
-F 0 "#PWR?" H 1600 5550 50  0001 C CNN
-F 1 "VCC" H 1600 5850 50  0000 C CNN
-F 2 "" H 1600 5700 50  0001 C CNN
-F 3 "" H 1600 5700 50  0001 C CNN
-	1    1600 5700
+P 4750 7550
+F 0 "#PWR017" H 4750 7300 50  0001 C CNN
+F 1 "GND" H 4750 7400 50  0000 C CNN
+F 2 "" H 4750 7550 50  0001 C CNN
+F 3 "" H 4750 7550 50  0001 C CNN
+	1    4750 7550
 	1    0    0    -1  
 $EndComp
-Text Label 3350 1900 2    60   ~ 0
+Text Label 3450 3800 2    60   ~ 0
 ARD_MOSI
-Text Label 3350 2000 2    60   ~ 0
+Text Label 3450 3900 2    60   ~ 0
 ARD_MISO
-Text Label 3350 2100 2    60   ~ 0
+Text Label 3450 4000 2    60   ~ 0
 ARD_SCK
-Text Label 750  6550 0    60   ~ 0
+Text Label 3900 6750 0    60   ~ 0
 ARD_SCK
-Text Label 750  6250 0    60   ~ 0
+Text Label 3900 6450 0    60   ~ 0
 ARD_IO7
-Text Label 750  6350 0    60   ~ 0
+Text Label 3900 6550 0    60   ~ 0
 ARD_MOSI
-Text Label 750  6750 0    60   ~ 0
+Text Label 3900 6950 0    60   ~ 0
 ARD_MISO
-Text Label 3350 3900 2    60   ~ 0
+Text Label 3450 5800 2    60   ~ 0
 ARD_IO7
 $Comp
 L R R?
 U 1 1 5A2FA8A3
-P 1250 5950
-F 0 "R?" V 1330 5950 50  0000 C CNN
-F 1 "50k" V 1250 5950 50  0000 C CNN
-F 2 "" V 1180 5950 50  0001 C CNN
-F 3 "" H 1250 5950 50  0001 C CNN
-	1    1250 5950
+P 4400 6150
+F 0 "R?" V 4480 6150 50  0000 C CNN
+F 1 "50k" V 4400 6150 50  0000 C CNN
+F 2 "" V 4330 6150 50  0001 C CNN
+F 3 "" H 4400 6150 50  0001 C CNN
+	1    4400 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 5A2FAFE8
-P 1450 5950
-F 0 "R?" V 1530 5950 50  0000 C CNN
-F 1 "50k" V 1450 5950 50  0000 C CNN
-F 2 "" V 1380 5950 50  0001 C CNN
-F 3 "" H 1450 5950 50  0001 C CNN
-	1    1450 5950
+P 4600 6150
+F 0 "R?" V 4680 6150 50  0000 C CNN
+F 1 "50k" V 4600 6150 50  0000 C CNN
+F 2 "" V 4530 6150 50  0001 C CNN
+F 3 "" H 4600 6150 50  0001 C CNN
+	1    4600 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C?
 U 1 1 5A2FC40B
-P 650 1950
-F 0 "C?" H 675 2050 50  0000 L CNN
-F 1 "0.1uF" H 675 1850 50  0000 L CNN
-F 2 "" H 688 1800 50  0001 C CNN
-F 3 "" H 650 1950 50  0001 C CNN
-	1    650  1950
+P 750 3850
+F 0 "C?" H 775 3950 50  0000 L CNN
+F 1 "0.1uF" H 775 3750 50  0000 L CNN
+F 2 "" H 788 3700 50  0001 C CNN
+F 3 "" H 750 3850 50  0001 C CNN
+	1    750  3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR019
 U 1 1 5A2FC470
-P 650 2200
-F 0 "#PWR?" H 650 1950 50  0001 C CNN
-F 1 "GND" H 650 2050 50  0000 C CNN
-F 2 "" H 650 2200 50  0001 C CNN
-F 3 "" H 650 2200 50  0001 C CNN
-	1    650  2200
+P 750 4100
+F 0 "#PWR019" H 750 3850 50  0001 C CNN
+F 1 "GND" H 750 3950 50  0000 C CNN
+F 2 "" H 750 4100 50  0001 C CNN
+F 3 "" H 750 4100 50  0001 C CNN
+	1    750  4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_02X03 ICSP
 U 1 1 5A2FC760
-P 4400 1900
-F 0 "ICSP" H 4400 2100 50  0000 C CNN
-F 1 "CONN_02X03" H 4400 1700 50  0000 C CNN
-F 2 "" H 4400 700 50  0001 C CNN
-F 3 "" H 4400 700 50  0001 C CNN
-	1    4400 1900
+P 1500 7000
+F 0 "ICSP" H 1500 7200 50  0000 C CNN
+F 1 "CONN_02X03" H 1500 6800 50  0000 C CNN
+F 2 "" H 1500 5800 50  0001 C CNN
+F 3 "" H 1500 5800 50  0001 C CNN
+	1    1500 7000
 	1    0    0    -1  
 $EndComp
-Text Label 3350 3200 2    60   ~ 0
+Text Label 3450 5100 2    60   ~ 0
 ARD_RX
-Text Label 3350 3300 2    60   ~ 0
+Text Label 3450 5200 2    60   ~ 0
 ARD_TX
-Text Label 3750 1800 0    60   ~ 0
+Text Label 850  6900 0    60   ~ 0
 ARD_MISO
-$Comp
-L VCC #PWR?
-U 1 1 5A2FDE31
-P 4950 1650
-F 0 "#PWR?" H 4950 1500 50  0001 C CNN
-F 1 "VCC" H 4950 1800 50  0000 C CNN
-F 2 "" H 4950 1650 50  0001 C CNN
-F 3 "" H 4950 1650 50  0001 C CNN
-	1    4950 1650
-	1    0    0    -1  
-$EndComp
-Text Label 3750 1900 0    60   ~ 0
+Text Label 850  7000 0    60   ~ 0
 ARD_SCK
-Text Label 5100 1900 2    60   ~ 0
+Text Label 2200 7000 2    60   ~ 0
 ARD_MOSI
-Text Label 3350 3050 2    60   ~ 0
+Text Label 3450 4950 2    60   ~ 0
 ARD_RST
-Text Label 3750 2000 0    60   ~ 0
+Text Label 850  7100 0    60   ~ 0
 ARD_RST
 $Comp
-L GND #PWR?
+L GND #PWR021
 U 1 1 5A2FE0E4
-P 4950 2200
-F 0 "#PWR?" H 4950 1950 50  0001 C CNN
-F 1 "GND" H 4950 2050 50  0000 C CNN
-F 2 "" H 4950 2200 50  0001 C CNN
-F 3 "" H 4950 2200 50  0001 C CNN
-	1    4950 2200
+P 2050 7300
+F 0 "#PWR021" H 2050 7050 50  0001 C CNN
+F 1 "GND" H 2050 7150 50  0000 C CNN
+F 2 "" H 2050 7300 50  0001 C CNN
+F 3 "" H 2050 7300 50  0001 C CNN
+	1    2050 7300
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_01X06 J?
 U 1 1 5A302CC4
-P 5500 1900
-F 0 "J?" H 5500 2250 50  0000 C CNN
-F 1 "CONN_01X06" V 5600 1900 50  0000 C CNN
-F 2 "" H 5500 1900 50  0001 C CNN
-F 3 "" H 5500 1900 50  0001 C CNN
-	1    5500 1900
+P 2600 7000
+F 0 "J?" H 2600 7350 50  0000 C CNN
+F 1 "CONN_01X06" V 2700 7000 50  0000 C CNN
+F 2 "" H 2600 7000 50  0001 C CNN
+F 3 "" H 2600 7000 50  0001 C CNN
+	1    2600 7000
 	-1   0    0    1   
 $EndComp
+Connection ~ 2750 1800
 Wire Wire Line
-	9400 1750 10000 1750
+	1750 1350 1750 1600
+Connection ~ 1750 1500
 Wire Wire Line
-	10000 1750 10150 1750
+	2250 2700 2250 2800
 Wire Wire Line
-	10150 1750 10300 1750
-Connection ~ 10000 1750
+	2750 1700 2750 2250
 Wire Wire Line
-	9000 1450 9000 1550
-Connection ~ 8100 1450
+	3000 4950 3950 4950
 Wire Wire Line
-	7900 1450 8100 1450
+	3850 4850 3850 5050
+Connection ~ 3850 4950
 Wire Wire Line
-	8100 1450 9000 1450
+	3850 5550 3850 5450
 Wire Wire Line
-	9000 1450 9450 1450
+	4250 4950 4500 4950
 Wire Wire Line
-	9400 1950 9500 1950
-Connection ~ 9000 1450
+	1000 3800 1100 3800
 Wire Wire Line
-	9750 1450 9900 1450
+	1000 3400 1000 4100
 Wire Wire Line
-	9500 2350 9500 2250
+	750  3500 1100 3500
+Connection ~ 1000 3500
 Wire Wire Line
-	9500 2750 9500 2650
+	1100 3600 1000 3600
+Connection ~ 1000 3600
 Wire Wire Line
-	10000 2300 10000 2200
+	1000 4100 1100 4100
+Connection ~ 1000 3800
 Wire Wire Line
-	10000 1900 10000 1750
+	1100 5600 1000 5600
 Wire Wire Line
-	8100 1950 8100 1850
+	1000 5600 1000 5900
 Wire Wire Line
-	8100 1550 8100 1450
+	1100 5700 1000 5700
+Connection ~ 1000 5700
 Wire Wire Line
-	8600 1950 8500 1950
+	1000 5800 1100 5800
+Connection ~ 1000 5800
 Wire Wire Line
-	8500 1950 8500 2050
+	9000 5650 9600 5650
 Wire Wire Line
-	8500 2450 8500 2350
+	9500 5650 9500 5550
 Wire Wire Line
-	9000 2250 9000 2150
+	9000 5750 9600 5750
 Wire Wire Line
-	9800 1950 9900 1950
+	9000 5850 9600 5850
 Wire Wire Line
-	9900 1950 9900 1450
+	9600 5950 9500 5950
 Wire Wire Line
-	2900 3050 3750 3050
+	9500 5950 9500 6250
 Wire Wire Line
-	3750 3050 3850 3050
+	9600 6150 9100 6150
 Wire Wire Line
-	3750 2950 3750 3050
+	8950 4050 9350 4050
 Wire Wire Line
-	3750 3050 3750 3150
-Connection ~ 3750 3050
+	9350 4150 8950 4150
 Wire Wire Line
-	3750 3650 3750 3550
+	9350 4250 8950 4250
 Wire Wire Line
-	4150 3050 4400 3050
+	9350 4350 8950 4350
 Wire Wire Line
-	900  1900 1000 1900
+	8950 3950 8950 4050
 Wire Wire Line
-	900  1500 900  1600
+	8900 2550 9350 2550
 Wire Wire Line
-	900  1600 900  1700
+	8900 2650 9350 2650
 Wire Wire Line
-	900  1700 900  1900
+	9350 1950 8900 1950
 Wire Wire Line
-	900  1900 900  2200
+	3000 3500 3450 3500
 Wire Wire Line
-	650  1600 900  1600
+	3000 3600 3450 3600
 Wire Wire Line
-	900  1600 1000 1600
-Connection ~ 900  1600
+	10750 2650 11200 2650
 Wire Wire Line
-	1000 1700 900  1700
-Connection ~ 900  1700
+	4900 6850 4750 6850
 Wire Wire Line
-	900  2200 1000 2200
-Connection ~ 900  1900
+	4750 6850 4750 7550
 Wire Wire Line
-	1000 3700 900  3700
+	4750 6650 4900 6650
 Wire Wire Line
-	900  3700 900  3800
+	3000 3800 3450 3800
 Wire Wire Line
-	900  3800 900  3900
+	3000 3900 3450 3900
 Wire Wire Line
-	900  3900 900  4000
+	3000 4000 3450 4000
 Wire Wire Line
-	1000 3800 900  3800
-Connection ~ 900  3800
+	3900 6750 4900 6750
 Wire Wire Line
-	900  3900 1000 3900
-Connection ~ 900  3900
-Connection ~ 10150 1750
+	4750 5900 4750 6650
 Wire Wire Line
-	10150 1750 10150 1650
+	3900 6550 4900 6550
 Wire Wire Line
-	10300 2300 10300 1850
+	3900 6950 4900 6950
 Wire Wire Line
-	9100 5250 9000 5250
+	3000 5800 3450 5800
 Wire Wire Line
-	9000 5250 9000 5150
+	4400 6000 4400 5950
 Wire Wire Line
-	9100 5350 8600 5350
+	4900 6350 4600 6350
 Wire Wire Line
-	9100 5450 8600 5450
+	4600 6350 4600 6300
 Wire Wire Line
-	9100 5550 9000 5550
+	4600 6000 4600 5950
+Connection ~ 4600 5950
+Connection ~ 4750 5950
 Wire Wire Line
-	9000 5550 9000 5850
+	4400 5950 4750 5950
 Wire Wire Line
-	9100 5750 8600 5750
+	4900 7050 4400 7050
 Wire Wire Line
-	10650 6050 10650 5950
+	4400 7050 4400 6300
 Wire Wire Line
-	10500 5000 10500 4500
+	4900 6450 3900 6450
 Wire Wire Line
-	10600 5000 10600 4600
+	6600 7250 6650 7250
 Wire Wire Line
-	10700 5000 10700 4600
+	6650 7250 6650 7450
 Wire Wire Line
-	10800 5000 10800 4600
+	6650 7450 4750 7450
+Connection ~ 4750 7450
 Wire Wire Line
-	6450 5750 6850 5750
+	750  4100 750  4000
 Wire Wire Line
-	6850 5850 6450 5850
+	750  3500 750  3700
 Wire Wire Line
-	6850 5950 6450 5950
+	3000 5300 3450 5300
 Wire Wire Line
-	6850 6050 6450 6050
+	3000 5400 3450 5400
 Wire Wire Line
-	6450 5750 6450 5650
+	3000 5100 3450 5100
 Wire Wire Line
-	6400 4250 6850 4250
+	3000 5200 3450 5200
 Wire Wire Line
-	6400 4350 6850 4350
+	1750 6900 2050 6900
 Wire Wire Line
-	6850 3650 6400 3650
+	1750 7000 2200 7000
 Wire Wire Line
-	2900 1600 3350 1600
+	1750 7100 2050 7100
 Wire Wire Line
-	2900 1700 3350 1700
+	1250 6900 850  6900
 Wire Wire Line
-	8250 4350 8700 4350
+	1250 7000 850  7000
 Wire Wire Line
-	1750 6650 1600 6650
+	1250 7100 850  7100
 Wire Wire Line
-	1600 6650 1600 7250
+	2050 6900 2050 6750
 Wire Wire Line
-	1600 7250 1600 7350
+	2050 7100 2050 7300
+$Comp
+L GND #PWR022
+U 1 1 5A30354F
+P 2900 7350
+F 0 "#PWR022" H 2900 7100 50  0001 C CNN
+F 1 "GND" H 2900 7200 50  0000 C CNN
+F 2 "" H 2900 7350 50  0001 C CNN
+F 3 "" H 2900 7350 50  0001 C CNN
+	1    2900 7350
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	1600 6450 1750 6450
+	2800 7250 2900 7250
 Wire Wire Line
-	2900 1900 3350 1900
+	2900 7150 2900 7350
 Wire Wire Line
-	2900 2000 3350 2000
+	2900 7050 2800 7050
 Wire Wire Line
-	2900 2100 3350 2100
+	2900 6500 2900 7050
 Wire Wire Line
-	750  6550 1750 6550
+	3850 4550 3850 4450
 Wire Wire Line
-	1600 5700 1600 5750
+	2800 7150 2900 7150
+Connection ~ 2900 7250
 Wire Wire Line
-	1600 5750 1600 6450
+	2800 6950 3300 6950
 Wire Wire Line
-	750  6350 1750 6350
+	2800 6850 3300 6850
 Wire Wire Line
-	750  6750 1750 6750
+	2800 6750 3300 6750
+Text Label 3300 6950 2    60   ~ 0
+ARD_RX
+Text Label 3300 6850 2    60   ~ 0
+ARD_TX
+Text Label 3300 6750 2    60   ~ 0
+DTR
+$Comp
+L GND #PWR025
+U 1 1 5A307346
+P 7900 1100
+F 0 "#PWR025" H 7900 850 50  0001 C CNN
+F 1 "GND" H 7900 950 50  0000 C CNN
+F 2 "" H 7900 1100 50  0001 C CNN
+F 3 "" H 7900 1100 50  0001 C CNN
+	1    7900 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG026
+U 1 1 5A307386
+P 7900 900
+F 0 "#FLG026" H 7900 975 50  0001 C CNN
+F 1 "PWR_FLAG" H 7900 1050 50  0000 C CNN
+F 2 "" H 7900 900 50  0001 C CNN
+F 3 "" H 7900 900 50  0001 C CNN
+	1    7900 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG027
+U 1 1 5A3073DA
+P 6500 1100
+F 0 "#FLG027" H 6500 1175 50  0001 C CNN
+F 1 "PWR_FLAG" H 6500 1250 50  0000 C CNN
+F 2 "" H 6500 1100 50  0001 C CNN
+F 3 "" H 6500 1100 50  0001 C CNN
+	1    6500 1100
+	-1   0    0    1   
+$EndComp
 Wire Wire Line
-	2900 3900 3350 3900
+	7900 900  7900 1100
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 5A307EF1
+P 8850 4000
+F 0 "#FLG?" H 8850 4075 50  0001 C CNN
+F 1 "PWR_FLAG" H 8850 4150 50  0000 C CNN
+F 2 "" H 8850 4000 50  0001 C CNN
+F 3 "" H 8850 4000 50  0001 C CNN
+	1    8850 4000
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	1250 5800 1250 5750
+	8850 4000 8950 4000
+Connection ~ 8950 4000
 Wire Wire Line
-	1750 6150 1450 6150
+	9350 1250 8900 1250
 Wire Wire Line
-	1450 6150 1450 6100
+	8900 1250 8900 1550
 Wire Wire Line
-	1450 5800 1450 5750
-Connection ~ 1450 5750
-Connection ~ 1600 5750
+	9350 1350 8900 1350
+Connection ~ 8900 1350
 Wire Wire Line
-	1250 5750 1450 5750
+	9350 1450 8900 1450
+Connection ~ 8900 1450
+$Comp
+L GND #PWR?
+U 1 1 5A308AEB
+P 8900 1550
+F 0 "#PWR?" H 8900 1300 50  0001 C CNN
+F 1 "GND" H 8900 1400 50  0000 C CNN
+F 2 "" H 8900 1550 50  0001 C CNN
+F 3 "" H 8900 1550 50  0001 C CNN
+	1    8900 1550
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	1450 5750 1600 5750
+	9100 1750 9350 1750
 Wire Wire Line
-	1750 6850 1250 6850
+	9100 1750 9100 1650
 Wire Wire Line
-	1250 6850 1250 6100
+	9350 1650 9250 1650
 Wire Wire Line
-	1750 6250 750  6250
+	9250 1550 9250 1750
+Connection ~ 9250 1750
 Wire Wire Line
-	3450 7050 3500 7050
+	9350 1550 9250 1550
+Connection ~ 9250 1650
+$Comp
+L +BATT #PWR?
+U 1 1 5A308CF1
+P 9100 1650
+F 0 "#PWR?" H 9100 1500 50  0001 C CNN
+F 1 "+BATT" H 9100 1790 50  0000 C CNN
+F 2 "" H 9100 1650 50  0001 C CNN
+F 3 "" H 9100 1650 50  0001 C CNN
+	1    9100 1650
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 5A308F6D
+P 3100 1700
+F 0 "#FLG?" H 3100 1775 50  0001 C CNN
+F 1 "PWR_FLAG" H 3100 1850 50  0000 C CNN
+F 2 "" H 3100 1700 50  0001 C CNN
+F 3 "" H 3100 1700 50  0001 C CNN
+	1    3100 1700
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	3500 7050 3500 7250
+	2250 2050 2250 2000
+Connection ~ 2250 2000
 Wire Wire Line
-	3500 7250 1600 7250
-Connection ~ 1600 7250
+	2250 2350 2250 2400
 Wire Wire Line
-	650  2200 650  2100
+	2750 2550 2750 2750
 Wire Wire Line
-	650  1600 650  1800
+	2250 2750 3100 2750
+Connection ~ 2250 2750
+$Comp
+L +3.3V #PWR?
+U 1 1 5A309F93
+P 1000 3400
+F 0 "#PWR?" H 1000 3250 50  0001 C CNN
+F 1 "+3.3V" H 1000 3540 50  0000 C CNN
+F 2 "" H 1000 3400 50  0001 C CNN
+F 3 "" H 1000 3400 50  0001 C CNN
+	1    1000 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V #PWR?
+U 1 1 5A30A30A
+P 3850 4450
+F 0 "#PWR?" H 3850 4300 50  0001 C CNN
+F 1 "+3.3V" H 3850 4590 50  0000 C CNN
+F 2 "" H 3850 4450 50  0001 C CNN
+F 3 "" H 3850 4450 50  0001 C CNN
+	1    3850 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V #PWR?
+U 1 1 5A30A589
+P 2050 6750
+F 0 "#PWR?" H 2050 6600 50  0001 C CNN
+F 1 "+3.3V" H 2050 6890 50  0000 C CNN
+F 2 "" H 2050 6750 50  0001 C CNN
+F 3 "" H 2050 6750 50  0001 C CNN
+	1    2050 6750
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V #PWR?
+U 1 1 5A30A5D6
+P 4750 5900
+F 0 "#PWR?" H 4750 5750 50  0001 C CNN
+F 1 "+3.3V" H 4750 6040 50  0000 C CNN
+F 2 "" H 4750 5900 50  0001 C CNN
+F 3 "" H 4750 5900 50  0001 C CNN
+	1    4750 5900
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V #PWR?
+U 1 1 5A30A83F
+P 6500 900
+F 0 "#PWR?" H 6500 750 50  0001 C CNN
+F 1 "+3.3V" H 6500 1040 50  0000 C CNN
+F 2 "" H 6500 900 50  0001 C CNN
+F 3 "" H 6500 900 50  0001 C CNN
+	1    6500 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V_FDTI #PWR?
+U 1 1 5A30C5FE
+P 2900 6500
+F 0 "#PWR?" H 2900 6350 50  0001 C CNN
+F 1 "+3.3V_FDTI" H 2900 6640 50  0000 C CNN
+F 2 "" H 2900 6500 50  0001 C CNN
+F 3 "" H 2900 6500 50  0001 C CNN
+	1    2900 6500
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V_FDTI #PWR?
+U 1 1 5A30C863
+P 1750 1350
+F 0 "#PWR?" H 1750 1200 50  0001 C CNN
+F 1 "+3.3V_FDTI" H 1750 1490 50  0000 C CNN
+F 2 "" H 1750 1350 50  0001 C CNN
+F 3 "" H 1750 1350 50  0001 C CNN
+	1    1750 1350
+	1    0    0    -1  
+$EndComp
+$Comp
+L SW_DPDT_x2 SW?
+U 1 1 5A30CBDE
+P 4850 2350
+F 0 "SW?" H 4850 2520 50  0000 C CNN
+F 1 "SW_DPDT_x2" H 4850 2150 50  0000 C CNN
+F 2 "" H 4850 2350 50  0001 C CNN
+F 3 "" H 4850 2350 50  0001 C CNN
+	1    4850 2350
+	-1   0    0    1   
+$EndComp
+$Comp
+L SW_DPDT_x2 SW?
+U 2 1 5A30CC66
+P 4850 2850
+F 0 "SW?" H 4850 3020 50  0000 C CNN
+F 1 "SW_DPDT_x2" H 4850 2650 50  0000 C CNN
+F 2 "" H 4850 2850 50  0001 C CNN
+F 3 "" H 4850 2850 50  0001 C CNN
+	2    4850 2850
+	-1   0    0    1   
+$EndComp
+$Comp
+L MCP1700T-3002E/TT U?
+U 1 1 5A31E91B
+P 5150 1200
+F 0 "U?" H 5250 1000 50  0000 C CNN
+F 1 "MCP1700T-3302E/TT" H 5150 1500 50  0000 C CNN
+F 2 "" H 5150 1300 50  0001 C CNN
+F 3 "" H 5150 1300 50  0001 C CNN
+	1    5150 1200
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 5A32092F
+P 1750 2300
+F 0 "#PWR?" H 1750 2050 50  0001 C CNN
+F 1 "GND" H 1750 2150 50  0000 C CNN
+F 2 "" H 1750 2300 50  0001 C CNN
+F 3 "" H 1750 2300 50  0001 C CNN
+	1    1750 2300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	850  1500 1850 1500
+Wire Wire Line
+	1350 2000 1250 2000
 Wire Wire Line
-	2900 3400 3350 3400
+	850  2000 950  2000
+Connection ~ 850  2000
 Wire Wire Line
-	2900 3500 3350 3500
+	1750 2300 1750 2200
 Wire Wire Line
-	2900 3200 3350 3200
+	2150 1500 2250 1500
 Wire Wire Line
-	2900 3300 3350 3300
+	2150 2000 2600 2000
 Wire Wire Line
-	4650 1800 4950 1800
+	2600 1500 2550 1500
 Wire Wire Line
-	4650 1900 5100 1900
+	850  1550 850  1500
 Wire Wire Line
-	4650 2000 4950 2000
+	850  1850 850  2100
 Wire Wire Line
-	4150 1800 3750 1800
+	2600 2000 2600 1500
 Wire Wire Line
-	4150 1900 3750 1900
+	3100 1800 3100 1700
 Wire Wire Line
-	4150 2000 3750 2000
+	2150 1800 3200 1800
+Connection ~ 3100 1800
 Wire Wire Line
-	4950 1800 4950 1650
+	3200 1900 3100 1900
 Wire Wire Line
-	4950 2000 4950 2200
+	3100 1900 3100 2750
+Connection ~ 2750 2750
+$Comp
+L C C?
+U 1 1 5A323F60
+P 5550 1300
+F 0 "C?" H 5575 1400 50  0000 L CNN
+F 1 "1uF" H 5575 1200 50  0000 L CNN
+F 2 "" H 5588 1150 50  0001 C CNN
+F 3 "" H 5550 1300 50  0001 C CNN
+	1    5550 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5450 1100 5850 1100
+Wire Wire Line
+	5550 1100 5550 1150
 $Comp
 L GND #PWR?
-U 1 1 5A30354F
-P 5800 2250
-F 0 "#PWR?" H 5800 2000 50  0001 C CNN
-F 1 "GND" H 5800 2100 50  0000 C CNN
-F 2 "" H 5800 2250 50  0001 C CNN
-F 3 "" H 5800 2250 50  0001 C CNN
-	1    5800 2250
+U 1 1 5A324280
+P 5150 1600
+F 0 "#PWR?" H 5150 1350 50  0001 C CNN
+F 1 "GND" H 5150 1450 50  0000 C CNN
+F 2 "" H 5150 1600 50  0001 C CNN
+F 3 "" H 5150 1600 50  0001 C CNN
+	1    5150 1600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5700 2150 5800 2150
+	5550 1500 5550 1450
 Wire Wire Line
-	5800 2050 5800 2150
+	4700 1500 5550 1500
 Wire Wire Line
-	5800 2150 5800 2250
+	5150 1400 5150 1600
+Connection ~ 5150 1500
+$Comp
+L +3.3V_REGUL #PWR?
+U 1 1 5A3248EB
+P 5850 1050
+F 0 "#PWR?" H 5850 900 50  0001 C CNN
+F 1 "+3.3V_REGUL" H 5850 1190 50  0000 C CNN
+F 2 "" H 5850 1050 50  0001 C CNN
+F 3 "" H 5850 1050 50  0001 C CNN
+	1    5850 1050
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	5700 1950 5800 1950
+	5850 1100 5850 1050
+Connection ~ 5550 1100
+$Comp
+L C C?
+U 1 1 5A324C37
+P 4700 1300
+F 0 "C?" H 4725 1400 50  0000 L CNN
+F 1 "1uF" H 4725 1200 50  0000 L CNN
+F 2 "" H 4738 1150 50  0001 C CNN
+F 3 "" H 4700 1300 50  0001 C CNN
+	1    4700 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4700 1500 4700 1450
 Wire Wire Line
-	5800 1950 5800 1550
+	4700 1150 4700 1100
 Wire Wire Line
-	3750 2650 3750 2550
+	4550 1100 4850 1100
+Wire Wire Line
+	4550 1100 4550 1050
+Connection ~ 4700 1100
 $Comp
-L VCC #PWR?
-U 1 1 5A3037DE
-P 5800 1550
-F 0 "#PWR?" H 5800 1400 50  0001 C CNN
-F 1 "VCC" H 5800 1700 50  0000 C CNN
-F 2 "" H 5800 1550 50  0001 C CNN
-F 3 "" H 5800 1550 50  0001 C CNN
-	1    5800 1550
+L +BATT #PWR?
+U 1 1 5A324FF7
+P 4550 1050
+F 0 "#PWR?" H 4550 900 50  0001 C CNN
+F 1 "+BATT" H 4550 1190 50  0000 C CNN
+F 2 "" H 4550 1050 50  0001 C CNN
+F 3 "" H 4550 1050 50  0001 C CNN
+	1    4550 1050
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V #PWR?
+U 1 1 5A32564A
+P 5150 2150
+F 0 "#PWR?" H 5150 2000 50  0001 C CNN
+F 1 "+3.3V" H 5150 2290 50  0000 C CNN
+F 2 "" H 5150 2150 50  0001 C CNN
+F 3 "" H 5150 2150 50  0001 C CNN
+	1    5150 2150
 	1    0    0    -1  
 $EndComp
-Text Notes 5900 1450 0    60   ~ 0
-=> FTDI_VCC NOT VCC
 Wire Wire Line
-	5700 2050 5800 2050
-Connection ~ 5800 2150
+	5050 2850 5150 2850
 Wire Wire Line
-	5700 1850 6200 1850
+	5150 2850 5150 2150
 Wire Wire Line
-	5700 1750 6200 1750
+	5050 2350 5150 2350
+Connection ~ 5150 2350
+$Comp
+L +3.3V_FDTI #PWR?
+U 1 1 5A325AE4
+P 4000 2150
+F 0 "#PWR?" H 4000 2000 50  0001 C CNN
+F 1 "+3.3V_FDTI" H 4000 2290 50  0000 C CNN
+F 2 "" H 4000 2150 50  0001 C CNN
+F 3 "" H 4000 2150 50  0001 C CNN
+	1    4000 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3.3V_REGUL #PWR?
+U 1 1 5A325B97
+P 4500 2150
+F 0 "#PWR?" H 4500 2000 50  0001 C CNN
+F 1 "+3.3V_REGUL" H 4500 2290 50  0000 C CNN
+F 2 "" H 4500 2150 50  0001 C CNN
+F 3 "" H 4500 2150 50  0001 C CNN
+	1    4500 2150
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	5700 1650 6200 1650
-Text Label 6200 1850 2    60   ~ 0
-ARD_RX
-Text Label 6200 1750 2    60   ~ 0
-ARD_TX
-Text Label 6200 1650 2    60   ~ 0
-DTR
+	4500 2150 4500 2750
+Wire Wire Line
+	4500 2250 4650 2250
+Wire Wire Line
+	4500 2750 4650 2750
+Connection ~ 4500 2250
+Wire Wire Line
+	4000 2150 4000 2950
+Wire Wire Line
+	4000 2450 4650 2450
+Wire Wire Line
+	4000 2950 4650 2950
+Connection ~ 4000 2450
+Connection ~ 9500 5650
+Wire Wire Line
+	9000 5950 9100 5950
+Wire Wire Line
+	9100 5950 9100 6150
+NoConn ~ 9000 6050
+Wire Wire Line
+	7950 6250 7950 5800
+Wire Wire Line
+	7950 5800 8050 5800
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 5A327E3B
+P 7400 1100
+F 0 "#FLG?" H 7400 1175 50  0001 C CNN
+F 1 "PWR_FLAG" H 7400 1250 50  0000 C CNN
+F 2 "" H 7400 1100 50  0001 C CNN
+F 3 "" H 7400 1100 50  0001 C CNN
+	1    7400 1100
+	-1   0    0    1   
+$EndComp
+$Comp
+L +3.3V_REGUL #PWR?
+U 1 1 5A327E97
+P 7400 900
+F 0 "#PWR?" H 7400 750 50  0001 C CNN
+F 1 "+3.3V_REGUL" H 7400 1040 50  0000 C CNN
+F 2 "" H 7400 900 50  0001 C CNN
+F 3 "" H 7400 900 50  0001 C CNN
+	1    7400 900 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 900  7400 1100
+$Comp
+L +3.3V_FDTI #PWR?
+U 1 1 5A32837A
+P 6900 900
+F 0 "#PWR?" H 6900 750 50  0001 C CNN
+F 1 "+3.3V_FDTI" H 6900 1040 50  0000 C CNN
+F 2 "" H 6900 900 50  0001 C CNN
+F 3 "" H 6900 900 50  0001 C CNN
+	1    6900 900 
+	1    0    0    -1  
+$EndComp
+$Comp
+L PWR_FLAG #FLG?
+U 1 1 5A328442
+P 6900 1100
+F 0 "#FLG?" H 6900 1175 50  0001 C CNN
+F 1 "PWR_FLAG" H 6900 1250 50  0000 C CNN
+F 2 "" H 6900 1100 50  0001 C CNN
+F 3 "" H 6900 1100 50  0001 C CNN
+	1    6900 1100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6900 1100 6900 900 
+Wire Wire Line
+	6500 1100 6500 900 
+Text Notes 9550 800  0    120  ~ 24
+GPS & GSM
 $EndSCHEMATC
diff --git a/library/custom-power.bck b/library/custom-power.bck
new file mode 100644
index 0000000..81ac136
--- /dev/null
+++ b/library/custom-power.bck
@@ -0,0 +1,7 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP +3V3_FTDI
+K POWER, PWR
+$ENDCMP
+#
+#End Doc Library
diff --git a/library/custom-power.dcm b/library/custom-power.dcm
new file mode 100644
index 0000000..690c1c0
--- /dev/null
+++ b/library/custom-power.dcm
@@ -0,0 +1,11 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP +3V3_FTDI
+K POWER, PWR
+$ENDCMP
+#
+$CMP +3V3_REGUL
+K POWER, PWR
+$ENDCMP
+#
+#End Doc Library
diff --git a/library/custom-power.lib b/library/custom-power.lib
new file mode 100644
index 0000000..8b721fb
--- /dev/null
+++ b/library/custom-power.lib
@@ -0,0 +1,36 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +3V3_FTDI
+#
+DEF +3V3_FTDI #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3_FTDI" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V_FDTI
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3_FDTI 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +3V3_REGUL
+#
+DEF +3V3_REGUL #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3_REGUL" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V_REGUL
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3_REGUL 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library