diff --git a/Datasheets/19-337-R6GHBHC-A01.pdf b/Datasheets/19-337-R6GHBHC-A01.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d314d3c554a5077db12b36899bb4a109386810d3
Binary files /dev/null and b/Datasheets/19-337-R6GHBHC-A01.pdf differ
diff --git a/Datasheets/MCP73831-2_ENG_TDS.pdf b/Datasheets/MCP73831-2_ENG_TDS.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..770d09e276e7d30fda6c87bd2b5d20c502546af5
Binary files /dev/null and b/Datasheets/MCP73831-2_ENG_TDS.pdf differ
diff --git a/Datasheets/esp32-wroom-32_datasheet_en.pdf b/Datasheets/esp32-wroom-32_datasheet_en.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fe78c58d61815e9f408ef507427fe02d71fc24b2
Binary files /dev/null and b/Datasheets/esp32-wroom-32_datasheet_en.pdf differ
diff --git a/KiCadLibs/19-337_R6GHBHC-A01_2T.lib b/KiCadLibs/19-337_R6GHBHC-A01_2T.lib
new file mode 100644
index 0000000000000000000000000000000000000000..41684f97d9e0a8db1da3df4d6bc70c3d26ce78ee
--- /dev/null
+++ b/KiCadLibs/19-337_R6GHBHC-A01_2T.lib
@@ -0,0 +1,64 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#(c) SnapEDA 2016 (snapeda.com)
+#This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA) with Design Exception 1.0
+#
+# 19-337/R6GHBHC-A01/2T
+#
+DEF 19-337/R6GHBHC-A01/2T D 0 40 Y N 1 L N
+F0 "D" -150 501 50 H V L BNN
+F1 "19-337/R6GHBHC-A01/2T" -150 -450 50 H V L BNN
+F2 "LED_19-337/R6GHBHC-A01/2T" 0 0 50 H I L BNN
+F3 "None" 0 0 50 H I L BNN
+F4 "Everlight" 0 0 50 H I L BNN
+F5 "LED Tri-Color Blue/Green/Red 468nm/518nm/632nm 6-Pin T/R" 0 0 50 H I L BNN
+F6 "Unavailable" 0 0 50 H I L BNN
+F7 "19-337/R6GHBHC-A01/2T" 0 0 50 H I L BNN
+F8 "SMD-2 Everlight" 0 0 50 H I L BNN
+DRAW
+P 2 0 0 10 -50 50 -50 0 N
+P 2 0 0 10 -50 0 -50 -50 N
+P 2 0 0 10 50 0 100 0 N
+P 2 0 0 10 -50 0 -100 0 N
+P 2 0 0 10 25 75 -45 140 N
+P 2 0 0 10 -45 140 -15 125 N
+P 2 0 0 10 -45 140 -30 115 N
+P 2 0 0 10 -40 75 -110 140 N
+P 2 0 0 10 -110 140 -80 125 N
+P 2 0 0 10 -110 140 -95 115 N
+P 2 0 0 10 -50 350 -50 300 N
+P 2 0 0 10 -50 300 -50 250 N
+P 2 0 0 10 50 300 100 300 N
+P 2 0 0 10 -50 300 -100 300 N
+P 2 0 0 10 25 375 -45 440 N
+P 2 0 0 10 -45 440 -15 425 N
+P 2 0 0 10 -45 440 -30 415 N
+P 2 0 0 10 -40 375 -110 440 N
+P 2 0 0 10 -110 440 -80 425 N
+P 2 0 0 10 -110 440 -95 415 N
+P 2 0 0 10 -50 -250 -50 -300 N
+P 2 0 0 10 -50 -300 -50 -350 N
+P 2 0 0 10 50 -300 100 -300 N
+P 2 0 0 10 -50 -300 -100 -300 N
+P 2 0 0 10 25 -225 -45 -160 N
+P 2 0 0 10 -45 -160 -15 -175 N
+P 2 0 0 10 -45 -160 -30 -185 N
+P 2 0 0 10 -40 -225 -110 -160 N
+P 2 0 0 10 -110 -160 -80 -175 N
+P 2 0 0 10 -110 -160 -95 -185 N
+P 3 0 0 10 -50 300 50 350 50 250 F
+P 3 0 0 10 -50 0 50 50 50 -50 F
+P 3 0 0 10 -50 -300 50 -250 50 -350 F
+T 0 100 381 50 0 0 0 Blue Normal 0 L B
+T 0 100 80 50 0 0 0 Red Normal 0 L B
+T 0 100 -220 50 0 0 0 Green Normal 0 L B
+X C1 1 -300 300 200 R 40 40 0 0 P 
+X C2 2 -300 0 200 R 40 40 0 0 P 
+X C3 3 -300 -300 200 R 40 40 0 0 P 
+X A1 4 300 300 200 L 40 40 0 0 P 
+X A2 5 300 0 200 L 40 40 0 0 P 
+X A3 6 300 -300 200 L 40 40 0 0 P 
+ENDDRAW
+ENDDEF
+#
+# End Library
\ No newline at end of file
diff --git a/KiCadLibs/19-337_R6GHBHC-A01_2T.mod b/KiCadLibs/19-337_R6GHBHC-A01_2T.mod
new file mode 100644
index 0000000000000000000000000000000000000000..2ebfb576f5ceb7adf9bf47c86f1d061c82b0b159
--- /dev/null
+++ b/KiCadLibs/19-337_R6GHBHC-A01_2T.mod
@@ -0,0 +1,80 @@
+PCBNEW-LibModule-V1  
+# encoding utf-8
+Units mm
+$INDEX
+LED_19-337/R6GHBHC-A01/2T
+$EndINDEX
+$MODULE LED_19-337/R6GHBHC-A01/2T
+Po 0 0 0 15 00000000 00000000 ~~
+Li LED_19-337/R6GHBHC-A01/2T
+Cd 
+Sc 00000000
+At SMD
+Op 0 0 0
+.SolderMask 0
+.SolderPaste 0
+T0 -0.321252 -1.57701 0.480672 0.480672 0 0.05 N V 21 "LED_19-337/R6GHBHC-A01/2T"
+T1 -0.016025 1.5373 0.480657 0.480657 0 0.05 N V 21 "VAL**"
+DC -1.297 -0.862 -1.247 -0.862 0.15 21
+DS -0.8 -0.8 0.8 -0.8 0.127 24
+DS 0.8 -0.8 0.8 0.8 0.127 24
+DS 0.8 0.8 -0.8 0.8 0.127 24
+DS -0.8 0.8 -0.8 -0.8 0.127 24
+DS -1.5 -1.25 1.5 -1.25 0.05 26
+DS 1.5 -1.25 1.5 1.25 0.05 26
+DS 1.5 1.25 -1.5 1.25 0.05 26
+DS -1.5 1.25 -1.5 -1.25 0.05 26
+DP 0 0 0 0 4 0 23
+Dl -0.300092 -0.8
+Dl 0.3 -0.8
+Dl 0.3 0.800247
+Dl -0.300092 0.800247
+$PAD
+Sh "1" R 0.55 0.4 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po -0.675 -0.725
+$EndPAD
+$PAD
+Sh "3" R 0.55 0.4 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po -0.675 0.725
+$EndPAD
+$PAD
+Sh "4" R 0.55 0.4 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po 0.675 -0.725
+$EndPAD
+$PAD
+Sh "6" R 0.55 0.4 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po 0.675 0.725
+$EndPAD
+$PAD
+Sh "2" R 0.7 0.5 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po -0.75 0
+$EndPAD
+$PAD
+Sh "5" R 0.7 0.5 0 0 0
+At SMD N 00888000
+.SolderMask 0
+.SolderPaste 0
+Ne 0 ""
+Po 0.75 0
+$EndPAD
+$EndMODULE LED_19-337/R6GHBHC-A01/2T
diff --git a/LoRaTracker_M8Q-cache.lib b/LoRaTracker_M8Q-cache.lib
index d599fee74ac1fe0187a2e4d1c789004cf5833670..5e73ecfd4cf91d12d0d4ca74309ae9e76562a10b 100644
--- a/LoRaTracker_M8Q-cache.lib
+++ b/LoRaTracker_M8Q-cache.lib
@@ -32,6 +32,64 @@ X +BATT 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# 19-337/R6GHBHC-A01/2T
+#
+DEF 19-337/R6GHBHC-A01/2T D 0 40 Y N 1 L N
+F0 "D" -150 501 50 H V L BNN
+F1 "19-337/R6GHBHC-A01/2T" -150 -450 50 H V L BNN
+F2 "LED_19-337/R6GHBHC-A01/2T" 0 0 50 H I L BNN
+F3 "None" 0 0 50 H I L BNN
+F4 "Everlight" 0 0 50 H I L BNN
+F5 "LED Tri-Color Blue/Green/Red 468nm/518nm/632nm 6-Pin T/R" 0 0 50 H I L BNN
+F6 "Unavailable" 0 0 50 H I L BNN
+F7 "19-337/R6GHBHC-A01/2T" 0 0 50 H I L BNN
+F8 "SMD-2 Everlight" 0 0 50 H I L BNN
+DRAW
+T 0 100 381 50 0 0 0 Blue Normal 0 L B
+T 0 100 -220 50 0 0 0 Green Normal 0 L B
+T 0 100 80 50 0 0 0 Red Normal 0 L B
+P 2 0 0 10 -110 -160 -95 -185 N
+P 2 0 0 10 -110 -160 -80 -175 N
+P 2 0 0 10 -110 140 -95 115 N
+P 2 0 0 10 -110 140 -80 125 N
+P 2 0 0 10 -110 440 -95 415 N
+P 2 0 0 10 -110 440 -80 425 N
+P 2 0 0 10 -50 -300 -100 -300 N
+P 2 0 0 10 -50 -300 -50 -350 N
+P 2 0 0 10 -50 -250 -50 -300 N
+P 2 0 0 10 -50 0 -100 0 N
+P 2 0 0 10 -50 0 -50 -50 N
+P 2 0 0 10 -50 50 -50 0 N
+P 2 0 0 10 -50 300 -100 300 N
+P 2 0 0 10 -50 300 -50 250 N
+P 2 0 0 10 -50 350 -50 300 N
+P 2 0 0 10 -45 -160 -30 -185 N
+P 2 0 0 10 -45 -160 -15 -175 N
+P 2 0 0 10 -45 140 -30 115 N
+P 2 0 0 10 -45 140 -15 125 N
+P 2 0 0 10 -45 440 -30 415 N
+P 2 0 0 10 -45 440 -15 425 N
+P 2 0 0 10 -40 -225 -110 -160 N
+P 2 0 0 10 -40 75 -110 140 N
+P 2 0 0 10 -40 375 -110 440 N
+P 2 0 0 10 25 -225 -45 -160 N
+P 2 0 0 10 25 75 -45 140 N
+P 2 0 0 10 25 375 -45 440 N
+P 2 0 0 10 50 -300 100 -300 N
+P 2 0 0 10 50 0 100 0 N
+P 2 0 0 10 50 300 100 300 N
+P 3 0 0 10 -50 -300 50 -250 50 -350 F
+P 3 0 0 10 -50 0 50 50 50 -50 F
+P 3 0 0 10 -50 300 50 350 50 250 F
+X C1 1 -300 300 200 R 40 40 0 0 P
+X C2 2 -300 0 200 R 40 40 0 0 P
+X C3 3 -300 -300 200 R 40 40 0 0 P
+X A1 4 300 300 200 L 40 40 0 0 P
+X A2 5 300 0 200 L 40 40 0 0 P
+X A3 6 300 -300 200 L 40 40 0 0 P
+ENDDRAW
+ENDDEF
+#
 # ANTENNA_U.FL
 #
 DEF ANTENNA_U.FL X 0 40 N N 1 L N
@@ -179,26 +237,48 @@ X 1 2 -100 100 100 R 40 40 1 1 P I
 ENDDRAW
 ENDDEF
 #
-# LP298X
+# LED
 #
-DEF LP298X IC 0 40 Y Y 1 L N
-F0 "IC" -535 -200 45 V V L BNN
-F1 "LP298X" 465 -200 45 V V L BNN
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 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
+#
+# MCP73831
+#
+DEF ~MCP73831 IC 0 40 Y Y 1 L N
+F0 "IC" -300 -400 45 H V L BNN
+F1 "MCP73831" 0 0 45 H I L BNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 $FPLIST
  *SOT23-5L*
 $ENDFPLIST
 DRAW
-P 2 1 0 0 -400 -400 400 -400 N
-P 2 1 0 0 -400 200 -400 -400 N
-P 2 1 0 0 400 -400 400 200 N
-P 2 1 0 0 400 200 -400 200 N
-X VIN 1 -200 -600 200 U 40 40 1 1 B
-X GND 2 0 -600 200 U 40 40 1 1 B
-X EN 3 200 -600 200 U 40 40 1 1 B
-X BYP 4 200 400 200 D 40 40 1 1 B
-X VOUT 5 -200 400 200 D 40 40 1 1 B
+T 0 31 365 56 0 1 0 MCP73831/2 Normal 0 C C
+P 2 1 0 0 -300 -300 -300 300 N
+P 2 1 0 0 -300 300 400 300 N
+P 2 1 0 0 400 -300 -300 -300 N
+P 2 1 0 0 400 300 400 -300 N
+X STAT 1 -500 -200 200 R 40 40 1 1 O
+X VSS 2 600 -200 200 L 40 40 1 1 W
+X VBAT 3 600 200 200 L 40 40 1 1 B
+X VDD 4 -500 200 200 R 40 40 1 1 W
+X PROG 5 600 0 200 L 40 40 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -241,6 +321,48 @@ X S 3 0 200 100 D 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# PINHD-1X1
+#
+DEF PINHD-1X1 JP 0 40 N Y 1 L N
+F0 "JP" -250 125 45 H V L BNN
+F1 "PINHD-1X1" -250 -200 45 H V L BNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+$FPLIST
+ *1X01*
+ *1X01-CLEANBIG*
+$ENDFPLIST
+DRAW
+P 2 1 0 0 -250 -100 50 -100 N
+P 2 1 0 0 -250 100 -250 -100 N
+P 2 1 0 0 50 -100 50 100 N
+P 2 1 0 0 50 100 -250 100 N
+X 1 1 -100 0 100 R 40 40 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# PINHD-1X3
+#
+DEF PINHD-1X3 JP 0 40 N Y 1 L N
+F0 "JP" -250 225 45 H V L BNN
+F1 "PINHD-1X3" -250 -300 45 H V L BNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
+$FPLIST
+ *1X03*
+ *1X03-CLEANBIG*
+$ENDFPLIST
+DRAW
+P 2 1 0 0 -250 -200 50 -200 N
+P 2 1 0 0 -250 200 -250 -200 N
+P 2 1 0 0 50 -200 50 200 N
+P 2 1 0 0 50 200 -250 200 N
+X 1 1 -100 100 100 R 40 40 1 1 P I
+X 2 2 -100 0 100 R 40 40 1 1 P I
+X 3 3 -100 -100 100 R 40 40 1 1 P I
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
diff --git a/LoRaTracker_M8Q.bak b/LoRaTracker_M8Q.bak
index e8af26a0a104604637bfc9b48befe91bbf138eb9..17ac32fe3c35ce4b0c6f0d729b6f49de06b56a3b 100644
--- a/LoRaTracker_M8Q.bak
+++ b/LoRaTracker_M8Q.bak
@@ -36,6 +36,7 @@ LIBS:ESP32-footprints-Shem-Lib
 LIBS:SAM-M8Q
 LIBS:esp32-wroom-32
 LIBS:RFM95W-868S2
+LIBS:19-337_R6GHBHC-A01_2T
 LIBS:LoRaTracker_M8Q-cache
 EELAYER 25 0
 EELAYER END
@@ -67,7 +68,7 @@ L R R?
 U 1 1 5BBF6450
 P 2100 2150
 F 0 "R?" V 2180 2150 50  0000 C CNN
-F 1 "R" V 2100 2150 50  0000 C CNN
+F 1 "100k" V 2100 2150 50  0000 C CNN
 F 2 "" V 2030 2150 50  0001 C CNN
 F 3 "" H 2100 2150 50  0001 C CNN
 	1    2100 2150
@@ -78,7 +79,7 @@ L C C?
 U 1 1 5BBF651E
 P 1650 2150
 F 0 "C?" H 1675 2250 50  0000 L CNN
-F 1 "C" H 1675 2050 50  0000 L CNN
+F 1 "10uF" H 1675 2050 50  0000 L CNN
 F 2 "" H 1688 2000 50  0001 C CNN
 F 3 "" H 1650 2150 50  0001 C CNN
 	1    1650 2150
@@ -144,7 +145,7 @@ L R R?
 U 1 1 5BBF6725
 P 1900 1850
 F 0 "R?" V 1980 1850 50  0000 C CNN
-F 1 "R" V 1900 1850 50  0000 C CNN
+F 1 "100k" V 1900 1850 50  0000 C CNN
 F 2 "" V 1830 1850 50  0001 C CNN
 F 3 "" H 1900 1850 50  0001 C CNN
 	1    1900 1850
@@ -177,7 +178,7 @@ L C C?
 U 1 1 5BBF67C9
 P 3300 2150
 F 0 "C?" H 3325 2250 50  0000 L CNN
-F 1 "C" H 3325 2050 50  0000 L CNN
+F 1 "10uF" H 3325 2050 50  0000 L CNN
 F 2 "" H 3338 2000 50  0001 C CNN
 F 3 "" H 3300 2150 50  0001 C CNN
 	1    3300 2150
@@ -188,7 +189,7 @@ L C C?
 U 1 1 5BBF6839
 P 3700 2150
 F 0 "C?" H 3725 2250 50  0000 L CNN
-F 1 "C" H 3725 2050 50  0000 L CNN
+F 1 "1uF" H 3725 2050 50  0000 L CNN
 F 2 "" H 3738 2000 50  0001 C CNN
 F 3 "" H 3700 2150 50  0001 C CNN
 	1    3700 2150
@@ -265,7 +266,7 @@ L C C?
 U 1 1 5BBF6B31
 P 5500 2050
 F 0 "C?" H 5525 2150 50  0000 L CNN
-F 1 "C" H 5525 1950 50  0000 L CNN
+F 1 "10uF" H 5525 1950 50  0000 L CNN
 F 2 "" H 5538 1900 50  0001 C CNN
 F 3 "" H 5500 2050 50  0001 C CNN
 	1    5500 2050
@@ -285,45 +286,45 @@ $EndComp
 $Comp
 L +BATT #PWR?
 U 1 1 5BBF6FD4
-P 1000 4600
-F 0 "#PWR?" H 1000 4450 50  0001 C CNN
-F 1 "+BATT" H 1000 4740 50  0000 C CNN
-F 2 "" H 1000 4600 50  0001 C CNN
-F 3 "" H 1000 4600 50  0001 C CNN
-	1    1000 4600
+P 850 4600
+F 0 "#PWR?" H 850 4450 50  0001 C CNN
+F 1 "+BATT" H 850 4740 50  0000 C CNN
+F 2 "" H 850 4600 50  0001 C CNN
+F 3 "" H 850 4600 50  0001 C CNN
+	1    850  4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 5BBF70D9
-P 1000 4950
-F 0 "R?" V 1080 4950 50  0000 C CNN
-F 1 "R" V 1000 4950 50  0000 C CNN
-F 2 "" V 930 4950 50  0001 C CNN
-F 3 "" H 1000 4950 50  0001 C CNN
-	1    1000 4950
+P 850 4950
+F 0 "R?" V 930 4950 50  0000 C CNN
+F 1 "100k" V 850 4950 50  0000 C CNN
+F 2 "" V 780 4950 50  0001 C CNN
+F 3 "" H 850 4950 50  0001 C CNN
+	1    850  4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 5BBF7158
-P 1000 5450
-F 0 "R?" V 1080 5450 50  0000 C CNN
-F 1 "R" V 1000 5450 50  0000 C CNN
-F 2 "" V 930 5450 50  0001 C CNN
-F 3 "" H 1000 5450 50  0001 C CNN
-	1    1000 5450
+P 850 5450
+F 0 "R?" V 930 5450 50  0000 C CNN
+F 1 "100k" V 850 5450 50  0000 C CNN
+F 2 "" V 780 5450 50  0001 C CNN
+F 3 "" H 850 5450 50  0001 C CNN
+	1    850  5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5BBF7274
-P 1000 5700
-F 0 "#PWR?" H 1000 5450 50  0001 C CNN
-F 1 "GND" H 1000 5550 50  0000 C CNN
-F 2 "" H 1000 5700 50  0001 C CNN
-F 3 "" H 1000 5700 50  0001 C CNN
-	1    1000 5700
+P 850 5700
+F 0 "#PWR?" H 850 5450 50  0001 C CNN
+F 1 "GND" H 850 5550 50  0000 C CNN
+F 2 "" H 850 5700 50  0001 C CNN
+F 3 "" H 850 5700 50  0001 C CNN
+	1    850  5700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -353,12 +354,10 @@ F 3 "" H 2050 5750 60  0001 C CNN
 	1    2500 5300
 	1    0    0    -1  
 $EndComp
-Text GLabel 3500 4650 2    60   Input ~ 0
-SCL
 Text GLabel 3500 5150 2    60   Input ~ 0
 MISO
-Text GLabel 1400 5500 0    60   Input ~ 0
-SDA
+Text GLabel 3500 5650 2    60   Input ~ 0
+CS
 Text GLabel 3500 5250 2    60   Input ~ 0
 MOSI
 Text GLabel 3500 4750 2    60   Input ~ 0
@@ -420,120 +419,6 @@ F 3 "" H 3600 6350 50  0001 C CNN
 	1    3600 6350
 	1    0    0    -1  
 $EndComp
-$Comp
-L LP298X IC?
-U 1 1 5BC0761A
-P 7950 2400
-F 0 "IC?" V 7415 2200 45  0000 L BNN
-F 1 "LP298X" V 8415 2200 45  0000 L BNN
-F 2 "" H 7950 2400 60  0001 C CNN
-F 3 "" H 7950 2400 60  0001 C CNN
-	1    7950 2400
-	0    1    1    0   
-$EndComp
-$Comp
-L +BATT #PWR?
-U 1 1 5BC0772B
-P 6600 2050
-F 0 "#PWR?" H 6600 1900 50  0001 C CNN
-F 1 "+BATT" H 6600 2190 50  0000 C CNN
-F 2 "" H 6600 2050 50  0001 C CNN
-F 3 "" H 6600 2050 50  0001 C CNN
-	1    6600 2050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC0780E
-P 7000 3100
-F 0 "#PWR?" H 7000 2850 50  0001 C CNN
-F 1 "GND" H 7000 2950 50  0000 C CNN
-F 2 "" H 7000 3100 50  0001 C CNN
-F 3 "" H 7000 3100 50  0001 C CNN
-	1    7000 3100
-	1    0    0    -1  
-$EndComp
-Text GLabel 6500 2600 0    60   Input ~ 0
-GNSS_EN
-$Comp
-L R R?
-U 1 1 5BC07900
-P 7250 2850
-F 0 "R?" V 7330 2850 50  0000 C CNN
-F 1 "R" V 7250 2850 50  0000 C CNN
-F 2 "" V 7180 2850 50  0001 C CNN
-F 3 "" H 7250 2850 50  0001 C CNN
-	1    7250 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC079B3
-P 7250 3100
-F 0 "#PWR?" H 7250 2850 50  0001 C CNN
-F 1 "GND" H 7250 2950 50  0000 C CNN
-F 2 "" H 7250 3100 50  0001 C CNN
-F 3 "" H 7250 3100 50  0001 C CNN
-	1    7250 3100
-	1    0    0    -1  
-$EndComp
-Text GLabel 9050 2200 2    60   Input ~ 0
-GNSS_VCC
-$Comp
-L C C?
-U 1 1 5BC07B1D
-P 8500 2850
-F 0 "C?" H 8525 2950 50  0000 L CNN
-F 1 "C" H 8525 2750 50  0000 L CNN
-F 2 "" H 8538 2700 50  0001 C CNN
-F 3 "" H 8500 2850 50  0001 C CNN
-	1    8500 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07BD8
-P 8500 3050
-F 0 "#PWR?" H 8500 2800 50  0001 C CNN
-F 1 "GND" H 8500 2900 50  0000 C CNN
-F 2 "" H 8500 3050 50  0001 C CNN
-F 3 "" H 8500 3050 50  0001 C CNN
-	1    8500 3050
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C?
-U 1 1 5BC07C59
-P 8750 2850
-F 0 "C?" H 8775 2950 50  0000 L CNN
-F 1 "C" H 8775 2750 50  0000 L CNN
-F 2 "" H 8788 2700 50  0001 C CNN
-F 3 "" H 8750 2850 50  0001 C CNN
-	1    8750 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07D05
-P 8750 3050
-F 0 "#PWR?" H 8750 2800 50  0001 C CNN
-F 1 "GND" H 8750 2900 50  0000 C CNN
-F 2 "" H 8750 3050 50  0001 C CNN
-F 3 "" H 8750 3050 50  0001 C CNN
-	1    8750 3050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07EE3
-P 6600 3100
-F 0 "#PWR?" H 6600 2850 50  0001 C CNN
-F 1 "GND" H 6600 2950 50  0000 C CNN
-F 2 "" H 6600 3100 50  0001 C CNN
-F 3 "" H 6600 3100 50  0001 C CNN
-	1    6600 3100
-	1    0    0    -1  
-$EndComp
 Text GLabel 8000 3600 2    60   Input ~ 0
 GNSS_VCC
 Text GLabel 8550 4400 2    60   Input ~ 0
@@ -557,14 +442,14 @@ NoConn ~ 8400 4800
 NoConn ~ 7800 5400
 NoConn ~ 7600 5400
 NoConn ~ 7400 5400
-Text GLabel 1800 7100 0    60   Input ~ 0
+Text GLabel 1450 5000 0    60   Input ~ 0
 GNSS_TXD
-Text GLabel 1800 7250 0    60   Input ~ 0
+Text GLabel 1450 5100 0    60   Input ~ 0
 GNSS_RXD
 Text Notes 1950 7150 0    60   ~ 0
 Connect to ESP\n
-Text Notes 3750 7100 0    60   ~ 0
-TODO:\n- Check Gnss En Function (connect it to a pin to esp)\n- Check esp software serial pins\n
+Text Notes 3900 7650 0    60   ~ 0
+TODO:\n- Check Gnss En Function (connect it to a pin to esp)\n- Check esp software serial pins\n- Think about VRegulator for every module or one Reg. for all\n -> if one for all, check MOSFET switch\n- Add connections to LoRa module\n- Add values for resistors and capacitors\n- Double Check ALL connections\n
 $Comp
 L SCHOTTKY-DIODE D?
 U 1 1 5BC08E7D
@@ -592,7 +477,7 @@ L R R?
 U 1 1 5BC09786
 P 10100 3900
 F 0 "R?" V 10180 3900 50  0000 C CNN
-F 1 "R" V 10100 3900 50  0000 C CNN
+F 1 "100k" V 10100 3900 50  0000 C CNN
 F 2 "" V 10030 3900 50  0001 C CNN
 F 3 "" H 10100 3900 50  0001 C CNN
 	1    10100 3900
@@ -645,57 +530,57 @@ MISO
 Text GLabel 11350 1200 2    60   Input ~ 0
 MOSI
 Text GLabel 9600 900  0    60   Input ~ 0
-SDA
+CS
 Text GLabel 9600 800  0    60   Input ~ 0
-SDA
+SCK
 $Comp
 L MOSFET-P Q?
 U 1 1 5BC0A90D
-P 14250 800
-F 0 "Q?" H 13700 750 45  0000 L BNN
-F 1 "MOSFET-P" H 13700 650 45  0000 L BNN
-F 2 "" H 14250 800 60  0001 C CNN
-F 3 "" H 14250 800 60  0001 C CNN
-	1    14250 800 
+P 7700 1250
+F 0 "Q?" H 7150 1200 45  0000 L BNN
+F 1 "MOSFET-P" H 7150 1100 45  0000 L BNN
+F 2 "" H 7700 1250 60  0001 C CNN
+F 3 "" H 7700 1250 60  0001 C CNN
+	1    7700 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR?
 U 1 1 5BC0AA24
-P 14250 300
-F 0 "#PWR?" H 14250 150 50  0001 C CNN
-F 1 "+3.3V" H 14250 440 50  0000 C CNN
-F 2 "" H 14250 300 50  0001 C CNN
-F 3 "" H 14250 300 50  0001 C CNN
-	1    14250 300 
+P 7700 750
+F 0 "#PWR?" H 7700 600 50  0001 C CNN
+F 1 "+3.3V" H 7700 890 50  0000 C CNN
+F 2 "" H 7700 750 50  0001 C CNN
+F 3 "" H 7700 750 50  0001 C CNN
+	1    7700 750 
 	1    0    0    -1  
 $EndComp
 Text GLabel 11300 700  2    60   Input ~ 0
 LoR_VCC
-Text GLabel 14250 1100 3    60   Input ~ 0
+Text GLabel 7700 1550 3    60   Input ~ 0
 LoR_VCC
-Text GLabel 13250 700  0    60   Input ~ 0
+Text GLabel 6700 1150 0    60   Input ~ 0
 LoRa_Mosfet_EN
 $Comp
 L R R?
 U 1 1 5BC0ACCE
-P 13500 1050
-F 0 "R?" V 13580 1050 50  0000 C CNN
-F 1 "R" V 13500 1050 50  0000 C CNN
-F 2 "" V 13430 1050 50  0001 C CNN
-F 3 "" H 13500 1050 50  0001 C CNN
-	1    13500 1050
+P 6950 1500
+F 0 "R?" V 7030 1500 50  0000 C CNN
+F 1 "100k" V 6950 1500 50  0000 C CNN
+F 2 "" V 6880 1500 50  0001 C CNN
+F 3 "" H 6950 1500 50  0001 C CNN
+	1    6950 1500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5BC0AD74
-P 13500 1300
-F 0 "#PWR?" H 13500 1050 50  0001 C CNN
-F 1 "GND" H 13500 1150 50  0000 C CNN
-F 2 "" H 13500 1300 50  0001 C CNN
-F 3 "" H 13500 1300 50  0001 C CNN
-	1    13500 1300
+P 6950 1750
+F 0 "#PWR?" H 6950 1500 50  0001 C CNN
+F 1 "GND" H 6950 1600 50  0000 C CNN
+F 2 "" H 6950 1750 50  0001 C CNN
+F 3 "" H 6950 1750 50  0001 C CNN
+	1    6950 1750
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -748,7 +633,7 @@ Wire Wire Line
 Wire Wire Line
 	2500 2100 2250 2100
 Wire Wire Line
-	2250 2100 2250 2350
+	2250 2100 2250 2500
 Wire Wire Line
 	2250 2350 2100 2350
 Wire Wire Line
@@ -788,23 +673,19 @@ Wire Wire Line
 	5500 1750 5500 1900
 Wire Wire Line
 	5500 2200 5500 2300
-Wire Wire Line
-	3500 4650 3400 4650
 Wire Wire Line
 	3400 5150 3500 5150
-Wire Wire Line
-	1550 5500 1400 5500
 Wire Wire Line
 	3500 5250 3400 5250
 Wire Wire Line
-	1550 5200 1000 5200
+	1550 5200 850  5200
 Wire Wire Line
-	1000 5100 1000 5300
+	850  5100 850  5300
 Wire Wire Line
-	1000 4800 1000 4600
-Connection ~ 1000 5200
+	850  4800 850  4600
+Connection ~ 850  5200
 Wire Wire Line
-	1000 5600 1000 5700
+	850  5600 850  5700
 Wire Wire Line
 	3500 4750 3400 4750
 Wire Wire Line
@@ -827,35 +708,6 @@ Wire Wire Line
 	3400 5850 3600 5850
 Wire Wire Line
 	3600 5850 3600 6350
-Wire Wire Line
-	6600 2050 6600 3100
-Wire Wire Line
-	6600 2200 7350 2200
-Wire Wire Line
-	7350 2400 7000 2400
-Wire Wire Line
-	7000 2400 7000 3100
-Wire Wire Line
-	6500 2600 7350 2600
-Wire Wire Line
-	7250 2600 7250 2700
-Connection ~ 7250 2600
-Wire Wire Line
-	7250 3000 7250 3100
-Wire Wire Line
-	8350 2200 9050 2200
-Wire Wire Line
-	8350 2600 8500 2600
-Wire Wire Line
-	8500 2600 8500 2700
-Wire Wire Line
-	8500 3000 8500 3050
-Wire Wire Line
-	8750 2700 8750 2200
-Connection ~ 8750 2200
-Wire Wire Line
-	8750 3000 8750 3050
-Connection ~ 6600 2200
 Wire Wire Line
 	6650 4600 6800 4600
 Wire Wire Line
@@ -899,7 +751,7 @@ Wire Wire Line
 Wire Wire Line
 	11300 700  11150 700 
 Wire Wire Line
-	13500 1200 13500 1300
+	6950 1650 6950 1750
 Wire Wire Line
 	11150 1400 11500 1400
 Wire Wire Line
@@ -932,12 +784,266 @@ Wire Wire Line
 Wire Wire Line
 	10700 4000 10700 4100
 Wire Wire Line
-	13250 700  14050 700 
+	6700 1150 7500 1150
+Wire Wire Line
+	6950 1350 6950 1150
+Connection ~ 6950 1150
+Wire Wire Line
+	7700 750  7700 1050
+Wire Wire Line
+	7700 1450 7700 1550
+Text Notes 1500 3850 0    60   ~ 0
+LoRa to ESP connections:\nAdafruit LoRa Module  - Adafruit Huzzah ESP Module\nG0 - A4/36\nSCK - SCK/5\nMISO - MISO/19\nMOSI - MOSI/18\nCS - A5/4\nRST - 21
+Text GLabel 1450 4900 0    60   Input ~ 0
+LoRa_DI0
+Wire Wire Line
+	1550 4900 1450 4900
+Text GLabel 3500 5350 2    60   Input ~ 0
+SCK
+Wire Wire Line
+	3500 5350 3400 5350
+Wire Wire Line
+	3500 5650 3400 5650
+$Comp
+L 19-337/R6GHBHC-A01/2T D?
+U 1 1 5BC6B6AC
+P 5100 4450
+F 0 "D?" H 4950 4951 50  0000 L BNN
+F 1 "19-337/R6GHBHC-A01/2T" H 4950 4000 50  0000 L BNN
+F 2 "LED_19-337/R6GHBHC-A01/2T" H 5100 4450 50  0001 L BNN
+F 3 "None" H 5100 4450 50  0001 L BNN
+F 4 "Everlight" H 5100 4450 50  0001 L BNN "Feld4"
+F 5 "LED Tri-Color Blue/Green/Red 468nm/518nm/632nm 6-Pin T/R" H 5100 4450 50  0001 L BNN "Feld5"
+F 6 "Unavailable" H 5100 4450 50  0001 L BNN "Feld6"
+F 7 "19-337/R6GHBHC-A01/2T" H 5100 4450 50  0001 L BNN "Feld7"
+F 8 "SMD-2 Everlight" H 5100 4450 50  0001 L BNN "Feld8"
+	1    5100 4450
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B740
+P 4800 3850
+F 0 "R?" V 4880 3850 50  0000 C CNN
+F 1 "R" V 4800 3850 50  0000 C CNN
+F 2 "" V 4730 3850 50  0001 C CNN
+F 3 "" H 4800 3850 50  0001 C CNN
+	1    4800 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B7C3
+P 5100 3850
+F 0 "R?" V 5180 3850 50  0000 C CNN
+F 1 "R" V 5100 3850 50  0000 C CNN
+F 2 "" V 5030 3850 50  0001 C CNN
+F 3 "" H 5100 3850 50  0001 C CNN
+	1    5100 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B82B
+P 5400 3850
+F 0 "R?" V 5480 3850 50  0000 C CNN
+F 1 "R" V 5400 3850 50  0000 C CNN
+F 2 "" V 5330 3850 50  0001 C CNN
+F 3 "" H 5400 3850 50  0001 C CNN
+	1    5400 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 5BC6B894
+P 5100 4950
+F 0 "#PWR?" H 5100 4700 50  0001 C CNN
+F 1 "GND" H 5100 4800 50  0000 C CNN
+F 2 "" H 5100 4950 50  0001 C CNN
+F 3 "" H 5100 4950 50  0001 C CNN
+	1    5100 4950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 4750 4800 4900
+Wire Wire Line
+	4800 4900 5400 4900
+Wire Wire Line
+	5100 4750 5100 4950
+Wire Wire Line
+	5400 4900 5400 4750
+Connection ~ 5100 4900
+Wire Wire Line
+	4800 4000 4800 4150
+Wire Wire Line
+	5100 4000 5100 4150
+Wire Wire Line
+	5400 4000 5400 4150
+Text GLabel 5400 3550 1    60   Input ~ 0
+LED_GR
+Text GLabel 5100 3550 1    60   Input ~ 0
+LED_RD
+Text GLabel 4800 3550 1    60   Input ~ 0
+LED_BL
+Wire Wire Line
+	4800 3550 4800 3700
+Wire Wire Line
+	5100 3550 5100 3700
 Wire Wire Line
-	13500 900  13500 700 
-Connection ~ 13500 700 
+	5400 3550 5400 3700
+Text GLabel 2150 6450 3    60   Input ~ 0
+LED_BL
 Wire Wire Line
-	14250 300  14250 600 
+	2150 6350 2150 6450
+Text GLabel 1450 5800 0    60   Input ~ 0
+LED_RD
+Wire Wire Line
+	1550 5800 1450 5800
+Text GLabel 2850 6450 3    60   Input ~ 0
+LED_GR
+Wire Wire Line
+	2850 6350 2850 6450
+$Comp
+L MCP73831 IC?
+U 1 1 5BC6C841
+P 9600 5700
+F 0 "IC?" H 9300 5300 45  0000 L BNN
+F 1 "MCP73831" H 9600 5700 45  0001 L BNN
+F 2 "" H 9600 5700 60  0001 C CNN
+F 3 "" H 9600 5700 60  0001 C CNN
+	1    9600 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6CB46
+P 10600 5850
+F 0 "R?" V 10680 5850 50  0000 C CNN
+F 1 "2k" V 10600 5850 50  0000 C CNN
+F 2 "" V 10530 5850 50  0001 C CNN
+F 3 "" H 10600 5850 50  0001 C CNN
+	1    10600 5850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10200 5700 10600 5700
+Wire Wire Line
+	10200 5900 10300 5900
+Wire Wire Line
+	10300 5900 10300 6100
+Wire Wire Line
+	10300 6100 10600 6100
+Wire Wire Line
+	10600 6000 10600 6200
+$Comp
+L GND #PWR?
+U 1 1 5BC6CFC3
+P 10600 6200
+F 0 "#PWR?" H 10600 5950 50  0001 C CNN
+F 1 "GND" H 10600 6050 50  0000 C CNN
+F 2 "" H 10600 6200 50  0001 C CNN
+F 3 "" H 10600 6200 50  0001 C CNN
+	1    10600 6200
+	1    0    0    -1  
+$EndComp
+Connection ~ 10600 6100
+$Comp
+L +BATT #PWR?
+U 1 1 5BC6D56F
+P 11050 5350
+F 0 "#PWR?" H 11050 5200 50  0001 C CNN
+F 1 "+BATT" H 11050 5490 50  0000 C CNN
+F 2 "" H 11050 5350 50  0001 C CNN
+F 3 "" H 11050 5350 50  0001 C CNN
+	1    11050 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 5BC6D8C3
+P 11050 5700
+F 0 "C?" H 11075 5800 50  0000 L CNN
+F 1 "10uF" H 11075 5600 50  0000 L CNN
+F 2 "" H 11088 5550 50  0001 C CNN
+F 3 "" H 11050 5700 50  0001 C CNN
+	1    11050 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBUS #PWR?
+U 1 1 5BC6D977
+P 8550 5200
+F 0 "#PWR?" H 8550 5050 50  0001 C CNN
+F 1 "VBUS" H 8550 5350 50  0000 C CNN
+F 2 "" H 8550 5200 50  0001 C CNN
+F 3 "" H 8550 5200 50  0001 C CNN
+	1    8550 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8900 5500 9100 5500
+$Comp
+L LED D?
+U 1 1 5BC6DCF4
+P 8550 5650
+F 0 "D?" H 8550 5750 50  0000 C CNN
+F 1 "LED" H 8550 5550 50  0000 C CNN
+F 2 "" H 8550 5650 50  0001 C CNN
+F 3 "" H 8550 5650 50  0001 C CNN
+	1    8550 5650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6DDB5
+P 8850 5900
+F 0 "R?" V 8930 5900 50  0000 C CNN
+F 1 "R" V 8850 5900 50  0000 C CNN
+F 2 "" V 8780 5900 50  0001 C CNN
+F 3 "" H 8850 5900 50  0001 C CNN
+	1    8850 5900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8550 5800 8550 5900
+Wire Wire Line
+	8550 5900 8700 5900
+Wire Wire Line
+	9100 5900 9000 5900
+Wire Wire Line
+	8550 5200 8550 5500
+Wire Wire Line
+	8900 5500 8900 5350
+Wire Wire Line
+	8900 5350 8550 5350
+Connection ~ 8550 5350
+$Comp
+L GND #PWR?
+U 1 1 5BC6E32B
+P 11050 6200
+F 0 "#PWR?" H 11050 5950 50  0001 C CNN
+F 1 "GND" H 11050 6050 50  0000 C CNN
+F 2 "" H 11050 6200 50  0001 C CNN
+F 3 "" H 11050 6200 50  0001 C CNN
+	1    11050 6200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11050 5850 11050 6200
+Wire Wire Line
+	10200 5500 11050 5500
+Wire Wire Line
+	11050 5350 11050 5550
+Connection ~ 11050 5500
+Wire Wire Line
+	1550 5000 1450 5000
+Wire Wire Line
+	1550 5100 1450 5100
+Text GLabel 2250 2500 3    60   Input ~ 0
+EN
+Connection ~ 2250 2350
+Text GLabel 3500 5450 2    60   Input ~ 0
+GNSS_Mosfet_EN
 Wire Wire Line
-	14250 1000 14250 1100
+	3500 5450 3400 5450
 $EndSCHEMATC
diff --git a/LoRaTracker_M8Q.pro b/LoRaTracker_M8Q.pro
index 74f595ac11097eb73b428a5ee5412d0912ad192e..0f2669de43632ae7fa6da6763c7dd399d580eec5 100644
--- a/LoRaTracker_M8Q.pro
+++ b/LoRaTracker_M8Q.pro
@@ -1,4 +1,4 @@
-update=12.10.2018 13:56:23
+update=16.10.2018 14:31:15
 version=1
 last_client=kicad
 [pcbnew]
@@ -66,3 +66,4 @@ LibName34=KiCadLibs/ESP32-kiCAD-Footprints-master/ESP32-Footprints/ESP32-footpri
 LibName35=KiCadLibs/SAM-M8Q
 LibName36=KiCadLibs/esp32-wroom-32
 LibName37=KiCadLibs/RFM95W-868S2
+LibName38=KiCadLibs/19-337_R6GHBHC-A01_2T
diff --git a/LoRaTracker_M8Q.sch b/LoRaTracker_M8Q.sch
index aa5caccf47fb662d08fe2af71566bd5f55dd490d..87f9e454c2736d66a9e547b46c317809559122be 100644
--- a/LoRaTracker_M8Q.sch
+++ b/LoRaTracker_M8Q.sch
@@ -36,6 +36,7 @@ LIBS:ESP32-footprints-Shem-Lib
 LIBS:SAM-M8Q
 LIBS:esp32-wroom-32
 LIBS:RFM95W-868S2
+LIBS:19-337_R6GHBHC-A01_2T
 LIBS:LoRaTracker_M8Q-cache
 EELAYER 25 0
 EELAYER END
@@ -67,7 +68,7 @@ L R R?
 U 1 1 5BBF6450
 P 2100 2150
 F 0 "R?" V 2180 2150 50  0000 C CNN
-F 1 "R" V 2100 2150 50  0000 C CNN
+F 1 "100k" V 2100 2150 50  0000 C CNN
 F 2 "" V 2030 2150 50  0001 C CNN
 F 3 "" H 2100 2150 50  0001 C CNN
 	1    2100 2150
@@ -78,7 +79,7 @@ L C C?
 U 1 1 5BBF651E
 P 1650 2150
 F 0 "C?" H 1675 2250 50  0000 L CNN
-F 1 "C" H 1675 2050 50  0000 L CNN
+F 1 "10uF" H 1675 2050 50  0000 L CNN
 F 2 "" H 1688 2000 50  0001 C CNN
 F 3 "" H 1650 2150 50  0001 C CNN
 	1    1650 2150
@@ -144,7 +145,7 @@ L R R?
 U 1 1 5BBF6725
 P 1900 1850
 F 0 "R?" V 1980 1850 50  0000 C CNN
-F 1 "R" V 1900 1850 50  0000 C CNN
+F 1 "100k" V 1900 1850 50  0000 C CNN
 F 2 "" V 1830 1850 50  0001 C CNN
 F 3 "" H 1900 1850 50  0001 C CNN
 	1    1900 1850
@@ -177,7 +178,7 @@ L C C?
 U 1 1 5BBF67C9
 P 3300 2150
 F 0 "C?" H 3325 2250 50  0000 L CNN
-F 1 "C" H 3325 2050 50  0000 L CNN
+F 1 "10uF" H 3325 2050 50  0000 L CNN
 F 2 "" H 3338 2000 50  0001 C CNN
 F 3 "" H 3300 2150 50  0001 C CNN
 	1    3300 2150
@@ -188,7 +189,7 @@ L C C?
 U 1 1 5BBF6839
 P 3700 2150
 F 0 "C?" H 3725 2250 50  0000 L CNN
-F 1 "C" H 3725 2050 50  0000 L CNN
+F 1 "1uF" H 3725 2050 50  0000 L CNN
 F 2 "" H 3738 2000 50  0001 C CNN
 F 3 "" H 3700 2150 50  0001 C CNN
 	1    3700 2150
@@ -265,7 +266,7 @@ L C C?
 U 1 1 5BBF6B31
 P 5500 2050
 F 0 "C?" H 5525 2150 50  0000 L CNN
-F 1 "C" H 5525 1950 50  0000 L CNN
+F 1 "10uF" H 5525 1950 50  0000 L CNN
 F 2 "" H 5538 1900 50  0001 C CNN
 F 3 "" H 5500 2050 50  0001 C CNN
 	1    5500 2050
@@ -285,45 +286,45 @@ $EndComp
 $Comp
 L +BATT #PWR?
 U 1 1 5BBF6FD4
-P 1000 4600
-F 0 "#PWR?" H 1000 4450 50  0001 C CNN
-F 1 "+BATT" H 1000 4740 50  0000 C CNN
-F 2 "" H 1000 4600 50  0001 C CNN
-F 3 "" H 1000 4600 50  0001 C CNN
-	1    1000 4600
+P 850 4600
+F 0 "#PWR?" H 850 4450 50  0001 C CNN
+F 1 "+BATT" H 850 4740 50  0000 C CNN
+F 2 "" H 850 4600 50  0001 C CNN
+F 3 "" H 850 4600 50  0001 C CNN
+	1    850  4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 5BBF70D9
-P 1000 4950
-F 0 "R?" V 1080 4950 50  0000 C CNN
-F 1 "R" V 1000 4950 50  0000 C CNN
-F 2 "" V 930 4950 50  0001 C CNN
-F 3 "" H 1000 4950 50  0001 C CNN
-	1    1000 4950
+P 850 4950
+F 0 "R?" V 930 4950 50  0000 C CNN
+F 1 "100k" V 850 4950 50  0000 C CNN
+F 2 "" V 780 4950 50  0001 C CNN
+F 3 "" H 850 4950 50  0001 C CNN
+	1    850  4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R?
 U 1 1 5BBF7158
-P 1000 5450
-F 0 "R?" V 1080 5450 50  0000 C CNN
-F 1 "R" V 1000 5450 50  0000 C CNN
-F 2 "" V 930 5450 50  0001 C CNN
-F 3 "" H 1000 5450 50  0001 C CNN
-	1    1000 5450
+P 850 5450
+F 0 "R?" V 930 5450 50  0000 C CNN
+F 1 "100k" V 850 5450 50  0000 C CNN
+F 2 "" V 780 5450 50  0001 C CNN
+F 3 "" H 850 5450 50  0001 C CNN
+	1    850  5450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5BBF7274
-P 1000 5700
-F 0 "#PWR?" H 1000 5450 50  0001 C CNN
-F 1 "GND" H 1000 5550 50  0000 C CNN
-F 2 "" H 1000 5700 50  0001 C CNN
-F 3 "" H 1000 5700 50  0001 C CNN
-	1    1000 5700
+P 850 5700
+F 0 "#PWR?" H 850 5450 50  0001 C CNN
+F 1 "GND" H 850 5550 50  0000 C CNN
+F 2 "" H 850 5700 50  0001 C CNN
+F 3 "" H 850 5700 50  0001 C CNN
+	1    850  5700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -353,12 +354,10 @@ F 3 "" H 2050 5750 60  0001 C CNN
 	1    2500 5300
 	1    0    0    -1  
 $EndComp
-Text GLabel 3500 4650 2    60   Input ~ 0
-SCL
 Text GLabel 3500 5150 2    60   Input ~ 0
 MISO
-Text GLabel 1400 5500 0    60   Input ~ 0
-SDA
+Text GLabel 3500 5650 2    60   Input ~ 0
+CS
 Text GLabel 3500 5250 2    60   Input ~ 0
 MOSI
 Text GLabel 3500 4750 2    60   Input ~ 0
@@ -420,120 +419,6 @@ F 3 "" H 3600 6350 50  0001 C CNN
 	1    3600 6350
 	1    0    0    -1  
 $EndComp
-$Comp
-L LP298X IC?
-U 1 1 5BC0761A
-P 7950 2400
-F 0 "IC?" V 7415 2200 45  0000 L BNN
-F 1 "LP298X" V 8415 2200 45  0000 L BNN
-F 2 "" H 7950 2400 60  0001 C CNN
-F 3 "" H 7950 2400 60  0001 C CNN
-	1    7950 2400
-	0    1    1    0   
-$EndComp
-$Comp
-L +BATT #PWR?
-U 1 1 5BC0772B
-P 6600 2050
-F 0 "#PWR?" H 6600 1900 50  0001 C CNN
-F 1 "+BATT" H 6600 2190 50  0000 C CNN
-F 2 "" H 6600 2050 50  0001 C CNN
-F 3 "" H 6600 2050 50  0001 C CNN
-	1    6600 2050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC0780E
-P 7000 3100
-F 0 "#PWR?" H 7000 2850 50  0001 C CNN
-F 1 "GND" H 7000 2950 50  0000 C CNN
-F 2 "" H 7000 3100 50  0001 C CNN
-F 3 "" H 7000 3100 50  0001 C CNN
-	1    7000 3100
-	1    0    0    -1  
-$EndComp
-Text GLabel 6500 2600 0    60   Input ~ 0
-GNSS_EN
-$Comp
-L R R?
-U 1 1 5BC07900
-P 7250 2850
-F 0 "R?" V 7330 2850 50  0000 C CNN
-F 1 "R" V 7250 2850 50  0000 C CNN
-F 2 "" V 7180 2850 50  0001 C CNN
-F 3 "" H 7250 2850 50  0001 C CNN
-	1    7250 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC079B3
-P 7250 3100
-F 0 "#PWR?" H 7250 2850 50  0001 C CNN
-F 1 "GND" H 7250 2950 50  0000 C CNN
-F 2 "" H 7250 3100 50  0001 C CNN
-F 3 "" H 7250 3100 50  0001 C CNN
-	1    7250 3100
-	1    0    0    -1  
-$EndComp
-Text GLabel 9050 2200 2    60   Input ~ 0
-GNSS_VCC
-$Comp
-L C C?
-U 1 1 5BC07B1D
-P 8500 2850
-F 0 "C?" H 8525 2950 50  0000 L CNN
-F 1 "C" H 8525 2750 50  0000 L CNN
-F 2 "" H 8538 2700 50  0001 C CNN
-F 3 "" H 8500 2850 50  0001 C CNN
-	1    8500 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07BD8
-P 8500 3050
-F 0 "#PWR?" H 8500 2800 50  0001 C CNN
-F 1 "GND" H 8500 2900 50  0000 C CNN
-F 2 "" H 8500 3050 50  0001 C CNN
-F 3 "" H 8500 3050 50  0001 C CNN
-	1    8500 3050
-	1    0    0    -1  
-$EndComp
-$Comp
-L C C?
-U 1 1 5BC07C59
-P 8750 2850
-F 0 "C?" H 8775 2950 50  0000 L CNN
-F 1 "C" H 8775 2750 50  0000 L CNN
-F 2 "" H 8788 2700 50  0001 C CNN
-F 3 "" H 8750 2850 50  0001 C CNN
-	1    8750 2850
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07D05
-P 8750 3050
-F 0 "#PWR?" H 8750 2800 50  0001 C CNN
-F 1 "GND" H 8750 2900 50  0000 C CNN
-F 2 "" H 8750 3050 50  0001 C CNN
-F 3 "" H 8750 3050 50  0001 C CNN
-	1    8750 3050
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR?
-U 1 1 5BC07EE3
-P 6600 3100
-F 0 "#PWR?" H 6600 2850 50  0001 C CNN
-F 1 "GND" H 6600 2950 50  0000 C CNN
-F 2 "" H 6600 3100 50  0001 C CNN
-F 3 "" H 6600 3100 50  0001 C CNN
-	1    6600 3100
-	1    0    0    -1  
-$EndComp
 Text GLabel 8000 3600 2    60   Input ~ 0
 GNSS_VCC
 Text GLabel 8550 4400 2    60   Input ~ 0
@@ -557,14 +442,14 @@ NoConn ~ 8400 4800
 NoConn ~ 7800 5400
 NoConn ~ 7600 5400
 NoConn ~ 7400 5400
-Text GLabel 1800 7100 0    60   Input ~ 0
+Text GLabel 1450 5000 0    60   Input ~ 0
 GNSS_TXD
-Text GLabel 1800 7250 0    60   Input ~ 0
+Text GLabel 1450 5100 0    60   Input ~ 0
 GNSS_RXD
 Text Notes 1950 7150 0    60   ~ 0
 Connect to ESP\n
 Text Notes 3900 7650 0    60   ~ 0
-TODO:\n- Check Gnss En Function (connect it to a pin to esp)\n- Check esp software serial pins\n- Think about VRegulator for every module or one Reg. for all\n -> if one for all, check MOSFET switch\n- Add connections to LoRa module\n- Add values for resistors and capacitors\n- Add Charging Circuitry plus Charging LED\n- Add Status LED\n- Double Check ALL connections\n
+TODO:\n\n- Double Check ALL connections\n- check RGB LED Forward Voltage 3.3V? Resistor Value?\n\n
 $Comp
 L SCHOTTKY-DIODE D?
 U 1 1 5BC08E7D
@@ -592,7 +477,7 @@ L R R?
 U 1 1 5BC09786
 P 10100 3900
 F 0 "R?" V 10180 3900 50  0000 C CNN
-F 1 "R" V 10100 3900 50  0000 C CNN
+F 1 "100k" V 10100 3900 50  0000 C CNN
 F 2 "" V 10030 3900 50  0001 C CNN
 F 3 "" H 10100 3900 50  0001 C CNN
 	1    10100 3900
@@ -645,57 +530,57 @@ MISO
 Text GLabel 11350 1200 2    60   Input ~ 0
 MOSI
 Text GLabel 9600 900  0    60   Input ~ 0
-SDA
+CS
 Text GLabel 9600 800  0    60   Input ~ 0
-SDA
+SCK
 $Comp
 L MOSFET-P Q?
 U 1 1 5BC0A90D
-P 14250 800
-F 0 "Q?" H 13700 750 45  0000 L BNN
-F 1 "MOSFET-P" H 13700 650 45  0000 L BNN
-F 2 "" H 14250 800 60  0001 C CNN
-F 3 "" H 14250 800 60  0001 C CNN
-	1    14250 800 
+P 7700 1250
+F 0 "Q?" H 7150 1200 45  0000 L BNN
+F 1 "MOSFET-P" H 7150 1100 45  0000 L BNN
+F 2 "" H 7700 1250 60  0001 C CNN
+F 3 "" H 7700 1250 60  0001 C CNN
+	1    7700 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3.3V #PWR?
 U 1 1 5BC0AA24
-P 14250 300
-F 0 "#PWR?" H 14250 150 50  0001 C CNN
-F 1 "+3.3V" H 14250 440 50  0000 C CNN
-F 2 "" H 14250 300 50  0001 C CNN
-F 3 "" H 14250 300 50  0001 C CNN
-	1    14250 300 
+P 7700 750
+F 0 "#PWR?" H 7700 600 50  0001 C CNN
+F 1 "+3.3V" H 7700 890 50  0000 C CNN
+F 2 "" H 7700 750 50  0001 C CNN
+F 3 "" H 7700 750 50  0001 C CNN
+	1    7700 750 
 	1    0    0    -1  
 $EndComp
 Text GLabel 11300 700  2    60   Input ~ 0
 LoR_VCC
-Text GLabel 14250 1100 3    60   Input ~ 0
+Text GLabel 7700 1550 3    60   Input ~ 0
 LoR_VCC
-Text GLabel 13250 700  0    60   Input ~ 0
+Text GLabel 6700 1150 0    60   Input ~ 0
 LoRa_Mosfet_EN
 $Comp
 L R R?
 U 1 1 5BC0ACCE
-P 13500 1050
-F 0 "R?" V 13580 1050 50  0000 C CNN
-F 1 "R" V 13500 1050 50  0000 C CNN
-F 2 "" V 13430 1050 50  0001 C CNN
-F 3 "" H 13500 1050 50  0001 C CNN
-	1    13500 1050
+P 6950 1500
+F 0 "R?" V 7030 1500 50  0000 C CNN
+F 1 "100k" V 6950 1500 50  0000 C CNN
+F 2 "" V 6880 1500 50  0001 C CNN
+F 3 "" H 6950 1500 50  0001 C CNN
+	1    6950 1500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 5BC0AD74
-P 13500 1300
-F 0 "#PWR?" H 13500 1050 50  0001 C CNN
-F 1 "GND" H 13500 1150 50  0000 C CNN
-F 2 "" H 13500 1300 50  0001 C CNN
-F 3 "" H 13500 1300 50  0001 C CNN
-	1    13500 1300
+P 6950 1750
+F 0 "#PWR?" H 6950 1500 50  0001 C CNN
+F 1 "GND" H 6950 1600 50  0000 C CNN
+F 2 "" H 6950 1750 50  0001 C CNN
+F 3 "" H 6950 1750 50  0001 C CNN
+	1    6950 1750
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -715,8 +600,6 @@ Text GLabel 9600 1400 0    60   Input ~ 0
 LoRa_DI0
 Text GLabel 3500 4950 2    60   Input ~ 0
 LoRa_RST
-Text GLabel 1800 7400 0    60   Input ~ 0
-LoRa_DI0
 $Comp
 L ANTENNA_U.FL X?
 U 1 1 5BC0B82D
@@ -748,7 +631,7 @@ Wire Wire Line
 Wire Wire Line
 	2500 2100 2250 2100
 Wire Wire Line
-	2250 2100 2250 2350
+	2250 2100 2250 2500
 Wire Wire Line
 	2250 2350 2100 2350
 Wire Wire Line
@@ -788,23 +671,19 @@ Wire Wire Line
 	5500 1750 5500 1900
 Wire Wire Line
 	5500 2200 5500 2300
-Wire Wire Line
-	3500 4650 3400 4650
 Wire Wire Line
 	3400 5150 3500 5150
-Wire Wire Line
-	1550 5500 1400 5500
 Wire Wire Line
 	3500 5250 3400 5250
 Wire Wire Line
-	1550 5200 1000 5200
+	1550 5200 850  5200
 Wire Wire Line
-	1000 5100 1000 5300
+	850  5100 850  5300
 Wire Wire Line
-	1000 4800 1000 4600
-Connection ~ 1000 5200
+	850  4800 850  4600
+Connection ~ 850  5200
 Wire Wire Line
-	1000 5600 1000 5700
+	850  5600 850  5700
 Wire Wire Line
 	3500 4750 3400 4750
 Wire Wire Line
@@ -827,35 +706,6 @@ Wire Wire Line
 	3400 5850 3600 5850
 Wire Wire Line
 	3600 5850 3600 6350
-Wire Wire Line
-	6600 2050 6600 3100
-Wire Wire Line
-	6600 2200 7350 2200
-Wire Wire Line
-	7350 2400 7000 2400
-Wire Wire Line
-	7000 2400 7000 3100
-Wire Wire Line
-	6500 2600 7350 2600
-Wire Wire Line
-	7250 2600 7250 2700
-Connection ~ 7250 2600
-Wire Wire Line
-	7250 3000 7250 3100
-Wire Wire Line
-	8350 2200 9050 2200
-Wire Wire Line
-	8350 2600 8500 2600
-Wire Wire Line
-	8500 2600 8500 2700
-Wire Wire Line
-	8500 3000 8500 3050
-Wire Wire Line
-	8750 2700 8750 2200
-Connection ~ 8750 2200
-Wire Wire Line
-	8750 3000 8750 3050
-Connection ~ 6600 2200
 Wire Wire Line
 	6650 4600 6800 4600
 Wire Wire Line
@@ -899,7 +749,7 @@ Wire Wire Line
 Wire Wire Line
 	11300 700  11150 700 
 Wire Wire Line
-	13500 1200 13500 1300
+	6950 1650 6950 1750
 Wire Wire Line
 	11150 1400 11500 1400
 Wire Wire Line
@@ -932,14 +782,423 @@ Wire Wire Line
 Wire Wire Line
 	10700 4000 10700 4100
 Wire Wire Line
-	13250 700  14050 700 
+	6700 1150 7500 1150
 Wire Wire Line
-	13500 900  13500 700 
-Connection ~ 13500 700 
+	6950 1350 6950 1150
+Connection ~ 6950 1150
 Wire Wire Line
-	14250 300  14250 600 
+	7700 750  7700 1050
 Wire Wire Line
-	14250 1000 14250 1100
-Text Notes 12050 3500 0    60   ~ 0
+	7700 1450 7700 1550
+Text Notes 1500 3850 0    60   ~ 0
 LoRa to ESP connections:\nAdafruit LoRa Module  - Adafruit Huzzah ESP Module\nG0 - A4/36\nSCK - SCK/5\nMISO - MISO/19\nMOSI - MOSI/18\nCS - A5/4\nRST - 21
+Text GLabel 1450 4900 0    60   Input ~ 0
+LoRa_DI0
+Wire Wire Line
+	1550 4900 1450 4900
+Text GLabel 3500 5350 2    60   Input ~ 0
+SCK
+Wire Wire Line
+	3500 5350 3400 5350
+Wire Wire Line
+	3500 5650 3400 5650
+$Comp
+L 19-337/R6GHBHC-A01/2T D?
+U 1 1 5BC6B6AC
+P 5100 4450
+F 0 "D?" H 4950 4951 50  0000 L BNN
+F 1 "19-337/R6GHBHC-A01/2T" H 4950 4000 50  0000 L BNN
+F 2 "LED_19-337/R6GHBHC-A01/2T" H 5100 4450 50  0001 L BNN
+F 3 "None" H 5100 4450 50  0001 L BNN
+F 4 "Everlight" H 5100 4450 50  0001 L BNN "Feld4"
+F 5 "LED Tri-Color Blue/Green/Red 468nm/518nm/632nm 6-Pin T/R" H 5100 4450 50  0001 L BNN "Feld5"
+F 6 "Unavailable" H 5100 4450 50  0001 L BNN "Feld6"
+F 7 "19-337/R6GHBHC-A01/2T" H 5100 4450 50  0001 L BNN "Feld7"
+F 8 "SMD-2 Everlight" H 5100 4450 50  0001 L BNN "Feld8"
+	1    5100 4450
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B740
+P 4800 3850
+F 0 "R?" V 4880 3850 50  0000 C CNN
+F 1 "R" V 4800 3850 50  0000 C CNN
+F 2 "" V 4730 3850 50  0001 C CNN
+F 3 "" H 4800 3850 50  0001 C CNN
+	1    4800 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B7C3
+P 5100 3850
+F 0 "R?" V 5180 3850 50  0000 C CNN
+F 1 "R" V 5100 3850 50  0000 C CNN
+F 2 "" V 5030 3850 50  0001 C CNN
+F 3 "" H 5100 3850 50  0001 C CNN
+	1    5100 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6B82B
+P 5400 3850
+F 0 "R?" V 5480 3850 50  0000 C CNN
+F 1 "R" V 5400 3850 50  0000 C CNN
+F 2 "" V 5330 3850 50  0001 C CNN
+F 3 "" H 5400 3850 50  0001 C CNN
+	1    5400 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 5BC6B894
+P 5100 4950
+F 0 "#PWR?" H 5100 4700 50  0001 C CNN
+F 1 "GND" H 5100 4800 50  0000 C CNN
+F 2 "" H 5100 4950 50  0001 C CNN
+F 3 "" H 5100 4950 50  0001 C CNN
+	1    5100 4950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 4750 4800 4900
+Wire Wire Line
+	4800 4900 5400 4900
+Wire Wire Line
+	5100 4750 5100 4950
+Wire Wire Line
+	5400 4900 5400 4750
+Connection ~ 5100 4900
+Wire Wire Line
+	4800 4000 4800 4150
+Wire Wire Line
+	5100 4000 5100 4150
+Wire Wire Line
+	5400 4000 5400 4150
+Text GLabel 5400 3550 1    60   Input ~ 0
+LED_GR
+Text GLabel 5100 3550 1    60   Input ~ 0
+LED_RD
+Text GLabel 4800 3550 1    60   Input ~ 0
+LED_BL
+Wire Wire Line
+	4800 3550 4800 3700
+Wire Wire Line
+	5100 3550 5100 3700
+Wire Wire Line
+	5400 3550 5400 3700
+Text GLabel 2150 6450 3    60   Input ~ 0
+LED_BL
+Wire Wire Line
+	2150 6350 2150 6450
+Text GLabel 1450 5800 0    60   Input ~ 0
+LED_RD
+Wire Wire Line
+	1550 5800 1450 5800
+Text GLabel 2850 6450 3    60   Input ~ 0
+LED_GR
+Wire Wire Line
+	2850 6350 2850 6450
+$Comp
+L MCP73831 IC?
+U 1 1 5BC6C841
+P 9600 5700
+F 0 "IC?" H 9300 5300 45  0000 L BNN
+F 1 "MCP73831" H 9600 5700 45  0001 L BNN
+F 2 "" H 9600 5700 60  0001 C CNN
+F 3 "" H 9600 5700 60  0001 C CNN
+	1    9600 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6CB46
+P 10600 5850
+F 0 "R?" V 10680 5850 50  0000 C CNN
+F 1 "2k" V 10600 5850 50  0000 C CNN
+F 2 "" V 10530 5850 50  0001 C CNN
+F 3 "" H 10600 5850 50  0001 C CNN
+	1    10600 5850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10200 5700 10600 5700
+Wire Wire Line
+	10200 5900 10300 5900
+Wire Wire Line
+	10300 5900 10300 6100
+Wire Wire Line
+	10300 6100 10600 6100
+Wire Wire Line
+	10600 6000 10600 6200
+$Comp
+L GND #PWR?
+U 1 1 5BC6CFC3
+P 10600 6200
+F 0 "#PWR?" H 10600 5950 50  0001 C CNN
+F 1 "GND" H 10600 6050 50  0000 C CNN
+F 2 "" H 10600 6200 50  0001 C CNN
+F 3 "" H 10600 6200 50  0001 C CNN
+	1    10600 6200
+	1    0    0    -1  
+$EndComp
+Connection ~ 10600 6100
+$Comp
+L +BATT #PWR?
+U 1 1 5BC6D56F
+P 11050 5350
+F 0 "#PWR?" H 11050 5200 50  0001 C CNN
+F 1 "+BATT" H 11050 5490 50  0000 C CNN
+F 2 "" H 11050 5350 50  0001 C CNN
+F 3 "" H 11050 5350 50  0001 C CNN
+	1    11050 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C?
+U 1 1 5BC6D8C3
+P 11050 5700
+F 0 "C?" H 11075 5800 50  0000 L CNN
+F 1 "10uF" H 11075 5600 50  0000 L CNN
+F 2 "" H 11088 5550 50  0001 C CNN
+F 3 "" H 11050 5700 50  0001 C CNN
+	1    11050 5700
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBUS #PWR?
+U 1 1 5BC6D977
+P 8550 5200
+F 0 "#PWR?" H 8550 5050 50  0001 C CNN
+F 1 "VBUS" H 8550 5350 50  0000 C CNN
+F 2 "" H 8550 5200 50  0001 C CNN
+F 3 "" H 8550 5200 50  0001 C CNN
+	1    8550 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8900 5500 9100 5500
+$Comp
+L LED D?
+U 1 1 5BC6DCF4
+P 8550 5650
+F 0 "D?" H 8550 5750 50  0000 C CNN
+F 1 "LED" H 8550 5550 50  0000 C CNN
+F 2 "" H 8550 5650 50  0001 C CNN
+F 3 "" H 8550 5650 50  0001 C CNN
+	1    8550 5650
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R?
+U 1 1 5BC6DDB5
+P 8850 5900
+F 0 "R?" V 8930 5900 50  0000 C CNN
+F 1 "100" V 8850 5900 50  0000 C CNN
+F 2 "" V 8780 5900 50  0001 C CNN
+F 3 "" H 8850 5900 50  0001 C CNN
+	1    8850 5900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8550 5800 8550 5900
+Wire Wire Line
+	8550 5900 8700 5900
+Wire Wire Line
+	9100 5900 9000 5900
+Wire Wire Line
+	8550 5200 8550 5500
+Wire Wire Line
+	8900 5500 8900 5350
+Wire Wire Line
+	8900 5350 8550 5350
+Connection ~ 8550 5350
+$Comp
+L GND #PWR?
+U 1 1 5BC6E32B
+P 11050 6200
+F 0 "#PWR?" H 11050 5950 50  0001 C CNN
+F 1 "GND" H 11050 6050 50  0000 C CNN
+F 2 "" H 11050 6200 50  0001 C CNN
+F 3 "" H 11050 6200 50  0001 C CNN
+	1    11050 6200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	11050 5850 11050 6200
+Wire Wire Line
+	10200 5500 11050 5500
+Wire Wire Line
+	11050 5350 11050 5550
+Connection ~ 11050 5500
+Wire Wire Line
+	1550 5000 1450 5000
+Wire Wire Line
+	1550 5100 1450 5100
+Text GLabel 2250 2500 3    60   Input ~ 0
+EN
+Connection ~ 2250 2350
+Text GLabel 3500 5450 2    60   Input ~ 0
+GNSS_Mosfet_EN
+Wire Wire Line
+	3500 5450 3400 5450
+Text GLabel 3500 5550 2    60   Input ~ 0
+LoRa_Mosfet_EN
+Wire Wire Line
+	3400 5550 3500 5550
+$Comp
+L PINHD-1X3 JP?
+U 1 1 5BC616E9
+P 5900 7000
+F 0 "JP?" H 5650 7225 45  0000 L BNN
+F 1 "PINHD-1X3" H 5650 6700 45  0000 L BNN
+F 2 "" H 5900 7000 60  0001 C CNN
+F 3 "" H 5900 7000 60  0001 C CNN
+	1    5900 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC61750
+P 5700 5850
+F 0 "JP?" H 5450 5975 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 5650 45  0000 L BNN
+F 2 "" H 5700 5850 60  0001 C CNN
+F 3 "" H 5700 5850 60  0001 C CNN
+	1    5700 5850
+	-1   0    0    1   
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC617D7
+P 5700 6050
+F 0 "JP?" H 5450 6175 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 5850 45  0000 L BNN
+F 2 "" H 5700 6050 60  0001 C CNN
+F 3 "" H 5700 6050 60  0001 C CNN
+	1    5700 6050
+	-1   0    0    1   
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC6184C
+P 5700 5450
+F 0 "JP?" H 5450 5575 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 5250 45  0000 L BNN
+F 2 "" H 5700 5450 60  0001 C CNN
+F 3 "" H 5700 5450 60  0001 C CNN
+	1    5700 5450
+	-1   0    0    1   
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC618C4
+P 5700 6450
+F 0 "JP?" H 5450 6575 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 6250 45  0000 L BNN
+F 2 "" H 5700 6450 60  0001 C CNN
+F 3 "" H 5700 6450 60  0001 C CNN
+	1    5700 6450
+	1    0    0    -1  
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC6193F
+P 5700 6650
+F 0 "JP?" H 5450 6775 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 6450 45  0000 L BNN
+F 2 "" H 5700 6650 60  0001 C CNN
+F 3 "" H 5700 6650 60  0001 C CNN
+	1    5700 6650
+	1    0    0    -1  
+$EndComp
+$Comp
+L PINHD-1X1 JP?
+U 1 1 5BC619BD
+P 5700 5650
+F 0 "JP?" H 5450 5775 45  0000 L BNN
+F 1 "PINHD-1X1" H 5450 5450 45  0000 L BNN
+F 2 "" H 5700 5650 60  0001 C CNN
+F 3 "" H 5700 5650 60  0001 C CNN
+	1    5700 5650
+	-1   0    0    1   
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 5BC61F5A
+P 5400 7100
+F 0 "#PWR?" H 5400 6850 50  0001 C CNN
+F 1 "GND" H 5400 6950 50  0000 C CNN
+F 2 "" H 5400 7100 50  0001 C CNN
+F 3 "" H 5400 7100 50  0001 C CNN
+	1    5400 7100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5800 7100 5400 7100
+Text GLabel 5500 7000 0    60   Input ~ 0
+EN
+Wire Wire Line
+	5800 7000 5500 7000
+$Comp
+L +BATT #PWR?
+U 1 1 5BC6262E
+P 5400 6850
+F 0 "#PWR?" H 5400 6700 50  0001 C CNN
+F 1 "+BATT" H 5400 6990 50  0000 C CNN
+F 2 "" H 5400 6850 50  0001 C CNN
+F 3 "" H 5400 6850 50  0001 C CNN
+	1    5400 6850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5800 6900 5400 6900
+Wire Wire Line
+	5400 6900 5400 6850
+Text GLabel 6050 5650 2    60   Input ~ 0
+TXD_ESP
+Text GLabel 6050 5850 2    60   Input ~ 0
+RXD_ESP
+$Comp
+L GND #PWR?
+U 1 1 5BC62B8A
+P 6250 6050
+F 0 "#PWR?" H 6250 5800 50  0001 C CNN
+F 1 "GND" H 6250 5900 50  0000 C CNN
+F 2 "" H 6250 6050 50  0001 C CNN
+F 3 "" H 6250 6050 50  0001 C CNN
+	1    6250 6050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5800 6050 6250 6050
+Wire Wire Line
+	5800 5850 6050 5850
+Wire Wire Line
+	6050 5650 5800 5650
+$Comp
+L +3.3V #PWR?
+U 1 1 5BC62EAE
+P 6250 5400
+F 0 "#PWR?" H 6250 5250 50  0001 C CNN
+F 1 "+3.3V" H 6250 5540 50  0000 C CNN
+F 2 "" H 6250 5400 50  0001 C CNN
+F 3 "" H 6250 5400 50  0001 C CNN
+	1    6250 5400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6250 5400 6250 5450
+Wire Wire Line
+	6250 5450 5800 5450
+Text GLabel 5350 6450 0    60   Input ~ 0
+GNSS_TXD
+Wire Wire Line
+	5600 6450 5350 6450
+Text GLabel 5350 6650 0    60   Input ~ 0
+GNSS_RXD
+Wire Wire Line
+	5600 6650 5350 6650
 $EndSCHEMATC