diff --git a/.gitignore b/.gitignore
index 359e0b7..2ccbaa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 shimatta-libs
 *.bak
+*.bck
diff --git a/debug.sch b/debug.sch
index a4240dd..97fd2af 100644
--- a/debug.sch
+++ b/debug.sch
@@ -28,8 +28,10 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:lattice
 LIBS:Oscillators
+LIBS:lattice
+LIBS:pmic
+LIBS:specific-powersyms
 LIBS:fpgna-cache
 EELAYER 25 0
 EELAYER END
@@ -46,152 +48,6 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L USB_OTG P?
-U 1 1 563381DB
-P -200 -800
-F 0 "P?" H 125 -925 50  0000 C CNN
-F 1 "USB_OTG" H -200 -600 50  0000 C CNN
-F 2 "" V -250 -900 60  0000 C CNN
-F 3 "" V -250 -900 60  0000 C CNN
-	1    -200 -800
-	1    0    0    -1  
-$EndComp
-$Comp
-L GNDD #PWR?
-U 1 1 563381E2
-P 0 -450
-F 0 "#PWR?" H 0   -700 50  0001 C CNN
-F 1 "GNDD" H 0   -600 50  0000 C CNN
-F 2 "" H 0   -450 60  0000 C CNN
-F 3 "" H 0   -450 60  0000 C CNN
-	1    0    -450
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	0    -450 0    -500
-$Comp
-L +5V #PWR?
-U 1 1 563381E9
-P -650 -750
-F 0 "#PWR?" H -650 -900 50  0001 C CNN
-F 1 "+5V" H -650 -610 50  0000 C CNN
-F 2 "" H -650 -750 60  0000 C CNN
-F 3 "" H -650 -750 60  0000 C CNN
-	1    -650 -750
-	1    0    0    -1  
-$EndComp
-$Comp
-L INDUCTOR L?
-U 1 1 563381EF
-P -650 -400
-F 0 "L?" V -700 -400 50  0000 C CNN
-F 1 "INDUCTOR" V -550 -400 50  0000 C CNN
-F 2 "" H -650 -400 60  0000 C CNN
-F 3 "" H -650 -400 60  0000 C CNN
-	1    -650 -400
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	-650 -750 -650 -700
-Wire Wire Line
-	-650 -100 -650 -50 
-Wire Wire Line
-	-900 -50  -400 -50 
-Wire Wire Line
-	-400 -50  -400 -500
-$Comp
-L C C?
-U 1 1 563381FA
-P -900 -400
-F 0 "C?" H -875 -300 50  0000 L CNN
-F 1 "100n" H -875 -500 50  0000 L CNN
-F 2 "" H -862 -550 30  0000 C CNN
-F 3 "" H -900 -400 60  0000 C CNN
-	1    -900 -400
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	-900 -250 -900 -50 
-Connection ~ -650 -50 
-Wire Wire Line
-	-900 -550 -900 -700
-Wire Wire Line
-	-900 -700 -650 -700
-Connection ~ -650 -700
-$Comp
-L USB_OTG P?
-U 1 1 56338C96
-P 1450 950
-F 0 "P?" H 1775 825 50  0000 C CNN
-F 1 "USB_OTG" H 1450 1150 50  0000 C CNN
-F 2 "" V 1400 850 60  0000 C CNN
-F 3 "" V 1400 850 60  0000 C CNN
-	1    1450 950 
-	1    0    0    -1  
-$EndComp
-$Comp
-L GNDD #PWR?
-U 1 1 56338C9D
-P 1650 1300
-F 0 "#PWR?" H 1650 1050 50  0001 C CNN
-F 1 "GNDD" H 1650 1150 50  0000 C CNN
-F 2 "" H 1650 1300 60  0000 C CNN
-F 3 "" H 1650 1300 60  0000 C CNN
-	1    1650 1300
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1650 1300 1650 1250
-$Comp
-L +5V #PWR?
-U 1 1 56338CA4
-P 1000 1000
-F 0 "#PWR?" H 1000 850 50  0001 C CNN
-F 1 "+5V" H 1000 1140 50  0000 C CNN
-F 2 "" H 1000 1000 60  0000 C CNN
-F 3 "" H 1000 1000 60  0000 C CNN
-	1    1000 1000
-	1    0    0    -1  
-$EndComp
-$Comp
-L INDUCTOR L?
-U 1 1 56338CAA
-P 1000 1350
-F 0 "L?" V 950 1350 50  0000 C CNN
-F 1 "INDUCTOR" V 1100 1350 50  0000 C CNN
-F 2 "" H 1000 1350 60  0000 C CNN
-F 3 "" H 1000 1350 60  0000 C CNN
-	1    1000 1350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1000 1000 1000 1050
-Wire Wire Line
-	1000 1650 1000 1700
-Wire Wire Line
-	750  1700 1250 1700
-Wire Wire Line
-	1250 1700 1250 1250
-$Comp
-L C C?
-U 1 1 56338CB5
-P 750 1350
-F 0 "C?" H 775 1450 50  0000 L CNN
-F 1 "100n" H 775 1250 50  0000 L CNN
-F 2 "" H 788 1200 30  0000 C CNN
-F 3 "" H 750 1350 60  0000 C CNN
-	1    750  1350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	750  1500 750  1700
-Connection ~ 1000 1700
-Wire Wire Line
-	750  1200 750  1050
-Wire Wire Line
-	750  1050 1000 1050
-Connection ~ 1000 1050
-$Comp
 L Lattice-JTAG P?
 U 1 1 56338EF4
 P 4450 1600
diff --git a/fpgna-cache.lib b/fpgna-cache.lib
index 77a7bf2..07c275c 100644
--- a/fpgna-cache.lib
+++ b/fpgna-cache.lib
@@ -6,8 +6,8 @@ EESchema-LIBRARY Version 2.3
 DEF +1V2 #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "+1V2" 0 140 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 P 2 0 1 0  -30 50  0 100 N
 P 2 0 1 0  0 0  0 100 N
@@ -21,8 +21,8 @@ ENDDEF
 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 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 ALIAS +3.3V
 DRAW
 P 2 0 1 0  -30 50  0 100 N
@@ -32,28 +32,13 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# +5V
-#
-DEF +5V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5V" 0 140 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-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 +5V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
 # C
 #
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  C?
  C_????_*
@@ -69,13 +54,61 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_01X03
+#
+DEF CONN_01X03 P 0 40 Y N 1 F N
+F0 "P" 0 200 50 H V C CNN
+F1 "CONN_01X03" 100 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X03
+ Pin_Header_Angled_1X03
+ Socket_Strip_Straight_1X03
+ Socket_Strip_Angled_1X03
+$ENDFPLIST
+DRAW
+S -50 -95 10 -105 0 1 0 N
+S -50 5 10 -5 0 1 0 N
+S -50 105 10 95 0 1 0 N
+S -50 150 50 -150 0 1 0 N
+X P1 1 -200 100 150 R 50 50 1 1 P
+X P2 2 -200 0 150 R 50 50 1 1 P
+X P3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Small
+#
+DEF D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Schottky_Small" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *SingleDiode*
+ *_Diode_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0  -30 -40  -30 40 N
+P 3 0 1 0  -30 -40  -20 -40  -20 -30 N
+P 3 0 1 0  -30 40  -40 40  -40 30 N
+P 4 0 1 0  30 -40  -30 0  30 40  30 -40 F
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # GNDD
 #
 DEF GNDD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GNDD" 0 -150 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
 X GNDD 1 0 0 0 D 50 50 1 1 W N
@@ -87,25 +120,25 @@ ENDDEF
 DEF INDUCTOR L 0 40 N N 1 F N
 F0 "L" -50 0 50 V V C CNN
 F1 "INDUCTOR" 100 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
 A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
 A 0 51 51 -889 889 0 1 0 N 1 1 1 102
 A 0 148 48 -889 889 0 1 0 N 1 101 1 196
-X 1 1 0 300 100 D 70 70 1 1 P
-X 2 2 0 -300 100 U 70 70 1 1 P
+X 1 1 0 300 100 D 50 50 1 1 P
+X 2 2 0 -300 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
 # LD1117S33TR
 #
 DEF LD1117S33TR U 0 30 Y Y 1 F N
-F0 "U" 0 250 40 H V C CNN
-F1 "LD1117S33TR" 0 200 40 H V C CNN
-F2 "SOT-223" 0 100 40 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F0 "U" 0 250 50 H V C CNN
+F1 "LD1117S33TR" 0 200 50 H V C CNN
+F2 "SOT-223" 0 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 ALIAS LD1117S33CTR LD1117S12TR LD1117S12CTR LD1117S18TR LD1117S18CTR LD1117S25TR LD1117S25CTR LD1117S50TR LD1117S50CTR
 $FPLIST
  SOT223
@@ -315,37 +348,129 @@ X PROG 10 450 -200 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
+# Led_Small
+#
+DEF Led_Small D 0 10 N N 1 F N
+F0 "D" -50 125 50 H V L CNN
+F1 "Led_Small" -175 -100 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 2 0 1 0  -30 -40  -30 40 N
+P 4 0 1 0  30 -40  -30 0  30 40  30 -40 F
+P 5 0 1 0  0 30  -20 50  -10 50  -20 50  -20 40 N
+P 5 0 1 0  20 50  0 70  10 70  0 70  0 60 N
+X K 1 -100 0 70 R 40 40 1 1 P
+X A 2 100 0 70 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MCP73833
+#
+DEF MCP73833 U 0 40 Y Y 1 F N
+F0 "U" -250 350 60 H V C CNN
+F1 "MCP73833" -50 -550 60 H V C CNN
+F2 "" -300 -50 60 H V C CNN
+F3 "" -300 -50 60 H V C CNN
+$FPLIST
+ MSOP-10
+ DFN-10
+$ENDFPLIST
+DRAW
+S -300 300 300 -500 0 1 0 f
+X VDD 1 -500 200 200 R 50 50 1 1 W
+X VDD 2 -500 100 200 R 50 50 1 1 W
+X STAT1 3 -500 -50 200 R 50 50 1 1 C
+X STAT2 4 -500 -150 200 R 50 50 1 1 C
+X VSS 5 -500 -400 200 R 50 50 1 1 W
+X PROG 6 500 -400 200 L 50 50 1 1 I
+X PG 7 -500 -250 200 R 50 50 1 1 C
+X THERM 8 500 -50 200 L 50 50 1 1 I
+X VBAT 9 500 200 200 L 50 50 1 1 w
+X VBAT 10 500 100 200 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_BCE
+#
+DEF Q_NPN_BCE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_BCE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  25 25  100 100 N
+P 3 0 1 0  25 -25  100 -100  100 -100 N
+P 3 0 1 20  25 75  25 -75  25 -75 N
+P 5 0 1 0  50 -70  70 -50  90 -90  50 -70  50 -70 F
+X B 1 -200 0 225 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_DGS
+#
+DEF Q_PMOS_DGS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_DGS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  30 -70  100 -70 N
+P 2 0 1 10  30 -50  30 -90 N
+P 2 0 1 0  30 0  100 0 N
+P 2 0 1 10  30 20  30 -20 N
+P 2 0 1 0  30 70  100 70 N
+P 2 0 1 10  30 90  30 50 N
+P 2 0 1 0  100 -70  100 -100 N
+P 2 0 1 0  100 -70  100 0 N
+P 2 0 1 0  100 100  100 70 N
+P 3 0 1 10  10 75  10 -75  10 -75 N
+P 4 0 1 0  90 0  50 -15  50 15  90 0 F
+X D 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 30 V V C CNN
-F3 "" 0 0 30 H V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
 $FPLIST
  R_*
  Resistor_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 60 60 1 1 P
-X ~ 2 0 -150 50 U 60 60 1 1 P
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
 # TCXO_DFAS11
 #
 DEF TCXO_DFAS11 X 0 40 Y Y 1 F N
-F0 "X" 0 300 70 H V C CNN
+F0 "X" 0 300 50 H V C CNN
 F1 "TCXO_DFAS11" 0 0 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
 DRAW
 S -400 -250 400 250 0 1 0 N
-X VContr 1 -700 -150 300 R 60 60 1 1 P
-X GND 2 700 -150 300 L 60 60 1 1 P
-X FREQ 3 700 150 300 L 60 60 1 1 O
-X VCC 4 -700 150 300 R 60 60 1 1 W
+X VContr 1 -700 -150 300 R 50 50 1 1 P
+X GND 2 700 -150 300 L 50 50 1 1 P
+X FREQ 3 700 150 300 L 50 50 1 1 O
+X VCC 4 -700 150 300 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -354,8 +479,8 @@ ENDDEF
 DEF USB_OTG P 0 40 Y Y 1 F N
 F0 "P" 325 -125 50 H V C CNN
 F1 "USB_OTG" 0 200 50 H V C CNN
-F2 "" -50 -100 60 V V C CNN
-F3 "" -50 -100 60 V V C CNN
+F2 "" -50 -100 50 V V C CNN
+F3 "" -50 -100 50 V V C CNN
 $FPLIST
  USB*
 $ENDFPLIST
@@ -375,4 +500,49 @@ X shield 6 400 100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# VBAT
+#
+DEF VBAT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VBAT" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VBAT 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VSYS
+#
+DEF VSYS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VSYS" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VSYS 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VUSB
+#
+DEF VUSB #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VUSB" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VUSB 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/fpgna.pro b/fpgna.pro
index e4af05a..7e2a562 100644
--- a/fpgna.pro
+++ b/fpgna.pro
@@ -1,4 +1,4 @@
-update=Thu 29 Oct 2015 05:29:55 PM CET
+update=Mon 15 Feb 2016 11:28:47 AM CET
 version=1
 last_client=kicad
 [pcbnew]
@@ -27,7 +27,7 @@ NetIExt=net
 version=1
 [eeschema]
 version=1
-LibDir=
+LibDir=../ShimattaPCBLibs/schematics
 [eeschema/libraries]
 LibName1=power
 LibName2=device
@@ -58,5 +58,7 @@ LibName26=opto
 LibName27=atmel
 LibName28=contrib
 LibName29=valves
-LibName30=shimatta-libs/schematics/lattice/lattice
-LibName31=Oscillators
+LibName30=Oscillators
+LibName31=lattice/lattice
+LibName32=power/pmic
+LibName33=libs/specific-powersyms
diff --git a/fpgna.sch b/fpgna.sch
index b43389a..6c68ecc 100644
--- a/fpgna.sch
+++ b/fpgna.sch
@@ -28,8 +28,10 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:lattice
 LIBS:Oscillators
+LIBS:lattice
+LIBS:pmic
+LIBS:specific-powersyms
 LIBS:fpgna-cache
 EELAYER 25 0
 EELAYER END
diff --git a/libs/specific-powersyms.dcm b/libs/specific-powersyms.dcm
new file mode 100644
index 0000000..dd01f7e
--- /dev/null
+++ b/libs/specific-powersyms.dcm
@@ -0,0 +1,15 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP VBAT
+K POWER, PWR
+$ENDCMP
+#
+$CMP VSYS
+K POWER, PWR
+$ENDCMP
+#
+$CMP VUSB
+K POWER, PWR
+$ENDCMP
+#
+#End Doc Library
diff --git a/libs/specific-powersyms.lib b/libs/specific-powersyms.lib
new file mode 100644
index 0000000..914baad
--- /dev/null
+++ b/libs/specific-powersyms.lib
@@ -0,0 +1,49 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# VBAT
+#
+DEF VBAT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VBAT" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VBAT 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VSYS
+#
+DEF VSYS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VSYS" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VSYS 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VUSB
+#
+DEF VUSB #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VUSB" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+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 VUSB 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/power.sch b/power.sch
index 633babc..83930f6 100644
--- a/power.sch
+++ b/power.sch
@@ -28,8 +28,10 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:lattice
 LIBS:Oscillators
+LIBS:lattice
+LIBS:pmic
+LIBS:specific-powersyms
 LIBS:fpgna-cache
 EELAYER 25 0
 EELAYER END
@@ -169,17 +171,6 @@ F 3 "" H 1450 1550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR?
-U 1 1 56324CBC
-P 900 1000
-F 0 "#PWR?" H 900 850 50  0001 C CNN
-F 1 "+5V" H 900 1140 50  0000 C CNN
-F 2 "" H 900 1000 60  0000 C CNN
-F 3 "" H 900 1000 60  0000 C CNN
-	1    900  1000
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C?
 U 1 1 56324D2F
 P 2200 1300
@@ -190,88 +181,6 @@ F 3 "" H 2200 1300 60  0000 C CNN
 	1    2200 1300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1150 3500 1150 3850
-Wire Wire Line
-	1150 3550 1200 3550
-Wire Wire Line
-	1150 3650 1200 3650
-Connection ~ 1150 3550
-Wire Wire Line
-	1150 3750 1200 3750
-Connection ~ 1150 3650
-Wire Wire Line
-	1150 3850 1200 3850
-Connection ~ 1150 3750
-Wire Wire Line
-	1150 4750 1200 4750
-Wire Wire Line
-	1150 4050 1150 4750
-Wire Wire Line
-	1150 4550 1200 4550
-Wire Wire Line
-	1150 4350 1200 4350
-Connection ~ 1150 4550
-Wire Wire Line
-	1150 4250 1200 4250
-Connection ~ 1150 4350
-Wire Wire Line
-	1150 4150 1200 4150
-Connection ~ 1150 4250
-Wire Wire Line
-	900  4050 1200 4050
-Connection ~ 1150 4150
-Wire Wire Line
-	900  3500 900  4050
-Connection ~ 1150 4050
-Wire Wire Line
-	1200 4650 1100 4650
-Wire Wire Line
-	1100 4650 1100 4900
-Wire Wire Line
-	1100 4850 1200 4850
-Connection ~ 1100 4850
-Wire Wire Line
-	2500 3550 2550 3550
-Wire Wire Line
-	2550 3550 2550 3600
-Wire Wire Line
-	2750 3500 2750 3650
-Wire Wire Line
-	2900 3650 2900 3600
-Wire Wire Line
-	2900 3600 2750 3600
-Connection ~ 2750 3600
-Wire Wire Line
-	2750 3950 2750 4150
-Wire Wire Line
-	2900 4250 2900 3950
-Wire Wire Line
-	2900 4250 2500 4250
-Wire Wire Line
-	2750 4150 2500 4150
-Wire Wire Line
-	1450 1400 1450 1550
-Wire Wire Line
-	900  1500 900  1450
-Wire Wire Line
-	1900 1500 1900 1450
-Connection ~ 1450 1500
-Connection ~ 900  1100
-Connection ~ 1900 1100
-Wire Wire Line
-	2200 1500 2200 1450
-Connection ~ 1900 1500
-Wire Wire Line
-	1900 1150 1900 1100
-Wire Wire Line
-	2200 1100 2200 1150
-Wire Wire Line
-	900  1000 900  1150
-Wire Wire Line
-	900  1500 2200 1500
-Wire Wire Line
-	900  1100 1050 1100
 $Comp
 L INDUCTOR L?
 U 1 1 563252D9
@@ -283,7 +192,6 @@ F 3 "" H 2600 1100 60  0000 C CNN
 	1    2600 1100
 	0    -1   -1   0   
 $EndComp
-Connection ~ 2200 1100
 $Comp
 L +3V3 #PWR?
 U 1 1 56325352
@@ -295,10 +203,6 @@ F 3 "" H 3000 1000 60  0000 C CNN
 	1    3000 1000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3000 1000 3000 1100
-Wire Wire Line
-	3000 1100 2900 1100
 $Comp
 L LD1117S12CTR U?
 U 1 1 5632574B
@@ -355,17 +259,6 @@ F 3 "" H 1450 2550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR?
-U 1 1 56325A7C
-P 900 2000
-F 0 "#PWR?" H 900 1850 50  0001 C CNN
-F 1 "+5V" H 900 2140 50  0000 C CNN
-F 2 "" H 900 2000 60  0000 C CNN
-F 3 "" H 900 2000 60  0000 C CNN
-	1    900  2000
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C?
 U 1 1 56325A82
 P 2200 2300
@@ -376,28 +269,6 @@ F 3 "" H 2200 2300 60  0000 C CNN
 	1    2200 2300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1450 2400 1450 2550
-Wire Wire Line
-	900  2500 900  2450
-Wire Wire Line
-	1900 2500 1900 2450
-Connection ~ 1450 2500
-Connection ~ 900  2100
-Connection ~ 1900 2100
-Wire Wire Line
-	2200 2500 2200 2450
-Connection ~ 1900 2500
-Wire Wire Line
-	1900 2150 1900 2100
-Wire Wire Line
-	2200 2100 2200 2150
-Wire Wire Line
-	900  2000 900  2150
-Wire Wire Line
-	900  2500 2200 2500
-Wire Wire Line
-	900  2100 1050 2100
 $Comp
 L INDUCTOR L?
 U 1 1 56325A95
@@ -409,15 +280,6 @@ F 3 "" H 2600 2100 60  0000 C CNN
 	1    2600 2100
 	0    -1   -1   0   
 $EndComp
-Connection ~ 2200 2100
-Wire Wire Line
-	3000 2000 3000 2100
-Wire Wire Line
-	3000 2100 2900 2100
-Wire Wire Line
-	1850 1100 2300 1100
-Wire Wire Line
-	1850 2100 2300 2100
 $Comp
 L +1V2 #PWR?
 U 1 1 56325E26
@@ -506,20 +368,6 @@ F 3 "" H 4950 2300 60  0000 C CNN
 	1    4950 2300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3450 2150 4950 2150
-Connection ~ 3700 2150
-Connection ~ 3950 2150
-Connection ~ 4200 2150
-Connection ~ 4450 2150
-Connection ~ 4700 2150
-Connection ~ 4700 2450
-Connection ~ 4450 2450
-Connection ~ 4200 2450
-Connection ~ 3950 2450
-Connection ~ 3700 2450
-Wire Wire Line
-	3450 2450 4950 2450
 $Comp
 L +1V2 #PWR?
 U 1 1 56326FC5
@@ -531,8 +379,6 @@ F 3 "" H 4200 2050 60  0000 C CNN
 	1    4200 2050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4200 2050 4200 2150
 $Comp
 L GNDD #PWR?
 U 1 1 5632709B
@@ -544,8 +390,6 @@ F 3 "" H 4200 2550 60  0000 C CNN
 	1    4200 2550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4200 2550 4200 2450
 $Comp
 L C C?
 U 1 1 563274D8
@@ -623,22 +467,6 @@ F 3 "" H 4950 1300 60  0000 C CNN
 	1    4950 1300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3450 1150 5450 1150
-Connection ~ 3700 1150
-Connection ~ 3950 1150
-Connection ~ 4200 1150
-Connection ~ 4450 1150
-Connection ~ 4700 1150
-Connection ~ 4700 1450
-Connection ~ 4450 1450
-Connection ~ 4200 1450
-Connection ~ 3950 1450
-Connection ~ 3700 1450
-Wire Wire Line
-	3450 1450 5450 1450
-Wire Wire Line
-	4200 1050 4200 1150
 $Comp
 L GNDD #PWR?
 U 1 1 5632751F
@@ -650,8 +478,6 @@ F 3 "" H 4200 1550 60  0000 C CNN
 	1    4200 1550
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4200 1550 4200 1450
 $Comp
 L +3V3 #PWR?
 U 1 1 563275AE
@@ -685,10 +511,6 @@ F 3 "" H 5450 1300 60  0000 C CNN
 	1    5450 1300
 	1    0    0    -1  
 $EndComp
-Connection ~ 4950 1150
-Connection ~ 4950 1450
-Connection ~ 5200 1450
-Connection ~ 5200 1150
 $Comp
 L TCXO_DFAS11 X?
 U 1 1 56328B0D
@@ -711,10 +533,6 @@ F 3 "" H 3450 3500 60  0000 C CNN
 	1    3450 3500
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3450 3500 3450 3600
-Wire Wire Line
-	3450 3600 3550 3600
 $Comp
 L GNDD #PWR?
 U 1 1 56329332
@@ -726,14 +544,8 @@ F 3 "" H 5050 4000 60  0000 C CNN
 	1    5050 4000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5050 4000 5050 3900
-Wire Wire Line
-	5050 3900 4950 3900
 Text HLabel 5100 3600 2    60   Input ~ 0
 CLK_50M
-Wire Wire Line
-	5100 3600 4950 3600
 $Comp
 L USB_OTG P?
 U 1 1 5632B6C6
@@ -756,19 +568,6 @@ F 3 "" H 4300 4950 60  0000 C CNN
 	1    4300 4950
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4300 4950 4300 4900
-$Comp
-L +5V #PWR?
-U 1 1 56330BC1
-P 3650 4650
-F 0 "#PWR?" H 3650 4500 50  0001 C CNN
-F 1 "+5V" H 3650 4790 50  0000 C CNN
-F 2 "" H 3650 4650 60  0000 C CNN
-F 3 "" H 3650 4650 60  0000 C CNN
-	1    3650 4650
-	1    0    0    -1  
-$EndComp
 $Comp
 L INDUCTOR L?
 U 1 1 56331D46
@@ -780,14 +579,6 @@ F 3 "" H 3650 5000 60  0000 C CNN
 	1    3650 5000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3650 4650 3650 4700
-Wire Wire Line
-	3650 5300 3650 5350
-Wire Wire Line
-	3400 5350 3900 5350
-Wire Wire Line
-	3900 5350 3900 4900
 $Comp
 L C C?
 U 1 1 563362A8
@@ -799,6 +590,500 @@ F 3 "" H 3400 5000 60  0000 C CNN
 	1    3400 5000
 	1    0    0    -1  
 $EndComp
+$Comp
+L MCP73833 U?
+U 1 1 56C1D285
+P 8000 2200
+F 0 "U?" H 8000 2687 60  0000 C CNN
+F 1 "MCP73833" H 8000 2581 60  0000 C CNN
+F 2 "" H 7700 2150 60  0000 C CNN
+F 3 "" H 7700 2150 60  0000 C CNN
+	1    8000 2200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VUSB #PWR?
+U 1 1 56C1E573
+P 3650 4650
+F 0 "#PWR?" H 3650 4500 50  0001 C CNN
+F 1 "VUSB" H 3668 4824 50  0000 C CNN
+F 2 "" H 3650 4650 50  0000 C CNN
+F 3 "" H 3650 4650 50  0000 C CNN
+	1    3650 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBAT #PWR?
+U 1 1 56C1ED5D
+P 8550 1850
+F 0 "#PWR?" H 8550 1700 50  0001 C CNN
+F 1 "VBAT" H 8550 1990 50  0000 C CNN
+F 2 "" H 8550 1850 50  0000 C CNN
+F 3 "" H 8550 1850 50  0000 C CNN
+	1    8550 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L VUSB #PWR?
+U 1 1 56C1F811
+P 7450 1850
+F 0 "#PWR?" H 7450 1700 50  0001 C CNN
+F 1 "VUSB" H 7450 1990 50  0000 C CNN
+F 2 "" H 7450 1850 50  0000 C CNN
+F 3 "" H 7450 1850 50  0000 C CNN
+	1    7450 1850
+	1    0    0    -1  
+$EndComp
+Text HLabel 6750 2250 0    60   Input ~ 0
+CHG_ACTIVE_N
+Text HLabel 6750 2450 0    60   Input ~ 0
+USB_PRESENT_N
+$Comp
+L CONN_01X03 P?
+U 1 1 56C22F77
+P 10000 2350
+F 0 "P?" H 10077 2441 50  0000 L CNN
+F 1 "BAT" H 10077 2349 50  0000 L CNN
+F 2 "" H 10000 2350 50  0000 C CNN
+F 3 "" H 10000 2350 50  0000 C CNN
+F 4 "TODO: Verify pinout" H 10077 2250 60  0000 L CNN "TODO"
+	1    10000 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBAT #PWR?
+U 1 1 56C23113
+P 9750 1850
+F 0 "#PWR?" H 9750 1700 50  0001 C CNN
+F 1 "VBAT" H 9750 1990 50  0000 C CNN
+F 2 "" H 9750 1850 50  0000 C CNN
+F 3 "" H 9750 1850 50  0000 C CNN
+	1    9750 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C23816
+P 7450 3050
+F 0 "#PWR?" H 7450 2800 50  0001 C CNN
+F 1 "GNDD" H 7450 2900 50  0000 C CNN
+F 2 "" H 7450 3050 60  0000 C CNN
+F 3 "" H 7450 3050 60  0000 C CNN
+	1    7450 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C23E07
+P 9750 3050
+F 0 "#PWR?" H 9750 2800 50  0001 C CNN
+F 1 "GNDD" H 9750 2900 50  0000 C CNN
+F 2 "" H 9750 3050 60  0000 C CNN
+F 3 "" H 9750 3050 60  0000 C CNN
+	1    9750 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 56C24FD6
+P 8550 2800
+F 0 "R?" V 8630 2800 50  0000 C CNN
+F 1 "2.2k" V 8550 2800 50  0000 C CNN
+F 2 "" V 8480 2800 30  0000 C CNN
+F 3 "" H 8550 2800 30  0000 C CNN
+	1    8550 2800
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C253CE
+P 8550 3050
+F 0 "#PWR?" H 8550 2800 50  0001 C CNN
+F 1 "GNDD" H 8550 2900 50  0000 C CNN
+F 2 "" H 8550 3050 60  0000 C CNN
+F 3 "" H 8550 3050 60  0000 C CNN
+	1    8550 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L VUSB #PWR?
+U 1 1 56C2BB98
+P 7550 4250
+F 0 "#PWR?" H 7550 4100 50  0001 C CNN
+F 1 "VUSB" H 7550 4390 50  0000 C CNN
+F 2 "" H 7550 4250 50  0000 C CNN
+F 3 "" H 7550 4250 50  0000 C CNN
+	1    7550 4250
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBAT #PWR?
+U 1 1 56C2D4CD
+P 7350 4250
+F 0 "#PWR?" H 7350 4100 50  0001 C CNN
+F 1 "VBAT" H 7350 4390 50  0000 C CNN
+F 2 "" H 7350 4250 50  0000 C CNN
+F 3 "" H 7350 4250 50  0000 C CNN
+	1    7350 4250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Q_PMOS_DGS Q?
+U 1 1 56C2F230
+P 7850 4800
+F 0 "Q?" V 8182 4800 50  0000 C CNN
+F 1 "Q_PMOS_DGS" V 8090 4800 50  0000 C CNN
+F 2 "" H 8050 4900 50  0000 C CNN
+F 3 "" H 7850 4800 50  0000 C CNN
+	1    7850 4800
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R?
+U 1 1 56C2F66F
+P 7850 5250
+F 0 "R?" V 7930 5250 50  0000 C CNN
+F 1 "10k" V 7850 5250 50  0000 C CNN
+F 2 "" V 7780 5250 30  0000 C CNN
+F 3 "" H 7850 5250 30  0000 C CNN
+	1    7850 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C307A1
+P 7850 5450
+F 0 "#PWR?" H 7850 5200 50  0001 C CNN
+F 1 "GNDD" H 7850 5300 50  0000 C CNN
+F 2 "" H 7850 5450 60  0000 C CNN
+F 3 "" H 7850 5450 60  0000 C CNN
+	1    7850 5450
+	1    0    0    -1  
+$EndComp
+Text Label 6750 2600 2    60   ~ 0
+USB_PRESENT_N
+$Comp
+L D_Schottky_Small D?
+U 1 1 56C35CB0
+P 7850 4350
+F 0 "D?" H 7850 4144 50  0000 C CNN
+F 1 "Schottky" H 7850 4236 50  0000 C CNN
+F 2 "" V 7850 4350 50  0000 C CNN
+F 3 "" V 7850 4350 50  0000 C CNN
+	1    7850 4350
+	-1   0    0    1   
+$EndComp
+$Comp
+L VSYS #PWR?
+U 1 1 56C39868
+P 900 1000
+F 0 "#PWR?" H 900 850 50  0001 C CNN
+F 1 "VSYS" H 918 1174 50  0000 C CNN
+F 2 "" H 900 1000 50  0000 C CNN
+F 3 "" H 900 1000 50  0000 C CNN
+	1    900  1000
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSYS #PWR?
+U 1 1 56C398EF
+P 900 2000
+F 0 "#PWR?" H 900 1850 50  0001 C CNN
+F 1 "VSYS" H 918 2174 50  0000 C CNN
+F 2 "" H 900 2000 50  0000 C CNN
+F 3 "" H 900 2000 50  0000 C CNN
+	1    900  2000
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSYS #PWR?
+U 1 1 56C39AFF
+P 8300 4250
+F 0 "#PWR?" H 8300 4100 50  0001 C CNN
+F 1 "VSYS" H 8318 4424 50  0000 C CNN
+F 2 "" H 8300 4250 50  0000 C CNN
+F 3 "" H 8300 4250 50  0000 C CNN
+	1    8300 4250
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 56C403C0
+P 6800 2050
+F 0 "R?" V 6880 2050 50  0000 C CNN
+F 1 "10k" V 6800 2050 50  0000 C CNN
+F 2 "" V 6730 2050 30  0000 C CNN
+F 3 "" H 6800 2050 30  0000 C CNN
+	1    6800 2050
+	1    0    0    -1  
+$EndComp
+$Comp
+L +3V3 #PWR?
+U 1 1 56C41958
+P 6800 1850
+F 0 "#PWR?" H 6800 1700 50  0001 C CNN
+F 1 "+3V3" H 6800 1990 50  0000 C CNN
+F 2 "" H 6800 1850 60  0000 C CNN
+F 3 "" H 6800 1850 60  0000 C CNN
+	1    6800 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 56C4BA18
+P 7250 2350
+F 0 "R?" V 7330 2350 50  0000 C CNN
+F 1 "10k" V 7250 2350 50  0000 C CNN
+F 2 "" V 7180 2350 30  0000 C CNN
+F 3 "" H 7250 2350 30  0000 C CNN
+	1    7250 2350
+	0    1    1    0   
+$EndComp
+$Comp
+L Led_Small D?
+U 1 1 56C4BBBA
+P 7050 2000
+F 0 "D?" V 7149 1932 50  0000 R CNN
+F 1 "FULL" V 7057 1932 50  0000 R CNN
+F 2 "" V 7050 2000 50  0000 C CNN
+F 3 "" V 7050 2000 50  0000 C CNN
+F 4 "Green" V 6958 1932 60  0000 R CNN "Color"
+	1    7050 2000
+	0    -1   -1   0   
+$EndComp
+$Comp
+L VUSB #PWR?
+U 1 1 56C4BF63
+P 7050 1850
+F 0 "#PWR?" H 7050 1700 50  0001 C CNN
+F 1 "VUSB" H 7050 1990 50  0000 C CNN
+F 2 "" H 7050 1850 50  0000 C CNN
+F 3 "" H 7050 1850 50  0000 C CNN
+	1    7050 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C4E595
+P 8800 3050
+F 0 "#PWR?" H 8800 2800 50  0001 C CNN
+F 1 "GNDD" H 8800 2900 50  0000 C CNN
+F 2 "" H 8800 3050 60  0000 C CNN
+F 3 "" H 8800 3050 60  0000 C CNN
+	1    8800 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L VUSB #PWR?
+U 1 1 56C4F548
+P 9150 1850
+F 0 "#PWR?" H 9150 1700 50  0001 C CNN
+F 1 "VUSB" H 9150 1990 50  0000 C CNN
+F 2 "" H 9150 1850 50  0000 C CNN
+F 3 "" H 9150 1850 50  0000 C CNN
+	1    9150 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C4FA15
+P 9150 3050
+F 0 "#PWR?" H 9150 2800 50  0001 C CNN
+F 1 "GNDD" H 9150 2900 50  0000 C CNN
+F 2 "" H 9150 3050 60  0000 C CNN
+F 3 "" H 9150 3050 60  0000 C CNN
+	1    9150 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Q_NPN_BCE Q?
+U 1 1 56C500A2
+P 8900 2450
+F 0 "Q?" H 9094 2496 50  0000 L CNN
+F 1 "Q_NPN_BCE" H 9094 2404 50  0000 L CNN
+F 2 "" H 9100 2550 50  0000 C CNN
+F 3 "" H 8900 2450 50  0000 C CNN
+	1    8900 2450
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1150 3500 1150 3850
+Wire Wire Line
+	1150 3550 1200 3550
+Wire Wire Line
+	1150 3650 1200 3650
+Connection ~ 1150 3550
+Wire Wire Line
+	1150 3750 1200 3750
+Connection ~ 1150 3650
+Wire Wire Line
+	1150 3850 1200 3850
+Connection ~ 1150 3750
+Wire Wire Line
+	1150 4750 1200 4750
+Wire Wire Line
+	1150 4050 1150 4750
+Wire Wire Line
+	1150 4550 1200 4550
+Wire Wire Line
+	1150 4350 1200 4350
+Connection ~ 1150 4550
+Wire Wire Line
+	1150 4250 1200 4250
+Connection ~ 1150 4350
+Wire Wire Line
+	1150 4150 1200 4150
+Connection ~ 1150 4250
+Wire Wire Line
+	900  4050 1200 4050
+Connection ~ 1150 4150
+Wire Wire Line
+	900  3500 900  4050
+Connection ~ 1150 4050
+Wire Wire Line
+	1200 4650 1100 4650
+Wire Wire Line
+	1100 4650 1100 4900
+Wire Wire Line
+	1100 4850 1200 4850
+Connection ~ 1100 4850
+Wire Wire Line
+	2500 3550 2550 3550
+Wire Wire Line
+	2550 3550 2550 3600
+Wire Wire Line
+	2750 3500 2750 3650
+Wire Wire Line
+	2900 3650 2900 3600
+Wire Wire Line
+	2900 3600 2750 3600
+Connection ~ 2750 3600
+Wire Wire Line
+	2750 3950 2750 4150
+Wire Wire Line
+	2900 4250 2900 3950
+Wire Wire Line
+	2900 4250 2500 4250
+Wire Wire Line
+	2750 4150 2500 4150
+Wire Wire Line
+	1450 1400 1450 1550
+Wire Wire Line
+	900  1500 900  1450
+Wire Wire Line
+	1900 1500 1900 1450
+Connection ~ 1450 1500
+Connection ~ 900  1100
+Connection ~ 1900 1100
+Wire Wire Line
+	2200 1500 2200 1450
+Connection ~ 1900 1500
+Wire Wire Line
+	1900 1150 1900 1100
+Wire Wire Line
+	2200 1100 2200 1150
+Wire Wire Line
+	900  1000 900  1150
+Wire Wire Line
+	900  1500 2200 1500
+Wire Wire Line
+	900  1100 1050 1100
+Connection ~ 2200 1100
+Wire Wire Line
+	3000 1000 3000 1100
+Wire Wire Line
+	3000 1100 2900 1100
+Wire Wire Line
+	1450 2400 1450 2550
+Wire Wire Line
+	900  2500 900  2450
+Wire Wire Line
+	1900 2500 1900 2450
+Connection ~ 1450 2500
+Connection ~ 900  2100
+Connection ~ 1900 2100
+Wire Wire Line
+	2200 2500 2200 2450
+Connection ~ 1900 2500
+Wire Wire Line
+	1900 2150 1900 2100
+Wire Wire Line
+	2200 2100 2200 2150
+Wire Wire Line
+	900  2000 900  2150
+Wire Wire Line
+	900  2500 2200 2500
+Wire Wire Line
+	900  2100 1050 2100
+Connection ~ 2200 2100
+Wire Wire Line
+	3000 2000 3000 2100
+Wire Wire Line
+	3000 2100 2900 2100
+Wire Wire Line
+	1850 1100 2300 1100
+Wire Wire Line
+	1850 2100 2300 2100
+Wire Wire Line
+	3450 2150 4950 2150
+Connection ~ 3700 2150
+Connection ~ 3950 2150
+Connection ~ 4200 2150
+Connection ~ 4450 2150
+Connection ~ 4700 2150
+Connection ~ 4700 2450
+Connection ~ 4450 2450
+Connection ~ 4200 2450
+Connection ~ 3950 2450
+Connection ~ 3700 2450
+Wire Wire Line
+	3450 2450 4950 2450
+Wire Wire Line
+	4200 2050 4200 2150
+Wire Wire Line
+	4200 2550 4200 2450
+Wire Wire Line
+	3450 1150 5450 1150
+Connection ~ 3700 1150
+Connection ~ 3950 1150
+Connection ~ 4200 1150
+Connection ~ 4450 1150
+Connection ~ 4700 1150
+Connection ~ 4700 1450
+Connection ~ 4450 1450
+Connection ~ 4200 1450
+Connection ~ 3950 1450
+Connection ~ 3700 1450
+Wire Wire Line
+	3450 1450 5450 1450
+Wire Wire Line
+	4200 1050 4200 1150
+Wire Wire Line
+	4200 1550 4200 1450
+Connection ~ 4950 1150
+Connection ~ 4950 1450
+Connection ~ 5200 1450
+Connection ~ 5200 1150
+Wire Wire Line
+	3450 3500 3450 3600
+Wire Wire Line
+	3450 3600 3550 3600
+Wire Wire Line
+	5050 4000 5050 3900
+Wire Wire Line
+	5050 3900 4950 3900
+Wire Wire Line
+	5100 3600 4950 3600
+Wire Wire Line
+	4300 4950 4300 4900
+Wire Wire Line
+	3650 4650 3650 4700
+Wire Wire Line
+	3650 5300 3650 5350
+Wire Wire Line
+	3400 5350 3900 5350
+Wire Wire Line
+	3900 5350 3900 4900
 Wire Wire Line
 	3400 5150 3400 5350
 Connection ~ 3650 5350
@@ -807,4 +1092,168 @@ Wire Wire Line
 Wire Wire Line
 	3400 4700 3650 4700
 Connection ~ 3650 4700
+Wire Wire Line
+	8550 1850 8550 2100
+Wire Wire Line
+	8550 2000 8500 2000
+Wire Wire Line
+	8550 2100 8500 2100
+Connection ~ 8550 2000
+Wire Wire Line
+	7450 1850 7450 2100
+Wire Wire Line
+	7450 2100 7500 2100
+Connection ~ 7450 2000
+Wire Wire Line
+	9750 1850 9750 2350
+Wire Wire Line
+	7450 3050 7450 2600
+Wire Wire Line
+	7450 2600 7500 2600
+Wire Wire Line
+	9750 3050 9750 2450
+Wire Wire Line
+	9750 2350 9800 2350
+Wire Wire Line
+	9750 2450 9800 2450
+Wire Wire Line
+	8550 3050 8550 2950
+Wire Wire Line
+	8550 2650 8550 2600
+Wire Wire Line
+	8550 2600 8500 2600
+Wire Wire Line
+	7350 4700 7650 4700
+Wire Wire Line
+	7850 5000 7850 5100
+Wire Wire Line
+	7850 5450 7850 5400
+Wire Wire Line
+	7350 4250 7350 4700
+Wire Wire Line
+	8050 4700 8300 4700
+Wire Wire Line
+	8100 4700 8100 4350
+Wire Wire Line
+	8100 4350 7950 4350
+Wire Wire Line
+	7750 4350 7550 4350
+Wire Wire Line
+	7550 4250 7550 5050
+Wire Wire Line
+	7550 5050 7850 5050
+Connection ~ 7550 4350
+Connection ~ 7850 5050
+Wire Wire Line
+	8300 4700 8300 4250
+Connection ~ 8100 4700
+Wire Wire Line
+	6800 1850 6800 1900
+Wire Wire Line
+	7500 2000 7450 2000
+Wire Wire Line
+	6750 2250 7500 2250
+Wire Wire Line
+	7500 2350 7400 2350
+Wire Wire Line
+	7050 1900 7050 1850
+Wire Wire Line
+	7050 2100 7050 2350
+Wire Wire Line
+	7050 2350 7100 2350
+Wire Wire Line
+	6800 2200 6800 2250
+Connection ~ 6800 2250
+Wire Wire Line
+	6750 2450 7500 2450
+Wire Wire Line
+	6750 2600 6800 2600
+Wire Wire Line
+	6800 2600 6800 2450
+Connection ~ 6800 2450
+Wire Wire Line
+	8500 2250 8800 2250
+Wire Wire Line
+	9150 1850 9150 2100
+Wire Wire Line
+	8800 2650 8800 3050
+Wire Wire Line
+	8800 2250 8800 2050
+Wire Wire Line
+	9800 2050 9800 2250
+$Comp
+L R R?
+U 1 1 56C4F34C
+P 9150 2250
+F 0 "R?" V 9230 2250 50  0000 C CNN
+F 1 "10k" V 9150 2250 50  0000 C CNN
+F 2 "" V 9080 2250 30  0000 C CNN
+F 3 "" H 9150 2250 30  0000 C CNN
+	1    9150 2250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Q_NPN_BCE Q?
+U 1 1 56C54CE8
+P 9250 2650
+F 0 "Q?" H 9444 2696 50  0000 L CNN
+F 1 "Q_NPN_BCE" H 9444 2604 50  0000 L CNN
+F 2 "" H 9450 2750 50  0000 C CNN
+F 3 "" H 9250 2650 50  0000 C CNN
+	1    9250 2650
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	9150 2450 9150 2400
+Wire Wire Line
+	9100 2450 9150 2450
+Wire Wire Line
+	9150 2850 9150 3050
+Connection ~ 9150 2450
+$Comp
+L R R?
+U 1 1 56C590A7
+P 9950 2650
+F 0 "R?" V 10030 2650 50  0000 C CNN
+F 1 "10k" V 9950 2650 50  0000 C CNN
+F 2 "" V 9880 2650 30  0000 C CNN
+F 3 "" H 9950 2650 30  0000 C CNN
+	1    9950 2650
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9450 2650 9800 2650
+$Comp
+L R R?
+U 1 1 56C592CD
+P 9500 2850
+F 0 "R?" V 9580 2850 50  0000 C CNN
+F 1 "10k" V 9500 2850 50  0000 C CNN
+F 2 "" V 9430 2850 30  0000 C CNN
+F 3 "" H 9500 2850 30  0000 C CNN
+	1    9500 2850
+	-1   0    0    1   
+$EndComp
+$Comp
+L GNDD #PWR?
+U 1 1 56C59A2E
+P 9500 3050
+F 0 "#PWR?" H 9500 2800 50  0001 C CNN
+F 1 "GNDD" H 9500 2900 50  0000 C CNN
+F 2 "" H 9500 3050 60  0000 C CNN
+F 3 "" H 9500 3050 60  0000 C CNN
+	1    9500 3050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9500 3000 9500 3050
+Wire Wire Line
+	9500 2650 9500 2700
+Connection ~ 9500 2650
+Text HLabel 10150 2650 2    60   Input ~ 0
+CHARGE_ENABLE
+Wire Wire Line
+	10150 2650 10100 2650
+Wire Wire Line
+	8800 2050 9800 2050
 $EndSCHEMATC