diff --git a/gpstracker-cache.lib b/gpstracker-cache.lib
index 69a57ad..5be4ed4 100644
--- a/gpstracker-cache.lib
+++ b/gpstracker-cache.lib
@@ -374,27 +374,6 @@ X K K 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED-RESCUE-gpstracker
-#
-DEF LED-RESCUE-gpstracker D 0 40 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "LED-RESCUE-gpstracker" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
-$ENDFPLIST
-DRAW
-P 2 0 1 8 -50 -50 -50 50 N
-P 2 0 1 0 -50 0 50 0 N
-P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
-P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
-X K 1 -150 0 100 R 50 50 1 1 P
-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
@@ -526,24 +505,6 @@ X 2 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R-RESCUE-gpstracker
-#
-DEF R-RESCUE-gpstracker R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R-RESCUE-gpstracker" 0 0 50 V V C CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
- R_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # SIM808
 #
 DEF SIM808 IC 0 40 Y Y 1 L N
diff --git a/gpstracker.pro b/gpstracker.pro
index 9f00961..a211ce8 100644
--- a/gpstracker.pro
+++ b/gpstracker.pro
@@ -1,4 +1,4 @@
-update=12/16/17 22:05:51
+update=12/17/17 00:30:57
 version=1
 last_client=kicad
 [pcbnew]
@@ -29,182 +29,181 @@ version=1
 version=1
 LibDir=library
 [eeschema/libraries]
-LibName1=gpstracker-rescue
-LibName2=library/custom-charge
-LibName3=library/SIM808
-LibName4=library/freetronics/freetronics_schematic
-LibName5=library/custom-power
-LibName6=C:/Apps/Engineering/KiCad/share/kicad/library/74xgxx
-LibName7=C:/Apps/Engineering/KiCad/share/kicad/library/74xx
-LibName8=C:/Apps/Engineering/KiCad/share/kicad/library/ac-dc
-LibName9=C:/Apps/Engineering/KiCad/share/kicad/library/actel
-LibName10=C:/Apps/Engineering/KiCad/share/kicad/library/adc-dac
-LibName11=C:/Apps/Engineering/KiCad/share/kicad/library/allegro
-LibName12=C:/Apps/Engineering/KiCad/share/kicad/library/Altera
-LibName13=C:/Apps/Engineering/KiCad/share/kicad/library/analog_devices
-LibName14=C:/Apps/Engineering/KiCad/share/kicad/library/Analog_Switch
-LibName15=C:/Apps/Engineering/KiCad/share/kicad/library/analog_switches
-LibName16=C:/Apps/Engineering/KiCad/share/kicad/library/atmel
-LibName17=C:/Apps/Engineering/KiCad/share/kicad/library/Audio
-LibName18=C:/Apps/Engineering/KiCad/share/kicad/library/Battery_Management
-LibName19=C:/Apps/Engineering/KiCad/share/kicad/library/bbd
-LibName20=C:/Apps/Engineering/KiCad/share/kicad/library/bosch
-LibName21=C:/Apps/Engineering/KiCad/share/kicad/library/brooktre
-LibName22=C:/Apps/Engineering/KiCad/share/kicad/library/cmos_ieee
-LibName23=C:/Apps/Engineering/KiCad/share/kicad/library/cmos4000
-LibName24=C:/Apps/Engineering/KiCad/share/kicad/library/conn
-LibName25=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Generic
-LibName26=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Generic_Shielded
-LibName27=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Specialized
-LibName28=C:/Apps/Engineering/KiCad/share/kicad/library/contrib
-LibName29=C:/Apps/Engineering/KiCad/share/kicad/library/Converter_DCDC
-LibName30=C:/Apps/Engineering/KiCad/share/kicad/library/CPLD_Altera
-LibName31=C:/Apps/Engineering/KiCad/share/kicad/library/cypress
-LibName32=C:/Apps/Engineering/KiCad/share/kicad/library/dc-dc
-LibName33=C:/Apps/Engineering/KiCad/share/kicad/library/device
-LibName34=C:/Apps/Engineering/KiCad/share/kicad/library/digital-audio
-LibName35=C:/Apps/Engineering/KiCad/share/kicad/library/Diode
-LibName36=C:/Apps/Engineering/KiCad/share/kicad/library/display
-LibName37=C:/Apps/Engineering/KiCad/share/kicad/library/Display_Character
-LibName38=C:/Apps/Engineering/KiCad/share/kicad/library/Display_Graphic
-LibName39=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_Display
-LibName40=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_FET
-LibName41=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_LED
-LibName42=C:/Apps/Engineering/KiCad/share/kicad/library/dsp
-LibName43=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Freescale
-LibName44=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Microchip_DSPIC33
-LibName45=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Texas
-LibName46=C:/Apps/Engineering/KiCad/share/kicad/library/elec-unifil
-LibName47=C:/Apps/Engineering/KiCad/share/kicad/library/ESD_Protection
-LibName48=C:/Apps/Engineering/KiCad/share/kicad/library/FPGA_Actel
-LibName49=C:/Apps/Engineering/KiCad/share/kicad/library/ftdi
-LibName50=C:/Apps/Engineering/KiCad/share/kicad/library/gennum
-LibName51=C:/Apps/Engineering/KiCad/share/kicad/library/Graphic
-LibName52=C:/Apps/Engineering/KiCad/share/kicad/library/hc11
-LibName53=C:/Apps/Engineering/KiCad/share/kicad/library/intel
-LibName54=C:/Apps/Engineering/KiCad/share/kicad/library/interface
-LibName55=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_CAN_LIN
-LibName56=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_Ethernet
-LibName57=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_Telecom
-LibName58=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_USB
-LibName59=C:/Apps/Engineering/KiCad/share/kicad/library/ir
-LibName60=C:/Apps/Engineering/KiCad/share/kicad/library/Lattice
-LibName61=C:/Apps/Engineering/KiCad/share/kicad/library/LED
-LibName62=C:/Apps/Engineering/KiCad/share/kicad/library/leds
-LibName63=C:/Apps/Engineering/KiCad/share/kicad/library/linear
-LibName64=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_74xgxx
-LibName65=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_74xx
-LibName66=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_CMOS_4000
-LibName67=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_CMOS_IEEE
-LibName68=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_Programmable
-LibName69=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_TTL_IEEE
-LibName70=C:/Apps/Engineering/KiCad/share/kicad/library/logo
-LibName71=C:/Apps/Engineering/KiCad/share/kicad/library/maxim
-LibName72=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_AnalogDevices
-LibName73=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Infineon
-LibName74=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC10
-LibName75=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC12
-LibName76=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC16
-LibName77=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC18
-LibName78=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC24
-LibName79=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC32
-LibName80=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_Kinetis
-LibName81=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_LPC
-LibName82=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_S08
-LibName83=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Parallax
-LibName84=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_SiFive
-LibName85=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_SiliconLabs
-LibName86=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_ST_STM8
-LibName87=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_ST_STM32
-LibName88=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Texas_MSP430
-LibName89=C:/Apps/Engineering/KiCad/share/kicad/library/Mechanical
-LibName90=C:/Apps/Engineering/KiCad/share/kicad/library/memory
-LibName91=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_EEPROM
-LibName92=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_Flash
-LibName93=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_NVRAM
-LibName94=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_RAM
-LibName95=C:/Apps/Engineering/KiCad/share/kicad/library/microchip
-LibName96=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_dspic33dsc
-LibName97=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic10mcu
-LibName98=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic12mcu
-LibName99=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic16mcu
-LibName100=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic18mcu
-LibName101=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic24mcu
-LibName102=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic32mcu
-LibName103=C:/Apps/Engineering/KiCad/share/kicad/library/microcontrollers
-LibName104=C:/Apps/Engineering/KiCad/share/kicad/library/modules
-LibName105=C:/Apps/Engineering/KiCad/share/kicad/library/Motor
-LibName106=C:/Apps/Engineering/KiCad/share/kicad/library/motor_drivers
-LibName107=C:/Apps/Engineering/KiCad/share/kicad/library/motorola
-LibName108=C:/Apps/Engineering/KiCad/share/kicad/library/motors
-LibName109=C:/Apps/Engineering/KiCad/share/kicad/library/msp430
-LibName110=C:/Apps/Engineering/KiCad/share/kicad/library/nordicsemi
-LibName111=C:/Apps/Engineering/KiCad/share/kicad/library/nxp
-LibName112=C:/Apps/Engineering/KiCad/share/kicad/library/nxp_armmcu
-LibName113=C:/Apps/Engineering/KiCad/share/kicad/library/onsemi
-LibName114=C:/Apps/Engineering/KiCad/share/kicad/library/opto
-LibName115=C:/Apps/Engineering/KiCad/share/kicad/library/Oscillator
-LibName116=C:/Apps/Engineering/KiCad/share/kicad/library/Oscillators
-LibName117=C:/Apps/Engineering/KiCad/share/kicad/library/philips
-LibName118=C:/Apps/Engineering/KiCad/share/kicad/library/Potentiometer_Digital
-LibName119=C:/Apps/Engineering/KiCad/share/kicad/library/power
-LibName120=C:/Apps/Engineering/KiCad/share/kicad/library/Power_Management
-LibName121=C:/Apps/Engineering/KiCad/share/kicad/library/Power_Protection
-LibName122=C:/Apps/Engineering/KiCad/share/kicad/library/powerint
-LibName123=C:/Apps/Engineering/KiCad/share/kicad/library/pspice
-LibName124=C:/Apps/Engineering/KiCad/share/kicad/library/Reference_Current
-LibName125=C:/Apps/Engineering/KiCad/share/kicad/library/Reference_Voltage
-LibName126=C:/Apps/Engineering/KiCad/share/kicad/library/references
-LibName127=C:/Apps/Engineering/KiCad/share/kicad/library/regul
-LibName128=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Controller
-LibName129=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Current
-LibName130=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Linear
-LibName131=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_SwitchedCapacitor
-LibName132=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Switching
-LibName133=C:/Apps/Engineering/KiCad/share/kicad/library/Relay
-LibName134=C:/Apps/Engineering/KiCad/share/kicad/library/relays
-LibName135=C:/Apps/Engineering/KiCad/share/kicad/library/RF_AM_FM
-LibName136=C:/Apps/Engineering/KiCad/share/kicad/library/RF_Bluetooth
-LibName137=C:/Apps/Engineering/KiCad/share/kicad/library/RF_Module
-LibName138=C:/Apps/Engineering/KiCad/share/kicad/library/RF_WiFi
-LibName139=C:/Apps/Engineering/KiCad/share/kicad/library/rfcom
-LibName140=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor
-LibName141=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Audio
-LibName142=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Current
-LibName143=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Gas
-LibName144=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Humidity
-LibName145=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Magnetic
-LibName146=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Motion
-LibName147=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_MultiFunction
-LibName148=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Optical
-LibName149=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Pressure
-LibName150=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Temperature
-LibName151=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Touch
-LibName152=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Voltage
-LibName153=C:/Apps/Engineering/KiCad/share/kicad/library/sensors
-LibName154=C:/Apps/Engineering/KiCad/share/kicad/library/silabs
-LibName155=C:/Apps/Engineering/KiCad/share/kicad/library/siliconi
-LibName156=C:/Apps/Engineering/KiCad/share/kicad/library/stm8
-LibName157=C:/Apps/Engineering/KiCad/share/kicad/library/stm32
-LibName158=C:/Apps/Engineering/KiCad/share/kicad/library/supertex
-LibName159=C:/Apps/Engineering/KiCad/share/kicad/library/Switch
-LibName160=C:/Apps/Engineering/KiCad/share/kicad/library/switches
-LibName161=C:/Apps/Engineering/KiCad/share/kicad/library/texas
-LibName162=C:/Apps/Engineering/KiCad/share/kicad/library/Timer
-LibName163=C:/Apps/Engineering/KiCad/share/kicad/library/transf
-LibName164=C:/Apps/Engineering/KiCad/share/kicad/library/Transformer
-LibName165=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_BJT
-LibName166=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_FET
-LibName167=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_IGBT
-LibName168=C:/Apps/Engineering/KiCad/share/kicad/library/transistors
-LibName169=C:/Apps/Engineering/KiCad/share/kicad/library/triac_thyristor
-LibName170=C:/Apps/Engineering/KiCad/share/kicad/library/ttl_ieee
-LibName171=C:/Apps/Engineering/KiCad/share/kicad/library/Valve
-LibName172=C:/Apps/Engineering/KiCad/share/kicad/library/valves
-LibName173=C:/Apps/Engineering/KiCad/share/kicad/library/video
-LibName174=C:/Apps/Engineering/KiCad/share/kicad/library/wiznet
-LibName175=C:/Apps/Engineering/KiCad/share/kicad/library/Worldsemi
-LibName176=C:/Apps/Engineering/KiCad/share/kicad/library/Xicor
-LibName177=C:/Apps/Engineering/KiCad/share/kicad/library/xilinx
-LibName178=C:/Apps/Engineering/KiCad/share/kicad/library/zetex
-LibName179=C:/Apps/Engineering/KiCad/share/kicad/library/Zilog
+LibName1=library/custom-charge
+LibName2=library/SIM808
+LibName3=library/freetronics/freetronics_schematic
+LibName4=library/custom-power
+LibName5=C:/Apps/Engineering/KiCad/share/kicad/library/74xgxx
+LibName6=C:/Apps/Engineering/KiCad/share/kicad/library/74xx
+LibName7=C:/Apps/Engineering/KiCad/share/kicad/library/ac-dc
+LibName8=C:/Apps/Engineering/KiCad/share/kicad/library/actel
+LibName9=C:/Apps/Engineering/KiCad/share/kicad/library/adc-dac
+LibName10=C:/Apps/Engineering/KiCad/share/kicad/library/allegro
+LibName11=C:/Apps/Engineering/KiCad/share/kicad/library/Altera
+LibName12=C:/Apps/Engineering/KiCad/share/kicad/library/analog_devices
+LibName13=C:/Apps/Engineering/KiCad/share/kicad/library/Analog_Switch
+LibName14=C:/Apps/Engineering/KiCad/share/kicad/library/analog_switches
+LibName15=C:/Apps/Engineering/KiCad/share/kicad/library/atmel
+LibName16=C:/Apps/Engineering/KiCad/share/kicad/library/Audio
+LibName17=C:/Apps/Engineering/KiCad/share/kicad/library/Battery_Management
+LibName18=C:/Apps/Engineering/KiCad/share/kicad/library/bbd
+LibName19=C:/Apps/Engineering/KiCad/share/kicad/library/bosch
+LibName20=C:/Apps/Engineering/KiCad/share/kicad/library/brooktre
+LibName21=C:/Apps/Engineering/KiCad/share/kicad/library/cmos_ieee
+LibName22=C:/Apps/Engineering/KiCad/share/kicad/library/cmos4000
+LibName23=C:/Apps/Engineering/KiCad/share/kicad/library/conn
+LibName24=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Generic
+LibName25=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Generic_Shielded
+LibName26=C:/Apps/Engineering/KiCad/share/kicad/library/Connector_Specialized
+LibName27=C:/Apps/Engineering/KiCad/share/kicad/library/contrib
+LibName28=C:/Apps/Engineering/KiCad/share/kicad/library/Converter_DCDC
+LibName29=C:/Apps/Engineering/KiCad/share/kicad/library/CPLD_Altera
+LibName30=C:/Apps/Engineering/KiCad/share/kicad/library/cypress
+LibName31=C:/Apps/Engineering/KiCad/share/kicad/library/dc-dc
+LibName32=C:/Apps/Engineering/KiCad/share/kicad/library/device
+LibName33=C:/Apps/Engineering/KiCad/share/kicad/library/digital-audio
+LibName34=C:/Apps/Engineering/KiCad/share/kicad/library/Diode
+LibName35=C:/Apps/Engineering/KiCad/share/kicad/library/display
+LibName36=C:/Apps/Engineering/KiCad/share/kicad/library/Display_Character
+LibName37=C:/Apps/Engineering/KiCad/share/kicad/library/Display_Graphic
+LibName38=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_Display
+LibName39=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_FET
+LibName40=C:/Apps/Engineering/KiCad/share/kicad/library/Driver_LED
+LibName41=C:/Apps/Engineering/KiCad/share/kicad/library/dsp
+LibName42=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Freescale
+LibName43=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Microchip_DSPIC33
+LibName44=C:/Apps/Engineering/KiCad/share/kicad/library/DSP_Texas
+LibName45=C:/Apps/Engineering/KiCad/share/kicad/library/elec-unifil
+LibName46=C:/Apps/Engineering/KiCad/share/kicad/library/ESD_Protection
+LibName47=C:/Apps/Engineering/KiCad/share/kicad/library/FPGA_Actel
+LibName48=C:/Apps/Engineering/KiCad/share/kicad/library/ftdi
+LibName49=C:/Apps/Engineering/KiCad/share/kicad/library/gennum
+LibName50=C:/Apps/Engineering/KiCad/share/kicad/library/Graphic
+LibName51=C:/Apps/Engineering/KiCad/share/kicad/library/hc11
+LibName52=C:/Apps/Engineering/KiCad/share/kicad/library/intel
+LibName53=C:/Apps/Engineering/KiCad/share/kicad/library/interface
+LibName54=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_CAN_LIN
+LibName55=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_Ethernet
+LibName56=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_Telecom
+LibName57=C:/Apps/Engineering/KiCad/share/kicad/library/Interface_USB
+LibName58=C:/Apps/Engineering/KiCad/share/kicad/library/ir
+LibName59=C:/Apps/Engineering/KiCad/share/kicad/library/Lattice
+LibName60=C:/Apps/Engineering/KiCad/share/kicad/library/LED
+LibName61=C:/Apps/Engineering/KiCad/share/kicad/library/leds
+LibName62=C:/Apps/Engineering/KiCad/share/kicad/library/linear
+LibName63=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_74xgxx
+LibName64=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_74xx
+LibName65=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_CMOS_4000
+LibName66=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_CMOS_IEEE
+LibName67=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_Programmable
+LibName68=C:/Apps/Engineering/KiCad/share/kicad/library/Logic_TTL_IEEE
+LibName69=C:/Apps/Engineering/KiCad/share/kicad/library/logo
+LibName70=C:/Apps/Engineering/KiCad/share/kicad/library/maxim
+LibName71=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_AnalogDevices
+LibName72=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Infineon
+LibName73=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC10
+LibName74=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC12
+LibName75=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC16
+LibName76=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC18
+LibName77=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC24
+LibName78=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Microchip_PIC32
+LibName79=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_Kinetis
+LibName80=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_LPC
+LibName81=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_NXP_S08
+LibName82=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Parallax
+LibName83=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_SiFive
+LibName84=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_SiliconLabs
+LibName85=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_ST_STM8
+LibName86=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_ST_STM32
+LibName87=C:/Apps/Engineering/KiCad/share/kicad/library/MCU_Texas_MSP430
+LibName88=C:/Apps/Engineering/KiCad/share/kicad/library/Mechanical
+LibName89=C:/Apps/Engineering/KiCad/share/kicad/library/memory
+LibName90=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_EEPROM
+LibName91=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_Flash
+LibName92=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_NVRAM
+LibName93=C:/Apps/Engineering/KiCad/share/kicad/library/Memory_RAM
+LibName94=C:/Apps/Engineering/KiCad/share/kicad/library/microchip
+LibName95=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_dspic33dsc
+LibName96=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic10mcu
+LibName97=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic12mcu
+LibName98=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic16mcu
+LibName99=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic18mcu
+LibName100=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic24mcu
+LibName101=C:/Apps/Engineering/KiCad/share/kicad/library/microchip_pic32mcu
+LibName102=C:/Apps/Engineering/KiCad/share/kicad/library/microcontrollers
+LibName103=C:/Apps/Engineering/KiCad/share/kicad/library/modules
+LibName104=C:/Apps/Engineering/KiCad/share/kicad/library/Motor
+LibName105=C:/Apps/Engineering/KiCad/share/kicad/library/motor_drivers
+LibName106=C:/Apps/Engineering/KiCad/share/kicad/library/motorola
+LibName107=C:/Apps/Engineering/KiCad/share/kicad/library/motors
+LibName108=C:/Apps/Engineering/KiCad/share/kicad/library/msp430
+LibName109=C:/Apps/Engineering/KiCad/share/kicad/library/nordicsemi
+LibName110=C:/Apps/Engineering/KiCad/share/kicad/library/nxp
+LibName111=C:/Apps/Engineering/KiCad/share/kicad/library/nxp_armmcu
+LibName112=C:/Apps/Engineering/KiCad/share/kicad/library/onsemi
+LibName113=C:/Apps/Engineering/KiCad/share/kicad/library/opto
+LibName114=C:/Apps/Engineering/KiCad/share/kicad/library/Oscillator
+LibName115=C:/Apps/Engineering/KiCad/share/kicad/library/Oscillators
+LibName116=C:/Apps/Engineering/KiCad/share/kicad/library/philips
+LibName117=C:/Apps/Engineering/KiCad/share/kicad/library/Potentiometer_Digital
+LibName118=C:/Apps/Engineering/KiCad/share/kicad/library/power
+LibName119=C:/Apps/Engineering/KiCad/share/kicad/library/Power_Management
+LibName120=C:/Apps/Engineering/KiCad/share/kicad/library/Power_Protection
+LibName121=C:/Apps/Engineering/KiCad/share/kicad/library/powerint
+LibName122=C:/Apps/Engineering/KiCad/share/kicad/library/pspice
+LibName123=C:/Apps/Engineering/KiCad/share/kicad/library/Reference_Current
+LibName124=C:/Apps/Engineering/KiCad/share/kicad/library/Reference_Voltage
+LibName125=C:/Apps/Engineering/KiCad/share/kicad/library/references
+LibName126=C:/Apps/Engineering/KiCad/share/kicad/library/regul
+LibName127=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Controller
+LibName128=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Current
+LibName129=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Linear
+LibName130=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_SwitchedCapacitor
+LibName131=C:/Apps/Engineering/KiCad/share/kicad/library/Regulator_Switching
+LibName132=C:/Apps/Engineering/KiCad/share/kicad/library/Relay
+LibName133=C:/Apps/Engineering/KiCad/share/kicad/library/relays
+LibName134=C:/Apps/Engineering/KiCad/share/kicad/library/RF_AM_FM
+LibName135=C:/Apps/Engineering/KiCad/share/kicad/library/RF_Bluetooth
+LibName136=C:/Apps/Engineering/KiCad/share/kicad/library/RF_Module
+LibName137=C:/Apps/Engineering/KiCad/share/kicad/library/RF_WiFi
+LibName138=C:/Apps/Engineering/KiCad/share/kicad/library/rfcom
+LibName139=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor
+LibName140=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Audio
+LibName141=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Current
+LibName142=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Gas
+LibName143=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Humidity
+LibName144=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Magnetic
+LibName145=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Motion
+LibName146=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_MultiFunction
+LibName147=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Optical
+LibName148=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Pressure
+LibName149=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Temperature
+LibName150=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Touch
+LibName151=C:/Apps/Engineering/KiCad/share/kicad/library/Sensor_Voltage
+LibName152=C:/Apps/Engineering/KiCad/share/kicad/library/sensors
+LibName153=C:/Apps/Engineering/KiCad/share/kicad/library/silabs
+LibName154=C:/Apps/Engineering/KiCad/share/kicad/library/siliconi
+LibName155=C:/Apps/Engineering/KiCad/share/kicad/library/stm8
+LibName156=C:/Apps/Engineering/KiCad/share/kicad/library/stm32
+LibName157=C:/Apps/Engineering/KiCad/share/kicad/library/supertex
+LibName158=C:/Apps/Engineering/KiCad/share/kicad/library/Switch
+LibName159=C:/Apps/Engineering/KiCad/share/kicad/library/switches
+LibName160=C:/Apps/Engineering/KiCad/share/kicad/library/texas
+LibName161=C:/Apps/Engineering/KiCad/share/kicad/library/Timer
+LibName162=C:/Apps/Engineering/KiCad/share/kicad/library/transf
+LibName163=C:/Apps/Engineering/KiCad/share/kicad/library/Transformer
+LibName164=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_BJT
+LibName165=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_FET
+LibName166=C:/Apps/Engineering/KiCad/share/kicad/library/Transistor_IGBT
+LibName167=C:/Apps/Engineering/KiCad/share/kicad/library/transistors
+LibName168=C:/Apps/Engineering/KiCad/share/kicad/library/triac_thyristor
+LibName169=C:/Apps/Engineering/KiCad/share/kicad/library/ttl_ieee
+LibName170=C:/Apps/Engineering/KiCad/share/kicad/library/Valve
+LibName171=C:/Apps/Engineering/KiCad/share/kicad/library/valves
+LibName172=C:/Apps/Engineering/KiCad/share/kicad/library/video
+LibName173=C:/Apps/Engineering/KiCad/share/kicad/library/wiznet
+LibName174=C:/Apps/Engineering/KiCad/share/kicad/library/Worldsemi
+LibName175=C:/Apps/Engineering/KiCad/share/kicad/library/Xicor
+LibName176=C:/Apps/Engineering/KiCad/share/kicad/library/xilinx
+LibName177=C:/Apps/Engineering/KiCad/share/kicad/library/zetex
+LibName178=C:/Apps/Engineering/KiCad/share/kicad/library/Zilog
diff --git a/gpstracker.sch b/gpstracker.sch
index 3dd6092..ce117d6 100644
--- a/gpstracker.sch
+++ b/gpstracker.sch
@@ -199,7 +199,7 @@ U 1 1 59A2B62B
 P 1650 4300
 F 0 "U2" H 900 5550 50  0000 L BNN
 F 1 "ATMEGA328P-AU" H 2050 2900 50  0000 L BNN
-F 2 "TQFP32" H 1650 4300 50  0001 C CIN
+F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 1650 4300 50  0001 C CIN
 F 3 "" H 1650 4300 50  0001 C CNN
 	1    1650 4300
 	1    0    0    -1  
@@ -212,7 +212,7 @@ U 1 1 59A2CCEB
 P 650 1100
 F 0 "C1" H 675 1200 50  0000 L CNN
 F 1 "4.7uF" H 675 1000 50  0000 L CNN
-F 2 "" H 688 950 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 688 950 50  0001 C CNN
 F 3 "" H 650 1100 50  0001 C CNN
 	1    650  1100
 	-1   0    0    1   
@@ -223,7 +223,7 @@ U 1 1 59A2CDFC
 P 2400 1700
 F 0 "C3" H 2425 1800 50  0000 L CNN
 F 1 "4.7uF" H 2425 1600 50  0000 L CNN
-F 2 "" H 2438 1550 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2438 1550 50  0001 C CNN
 F 3 "" H 2400 1700 50  0001 C CNN
 	1    2400 1700
 	1    0    0    -1  
@@ -231,37 +231,15 @@ $EndComp
 $Comp
 L GND #PWR01
 U 1 1 59A2CEED
-P 2150 2300
-F 0 "#PWR01" H 2150 2050 50  0001 C CNN
-F 1 "GND" H 2150 2150 50  0000 C CNN
-F 2 "" H 2150 2300 50  0001 C CNN
-F 3 "" H 2150 2300 50  0001 C CNN
-	1    2150 2300
+P 2150 2350
+F 0 "#PWR01" H 2150 2100 50  0001 C CNN
+F 1 "GND" H 2150 2200 50  0000 C CNN
+F 2 "" H 2150 2350 50  0001 C CNN
+F 3 "" H 2150 2350 50  0001 C CNN
+	1    2150 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED-RESCUE-gpstracker D1
-U 1 1 59A2D0D5
-P 1850 900
-F 0 "D1" H 1850 1000 50  0000 C CNN
-F 1 "CHRG" H 1850 800 50  0000 C CNN
-F 2 "" H 1850 900 50  0001 C CNN
-F 3 "" H 1850 900 50  0001 C CNN
-	1    1850 900 
-	-1   0    0    1   
-$EndComp
-$Comp
-L LED-RESCUE-gpstracker D2
-U 1 1 59A311D1
-P 2150 2150
-F 0 "D2" H 2150 2250 50  0000 C CNN
-F 1 "DONE" H 2150 2050 50  0000 C CNN
-F 2 "" H 2150 2150 50  0001 C CNN
-F 3 "" H 2150 2150 50  0001 C CNN
-	1    2150 2150
-	0    -1   -1   0   
-$EndComp
-$Comp
 L GND #PWR02
 U 1 1 59A31622
 P 650 1500
@@ -289,7 +267,7 @@ U 1 1 59A3625C
 P 3650 4900
 F 0 "C5" H 3675 5000 50  0000 L CNN
 F 1 "0.1uF" H 3675 4800 50  0000 L CNN
-F 2 "" H 3688 4750 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3688 4750 50  0001 C CNN
 F 3 "" H 3650 4900 50  0001 C CNN
 	1    3650 4900
 	1    0    0    -1  
@@ -455,34 +433,12 @@ ARD_MOSI
 Text Label 4100 3650 0    60   ~ 0
 ARD_MISO
 $Comp
-L R-RESCUE-gpstracker R14
-U 1 1 5A2FA8A3
-P 4600 2850
-F 0 "R14" V 4680 2850 50  0000 C CNN
-F 1 "50k" V 4600 2850 50  0000 C CNN
-F 2 "" V 4530 2850 50  0001 C CNN
-F 3 "" H 4600 2850 50  0001 C CNN
-	1    4600 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L R-RESCUE-gpstracker R15
-U 1 1 5A2FAFE8
-P 4800 2850
-F 0 "R15" V 4880 2850 50  0000 C CNN
-F 1 "50k" V 4800 2850 50  0000 C CNN
-F 2 "" V 4730 2850 50  0001 C CNN
-F 3 "" H 4800 2850 50  0001 C CNN
-	1    4800 2850
-	1    0    0    -1  
-$EndComp
-$Comp
 L C C2
 U 1 1 5A2FC40B
 P 600 4000
 F 0 "C2" H 625 4100 50  0000 L CNN
 F 1 "0.1uF" H 625 3900 50  0000 L CNN
-F 2 "" H 638 3850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 638 3850 50  0001 C CNN
 F 3 "" H 600 4000 50  0001 C CNN
 	1    600  4000
 	1    0    0    -1  
@@ -598,12 +554,12 @@ $EndComp
 $Comp
 L +3.3V #PWR016
 U 1 1 5A30A5D6
-P 4950 2600
-F 0 "#PWR016" H 4950 2450 50  0001 C CNN
-F 1 "+3.3V" H 4950 2740 50  0000 C CNN
-F 2 "" H 4950 2600 50  0001 C CNN
-F 3 "" H 4950 2600 50  0001 C CNN
-	1    4950 2600
+P 4950 2400
+F 0 "#PWR016" H 4950 2250 50  0001 C CNN
+F 1 "+3.3V" H 4950 2540 50  0000 C CNN
+F 2 "" H 4950 2400 50  0001 C CNN
+F 3 "" H 4950 2400 50  0001 C CNN
+	1    4950 2400
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -612,7 +568,7 @@ U 1 1 5A31E91B
 P 5500 1100
 F 0 "U4" H 5600 900 50  0000 C CNN
 F 1 "MCP1700T-3302E/TT" H 5500 1400 50  0000 C CNN
-F 2 "" H 5500 1200 50  0001 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 5500 1200 50  0001 C CNN
 F 3 "" H 5500 1200 50  0001 C CNN
 	1    5500 1100
 	1    0    0    -1  
@@ -634,7 +590,7 @@ U 1 1 5A323F60
 P 5900 1200
 F 0 "C8" H 5925 1300 50  0000 L CNN
 F 1 "1uF" H 5925 1100 50  0000 L CNN
-F 2 "" H 5938 1050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 5938 1050 50  0001 C CNN
 F 3 "" H 5900 1200 50  0001 C CNN
 	1    5900 1200
 	1    0    0    -1  
@@ -656,7 +612,7 @@ U 1 1 5A324C37
 P 5050 1200
 F 0 "C6" H 5075 1300 50  0000 L CNN
 F 1 "1uF" H 5075 1100 50  0000 L CNN
-F 2 "" H 5088 1050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 5088 1050 50  0001 C CNN
 F 3 "" H 5050 1200 50  0001 C CNN
 	1    5050 1200
 	1    0    0    -1  
@@ -729,7 +685,7 @@ U 1 1 5A32DDE4
 P 3850 6800
 F 0 "C4" H 3875 6900 50  0000 L CNN
 F 1 "C" H 3875 6700 50  0000 L CNN
-F 2 "" H 3888 6650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3888 6650 50  0001 C CNN
 F 3 "" H 3850 6800 50  0001 C CNN
 	1    3850 6800
 	0    1    1    0   
@@ -799,8 +755,8 @@ L MOSFET_P Q1
 U 1 1 5A353AEE
 P 3800 1450
 F 0 "Q1" H 3710 1620 60  0000 R CNN
-F 1 "MOSFET_P" H 3860 1200 60  0000 R CNN
-F 2 "" H 3800 1450 60  0000 C CNN
+F 1 "FDD6685" H 3860 1200 60  0000 R CNN
+F 2 "TO_SOT_Packages_SMD:TO-252-2" H 3800 1450 60  0001 C CNN
 F 3 "" H 3800 1450 60  0000 C CNN
 	1    3800 1450
 	0    -1   1    0   
@@ -834,34 +790,34 @@ Storage
 Text Label 3100 3400 2    60   ~ 0
 ARD_IO10
 $Comp
-L LED LED1
+L LED POWER
 U 1 1 5A367234
 P 6700 950
-F 0 "LED1" H 6700 1050 50  0000 C CNN
+F 0 "POWER" H 6700 1050 50  0000 C CNN
 F 1 "LED" H 6700 850 50  0000 C CNN
-F 2 "" H 6700 950 60  0000 C CNN
+F 2 "LEDs:LED_0805_HandSoldering" H 6700 950 60  0001 C CNN
 F 3 "" H 6700 950 60  0000 C CNN
 	1    6700 950 
 	-1   0    0    1   
 $EndComp
 $Comp
-L LED LED2
+L LED POWER2
 U 1 1 5A3672BD
 P 6700 1250
-F 0 "LED2" H 6700 1350 50  0000 C CNN
+F 0 "POWER2" H 6700 1350 50  0000 C CNN
 F 1 "LED" H 6700 1150 50  0000 C CNN
-F 2 "" H 6700 1250 60  0000 C CNN
+F 2 "LEDs:LED_0805_HandSoldering" H 6700 1250 60  0001 C CNN
 F 3 "" H 6700 1250 60  0000 C CNN
 	1    6700 1250
 	-1   0    0    1   
 $EndComp
 $Comp
-L LED LED3
+L LED NETWORK
 U 1 1 5A3673F0
 P 6700 1550
-F 0 "LED3" H 6700 1650 50  0000 C CNN
+F 0 "NETWORK" H 6700 1650 50  0000 C CNN
 F 1 "LED" H 6700 1450 50  0000 C CNN
-F 2 "" H 6700 1550 60  0000 C CNN
+F 2 "LEDs:LED_0805_HandSoldering" H 6700 1550 60  0001 C CNN
 F 3 "" H 6700 1550 60  0000 C CNN
 	1    6700 1550
 	-1   0    0    1   
@@ -900,7 +856,7 @@ U 1 1 5A36B664
 P 7250 950
 F 0 "R8" V 7330 950 50  0000 C CNN
 F 1 "1k" V 7250 950 50  0000 C CNN
-F 2 "" H 7250 950 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 7250 950 60  0001 C CNN
 F 3 "" H 7250 950 60  0000 C CNN
 	1    7250 950 
 	0    -1   -1   0   
@@ -911,7 +867,7 @@ U 1 1 5A36BE2E
 P 7250 1250
 F 0 "R9" V 7330 1250 50  0000 C CNN
 F 1 "1k" V 7250 1250 50  0000 C CNN
-F 2 "" H 7250 1250 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 7250 1250 60  0001 C CNN
 F 3 "" H 7250 1250 60  0000 C CNN
 	1    7250 1250
 	0    -1   -1   0   
@@ -922,7 +878,7 @@ U 1 1 5A36F056
 P 7250 1550
 F 0 "R10" V 7330 1550 50  0000 C CNN
 F 1 "1k" V 7250 1550 50  0000 C CNN
-F 2 "" H 7250 1550 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 7250 1550 60  0001 C CNN
 F 3 "" H 7250 1550 60  0000 C CNN
 	1    7250 1550
 	0    -1   -1   0   
@@ -961,7 +917,7 @@ U 1 1 5A3745DB
 P 4850 6600
 F 0 "C7" H 4875 6700 50  0000 L CNN
 F 1 "C" H 4875 6500 50  0000 L CNN
-F 2 "" H 4888 6450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4888 6450 50  0001 C CNN
 F 3 "" H 4850 6600 50  0001 C CNN
 	1    4850 6600
 	1    0    0    -1  
@@ -987,7 +943,7 @@ U 1 1 5A3767B3
 P 3450 4150
 F 0 "R6" V 3530 4150 50  0000 C CNN
 F 1 "10k" V 3450 4150 50  0000 C CNN
-F 2 "" H 3450 4150 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 3450 4150 60  0001 C CNN
 F 3 "" H 3450 4150 60  0000 C CNN
 	1    3450 4150
 	-1   0    0    1   
@@ -998,7 +954,7 @@ U 1 1 5A378013
 P 3250 4150
 F 0 "R5" V 3330 4150 50  0000 C CNN
 F 1 "1k" V 3250 4150 50  0000 C CNN
-F 2 "" H 3250 4150 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 3250 4150 60  0001 C CNN
 F 3 "" H 3250 4150 60  0000 C CNN
 	1    3250 4150
 	-1   0    0    1   
@@ -1009,7 +965,7 @@ U 1 1 5A37812D
 P 3050 4150
 F 0 "R4" V 3130 4150 50  0000 C CNN
 F 1 "1k" V 3050 4150 50  0000 C CNN
-F 2 "" H 3050 4150 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 3050 4150 60  0001 C CNN
 F 3 "" H 3050 4150 60  0000 C CNN
 	1    3050 4150
 	-1   0    0    1   
@@ -1020,7 +976,7 @@ U 1 1 5A379BE8
 P 5500 6400
 F 0 "R11" V 5580 6400 50  0000 C CNN
 F 1 "160R" V 5500 6400 50  0000 C CNN
-F 2 "" H 5500 6400 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 5500 6400 60  0001 C CNN
 F 3 "" H 5500 6400 60  0000 C CNN
 	1    5500 6400
 	0    1    1    0   
@@ -1033,7 +989,7 @@ U 1 1 5A374BBC
 P 6400 6550
 F 0 "R12" V 6480 6550 50  0000 C CNN
 F 1 "20k" V 6400 6550 50  0000 C CNN
-F 2 "" H 6400 6550 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 6400 6550 60  0001 C CNN
 F 3 "" H 6400 6550 60  0000 C CNN
 	1    6400 6550
 	-1   0    0    1   
@@ -1085,7 +1041,7 @@ U 1 1 5A382E65
 P 900 1400
 F 0 "R1" V 980 1400 50  0000 C CNN
 F 1 "2k" V 900 1400 50  0000 C CNN
-F 2 "" H 900 1400 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 900 1400 60  0001 C CNN
 F 3 "" H 900 1400 60  0000 C CNN
 	1    900  1400
 	0    1    1    0   
@@ -1096,7 +1052,7 @@ U 1 1 5A383FD5
 P 2150 1700
 F 0 "R2" V 2230 1700 50  0000 C CNN
 F 1 "1k" V 2150 1700 50  0000 C CNN
-F 2 "" H 2150 1700 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 2150 1700 60  0001 C CNN
 F 3 "" H 2150 1700 60  0000 C CNN
 	1    2150 1700
 	-1   0    0    1   
@@ -1107,7 +1063,7 @@ U 1 1 5A385146
 P 2300 900
 F 0 "R3" V 2380 900 50  0000 C CNN
 F 1 "470R" V 2300 900 50  0000 C CNN
-F 2 "" H 2300 900 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 2300 900 60  0001 C CNN
 F 3 "" H 2300 900 60  0000 C CNN
 	1    2300 900 
 	0    -1   -1   0   
@@ -1174,24 +1130,14 @@ Wire Wire Line
 	2650 3700 3100 3700
 Wire Wire Line
 	4100 3450 5100 3450
-Wire Wire Line
-	4950 2600 4950 3350
 Wire Wire Line
 	4100 3250 5100 3250
 Wire Wire Line
 	4100 3650 5100 3650
-Wire Wire Line
-	4600 2700 4600 2650
 Wire Wire Line
 	5100 3050 4800 3050
 Wire Wire Line
 	4800 3050 4800 3000
-Wire Wire Line
-	4800 2700 4800 2650
-Connection ~ 4800 2650
-Connection ~ 4950 2650
-Wire Wire Line
-	4600 2650 4950 2650
 Wire Wire Line
 	5100 3750 4600 3750
 Wire Wire Line
@@ -1236,8 +1182,6 @@ Wire Wire Line
 	950  7000 1450 7000
 Wire Wire Line
 	950  6900 1450 6900
-Wire Wire Line
-	650  900  1700 900 
 Wire Wire Line
 	5900 1000 5900 1050
 Wire Wire Line
@@ -1369,13 +1313,9 @@ Wire Wire Line
 Wire Wire Line
 	650  1250 650  1500
 Connection ~ 650  1400
-Wire Wire Line
-	2150 2000 2150 1950
 Wire Wire Line
 	2150 1450 2150 1400
 Connection ~ 2150 1400
-Wire Wire Line
-	2000 900  2050 900 
 Wire Wire Line
 	2000 1400 2600 1400
 Wire Wire Line
@@ -1413,7 +1353,7 @@ U 1 1 5A3873FE
 P 4550 1050
 F 0 "R7" V 4630 1050 50  0000 C CNN
 F 1 "R" V 4550 1050 50  0000 C CNN
-F 2 "" H 4550 1050 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 4550 1050 60  0001 C CNN
 F 3 "" H 4550 1050 60  0000 C CNN
 	1    4550 1050
 	1    0    0    -1  
@@ -1586,7 +1526,7 @@ U 1 1 5A39E1FF
 P 8650 2650
 F 0 "R13" V 8730 2650 50  0000 C CNN
 F 1 "R" V 8650 2650 50  0000 C CNN
-F 2 "" H 8650 2650 60  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 8650 2650 60  0001 C CNN
 F 3 "" H 8650 2650 60  0000 C CNN
 	1    8650 2650
 	-1   0    0    1   
@@ -1642,7 +1582,7 @@ U 1 1 5A3A0698
 P 10700 1450
 F 0 "C9" H 10725 1550 50  0000 L CNN
 F 1 "10uF" H 10725 1350 50  0000 L CNN
-F 2 "" H 10738 1300 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10738 1300 50  0001 C CNN
 F 3 "" H 10700 1450 50  0001 C CNN
 	1    10700 1450
 	1    0    0    -1  
@@ -1789,4 +1729,60 @@ Wire Wire Line
 	3650 4650 3650 4750
 Wire Wire Line
 	3650 5250 3650 5050
+$Comp
+L R R14
+U 1 1 5A35D19C
+P 4600 2750
+F 0 "R14" V 4680 2750 50  0000 C CNN
+F 1 "50k" V 4600 2750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 4600 2750 60  0001 C CNN
+F 3 "" H 4600 2750 60  0000 C CNN
+	1    4600 2750
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R15
+U 1 1 5A35D761
+P 4800 2750
+F 0 "R15" V 4880 2750 50  0000 C CNN
+F 1 "50k" V 4800 2750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 4800 2750 60  0001 C CNN
+F 3 "" H 4800 2750 60  0000 C CNN
+	1    4800 2750
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	4600 2500 4600 2450
+Wire Wire Line
+	4600 2450 4950 2450
+Wire Wire Line
+	4800 2500 4800 2450
+Connection ~ 4800 2450
+Wire Wire Line
+	4950 2400 4950 3350
+Connection ~ 4950 2450
+$Comp
+L LED CHRG
+U 1 1 5A364B29
+P 1850 900
+F 0 "CHRG" H 1850 1000 50  0000 C CNN
+F 1 "LED" H 1850 800 50  0000 C CNN
+F 2 "LEDs:LED_0805_HandSoldering" H 1850 900 60  0001 C CNN
+F 3 "" H 1850 900 60  0000 C CNN
+	1    1850 900 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	650  900  1650 900 
+$Comp
+L LED DONE
+U 1 1 5A365279
+P 2150 2150
+F 0 "DONE" H 2150 2250 50  0000 C CNN
+F 1 "LED" H 2150 2050 50  0000 C CNN
+F 2 "LEDs:LED_0805_HandSoldering" H 2150 2150 60  0001 C CNN
+F 3 "" H 2150 2150 60  0000 C CNN
+	1    2150 2150
+	0    1    1    0   
+$EndComp
 $EndSCHEMATC