diff --git a/modules/EPS/Battery_charger.kicad_sch b/modules/EPS/Battery_charger.kicad_sch
index 9990518..527ae52 100644
--- a/modules/EPS/Battery_charger.kicad_sch
+++ b/modules/EPS/Battery_charger.kicad_sch
@@ -13,6 +13,38 @@
   )
 
   (lib_symbols
+    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_0_1"
+        (circle (center 0 3.302) (radius 0.762) (stroke (width 0)) (fill (type none)))
+      )
+      (symbol "TestPoint_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Connector_Generic_MountingPin:Conn_01x02_MountingPin" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
@@ -163,6 +195,41 @@
         )
       )
     )
+    (symbol "Device:Jumper_NO_Small" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "JP" (id 0) (at 0 2.032 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "Jumper_NO_Small" (id 1) (at 0.254 -1.524 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "jumper link bridge NO" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Jumper, normally open, small symbol" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SolderJumper*Open*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "Jumper_NO_Small_0_1"
+        (circle (center -1.016 0) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (circle (center 1.016 0) (radius 0.508) (stroke (width 0)) (fill (type none)))
+        (pin passive line (at -2.54 0 0) (length 1.016)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 0 180) (length 1.016)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:L" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "L" (id 0) (at -1.27 0 90)
         (effects (font (size 1.27 1.27)))
@@ -387,7 +454,7 @@
           (name "ILIM_HIZ" (effects (font (size 1.27 1.27))))
           (number "17" (effects (font (size 1.27 1.27))))
         )
-        (pin power_in line (at 17.78 -10.16 180) (length 5.08)
+        (pin input line (at 17.78 -10.16 180) (length 5.08)
           (name "BATP" (effects (font (size 1.27 1.27))))
           (number "18" (effects (font (size 1.27 1.27))))
         )
@@ -665,11 +732,52 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
   (junction (at 27.94 116.84) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 33.02 105.41) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 36.83 116.84) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 74.7583 46.99) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 74.93 66.04) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 80.01 46.99) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 80.01 66.04) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 85.09 46.99) (diameter 0.9144) (color 0 0 0 0))
@@ -679,10 +787,13 @@
   (junction (at 111.76 105.41) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 111.76 113.03) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 121.92 57.15) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 134.62 57.15) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 142.24 57.15) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 172.72 138.43) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 184.15 101.6) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 184.15 138.43) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 184.15 148.59) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 193.04 138.43) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 232.41 17.78) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 232.41 31.75) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 232.41 45.72) (diameter 0.9144) (color 0 0 0 0))
@@ -697,8 +808,7 @@
   (junction (at 259.08 45.72) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 267.97 31.75) (diameter 0.9144) (color 0 0 0 0))
   (junction (at 267.97 45.72) (diameter 0.9144) (color 0 0 0 0))
-
-  (no_connect (at 179.07 167.64) (uuid e53fec91-6b52-4168-be4b-d258f676984f))
+  (junction (at 276.86 31.75) (diameter 0.9144) (color 0 0 0 0))
 
   (wire (pts (xy 21.59 116.84) (xy 27.94 116.84))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -748,13 +858,21 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 13870d8f-31c4-4071-83c4-b92878f24dad)
   )
-  (wire (pts (xy 77.47 46.99) (xy 80.01 46.99))
+  (wire (pts (xy 72.39 46.99) (xy 74.7583 46.99))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 05d8f5da-60a5-4a5e-9afb-553157269f49)
   )
-  (wire (pts (xy 77.47 66.04) (xy 80.01 66.04))
+  (wire (pts (xy 72.39 66.04) (xy 74.93 66.04))
     (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid cfefcd40-00e5-4aab-a6a7-493c8267a839)
+    (uuid d68ed62d-5e2e-4bd7-b8fc-5ec9c47ffb88)
+  )
+  (wire (pts (xy 74.7583 46.99) (xy 80.01 46.99))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 05d8f5da-60a5-4a5e-9afb-553157269f49)
+  )
+  (wire (pts (xy 74.93 66.04) (xy 80.01 66.04))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d68ed62d-5e2e-4bd7-b8fc-5ec9c47ffb88)
   )
   (wire (pts (xy 80.01 40.64) (xy 80.01 46.99))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -832,18 +950,6 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 65d2e512-546c-4b36-bd2a-841d298a1d6f)
   )
-  (wire (pts (xy 107.95 128.27) (xy 124.46 128.27))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid 8d06e39c-a29f-43f2-bea6-031800a291c4)
-  )
-  (wire (pts (xy 107.95 132.08) (xy 124.46 132.08))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid dd104d52-df0f-49fd-b373-e112abf0cd7f)
-  )
-  (wire (pts (xy 107.95 135.89) (xy 124.46 135.89))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-    (uuid ad453330-930c-4207-8114-9da2cc5bf2c3)
-  )
   (wire (pts (xy 111.76 97.79) (xy 121.92 97.79))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 685064b8-6038-404e-8d94-a217a4695e2e)
@@ -860,6 +966,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 4e8d14a5-8ddf-479d-9b77-3398ed468e83)
   )
+  (wire (pts (xy 113.03 124.46) (xy 113.03 127))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 83f284a7-68dd-4bb0-9db5-0b2368258442)
+  )
+  (wire (pts (xy 113.03 139.7) (xy 113.03 142.24))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d0601497-b71d-400c-9ee0-953d43c3b03a)
+  )
   (wire (pts (xy 116.84 109.22) (xy 124.46 109.22))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid c5419e80-0d28-4d9f-bef0-4f9995d7e722)
@@ -880,11 +994,15 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid a53f81fa-f99a-4e2e-b43d-11dbd9aa7703)
   )
+  (wire (pts (xy 119.38 139.7) (xy 113.03 139.7))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d0601497-b71d-400c-9ee0-953d43c3b03a)
+  )
   (wire (pts (xy 121.92 46.99) (xy 121.92 57.15))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 3040acf3-163b-47a1-b856-212f7cbdac3d)
   )
-  (wire (pts (xy 121.92 57.15) (xy 142.24 57.15))
+  (wire (pts (xy 121.92 57.15) (xy 134.62 57.15))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d33b7add-0104-4de1-a97d-17e4c31c513e)
   )
@@ -908,6 +1026,18 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 4e8d14a5-8ddf-479d-9b77-3398ed468e83)
   )
+  (wire (pts (xy 121.92 128.27) (xy 124.46 128.27))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 0a5dc0dc-c774-4c4f-8bf9-bdc4c266fdd2)
+  )
+  (wire (pts (xy 121.92 132.08) (xy 124.46 132.08))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 1d820e73-be84-42bd-ae83-3671da2e7906)
+  )
+  (wire (pts (xy 121.92 135.89) (xy 124.46 135.89))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 542cae7a-5371-4e6b-bb64-6db9aae9aa5b)
+  )
   (wire (pts (xy 124.46 40.64) (xy 124.46 72.39))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 59183eee-f9e5-46d8-b798-a0e779baa1e7)
@@ -924,6 +1054,14 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 4e8d14a5-8ddf-479d-9b77-3398ed468e83)
   )
+  (wire (pts (xy 124.46 124.46) (xy 113.03 124.46))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 83f284a7-68dd-4bb0-9db5-0b2368258442)
+  )
+  (wire (pts (xy 134.62 57.15) (xy 142.24 57.15))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d33b7add-0104-4de1-a97d-17e4c31c513e)
+  )
   (wire (pts (xy 142.24 57.15) (xy 142.24 62.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d33b7add-0104-4de1-a97d-17e4c31c513e)
@@ -1218,6 +1356,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dc2e5639-756e-44ef-a910-941d953a17f2)
   )
+  (text "Use internal pull-up resistor\ninside MCU on ~{INT} input"
+    (at 82.55 138.43 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid d9cb0a9a-6bb5-49f1-a51a-df9f7dd856f3)
+  )
   (text "Coil should be rated\nat least for 3A" (at 86.36 119.38 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid de138432-517f-4d44-bf77-62afb9ea7d93)
@@ -1232,10 +1375,6 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2b697437-fc61-4fcc-8401-1ccad91921cc)
   )
-  (text "Verify ILIM and TS resistors\n" (at 181.61 168.91 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 3cbfd6dd-492d-4d7c-bda1-cc5668bce1cb)
-  )
   (text "Place 100nF capacitors\nas close to IC as possible" (at 198.12 24.13 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid aeee1722-4c89-48e0-ba2c-1e6ba99b96e5)
@@ -1245,11 +1384,11 @@
     (uuid e64f9b84-5763-4d34-83fc-a384489486bc)
   )
   (text "Thermistor should be\nfixed on body of battery\nwith Kapton tape (or similar)"
-    (at 210.82 152.4 0)
+    (at 204.47 156.21 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e4b75cf9-780b-4de9-9fef-76fa77f2e790)
   )
-  (text "33uF should be\ntantal capacitors" (at 261.62 30.48 0)
+  (text "33uF should be\ntantal capacitors" (at 256.54 30.48 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1c3b66ea-be4b-4e0c-aa9a-329674010a44)
   )
@@ -1274,8 +1413,8 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d831953d-c5ec-423b-899d-8639836a19b7)
   )
-  (label "VBUS" (at 142.24 57.15 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+  (label "VBUS" (at 128.27 57.15 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 351a610b-1e5d-488b-a086-0a51376c146e)
   )
   (label "SYS" (at 160.02 92.71 0)
@@ -1323,23 +1462,23 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7102b8d6-01a0-4b6e-8160-a826dff3c5fa)
   )
-  (hierarchical_label "SOLAR_IN" (shape input) (at 77.47 46.99 180)
+  (hierarchical_label "SOLAR_IN" (shape input) (at 72.39 46.99 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 49ceb7bf-bd05-4e76-8d18-2b20b38f4325)
   )
-  (hierarchical_label "USB_IN" (shape input) (at 77.47 66.04 180)
+  (hierarchical_label "USB_IN" (shape input) (at 72.39 66.04 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 978a1fbb-856e-46b6-ba31-e0e474f02a76)
   )
-  (hierarchical_label "SDA" (shape input) (at 107.95 128.27 180)
+  (hierarchical_label "SDA" (shape input) (at 121.92 128.27 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ad604398-cbfd-41ca-b26b-985d26db8654)
   )
-  (hierarchical_label "SCL" (shape input) (at 107.95 132.08 180)
+  (hierarchical_label "SCL" (shape input) (at 121.92 132.08 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4c9bc114-67ba-41a4-8068-eda25765203e)
   )
-  (hierarchical_label "~{INT}" (shape input) (at 107.95 135.89 180)
+  (hierarchical_label "~{INT}" (shape input) (at 121.92 135.89 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0e12a485-55cc-457a-932f-90c319766312)
   )
@@ -1360,10 +1499,131 @@
     (uuid e28cb6ca-2adf-4a0a-b530-23fcb9c69296)
   )
 
+  (symbol (lib_id "power:PWR_FLAG") (at 134.62 57.15 0)
+    (in_bom yes) (on_board yes)
+    (uuid 9c326619-c343-4766-a7f6-3ed35882c088)
+    (property "Reference" "#FLG0104" (id 0) (at 134.62 55.245 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 134.62 53.5454 0))
+    (property "Footprint" "" (id 2) (at 134.62 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 134.62 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bc0f566c-e23f-4db1-a2af-7f41e1cd605e))
+  )
+
+  (symbol (lib_id "Device:Jumper_NO_Small") (at 121.92 139.7 0)
+    (in_bom yes) (on_board yes)
+    (uuid 302b0a3a-6663-4fcb-a993-6386a8185da7)
+    (property "Reference" "JP3" (id 0) (at 119.38 141.7024 0))
+    (property "Value" "QON" (id 1) (at 124.46 141.9375 0))
+    (property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" (id 2) (at 121.92 139.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 121.92 139.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 271befe5-a102-4260-ac02-6c50fbb253df))
+    (pin "2" (uuid 50f5f5b2-10c1-42d9-8a9e-8d018d34d124))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 74.7583 46.99 0)
+    (in_bom yes) (on_board yes)
+    (uuid f3870e23-70be-4fb1-962f-2439754d8e15)
+    (property "Reference" "TP15" (id 0) (at 69.8054 40.43 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "SOLAR_IN" (id 1) (at 64.7254 43.2051 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 79.8383 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 79.8383 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 41c67740-b68e-4a7b-82b9-b75e46bb08ba))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 74.93 66.04 0)
+    (in_bom yes) (on_board yes)
+    (uuid 7ad36403-826c-4150-8554-23cd9d4f16a4)
+    (property "Reference" "TP16" (id 0) (at 69.9771 59.48 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "USB_IN" (id 1) (at 66.1671 62.2551 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 80.01 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 80.01 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a0da3df8-6b74-40f1-8fbf-e7cfb2aee8e6))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 142.24 57.15 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f436ab07-8fe2-4a87-b53b-53d0c568f606)
+    (property "Reference" "TP17" (id 0) (at 143.6371 54.4 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "VBUS" (id 1) (at 143.6371 57.1751 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 147.32 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 147.32 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 54c9c279-d045-4306-b49e-d59a34d2bb74))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 193.04 138.43 0)
+    (in_bom yes) (on_board yes)
+    (uuid 7a7b078a-add2-434d-a399-aa6f1d9d2a98)
+    (property "Reference" "TP18" (id 0) (at 194.4371 133.14 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "BAT_TEMP" (id 1) (at 194.4371 135.9151 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 198.12 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 198.12 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a7778e5d-20dd-438b-918b-3ffa0ebeca82))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 276.86 31.75 0)
+    (in_bom yes) (on_board yes)
+    (uuid 61684f65-1611-4e59-becc-e1f3a82d243a)
+    (property "Reference" "TP19" (id 0) (at 278.2571 26.46 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "PMID" (id 1) (at 278.2571 29.2351 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 281.94 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 281.94 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ebc0cc4f-4e09-4320-9302-2419204f8d2b))
+  )
+
   (symbol (lib_id "power:GND") (at 27.94 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 738f3116-98ad-4f96-9451-d5346c237321)
-    (property "Reference" "#PWR?" (id 0) (at 27.94 132.08 0)
+    (property "Reference" "#PWR0119" (id 0) (at 27.94 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 27.94 130.2926 0)
@@ -1381,7 +1641,7 @@
   (symbol (lib_id "power:GND") (at 36.83 125.73 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9f7ea414-8984-4f4e-aab7-aaa6b3e1d3eb)
-    (property "Reference" "#PWR?" (id 0) (at 36.83 132.08 0)
+    (property "Reference" "#PWR0120" (id 0) (at 36.83 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 36.83 130.2926 0)
@@ -1399,7 +1659,7 @@
   (symbol (lib_id "power:GND") (at 85.09 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c2b1bdea-bcf9-4445-9e85-c99dfe510a5c)
-    (property "Reference" "#PWR072" (id 0) (at 85.09 63.5 0)
+    (property "Reference" "#PWR0121" (id 0) (at 85.09 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 85.09 61.7126 0)
@@ -1417,7 +1677,7 @@
   (symbol (lib_id "power:GND") (at 85.09 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c640c6ef-15d4-451b-ba26-c8442b126f83)
-    (property "Reference" "#PWR073" (id 0) (at 85.09 82.55 0)
+    (property "Reference" "#PWR0122" (id 0) (at 85.09 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 85.09 80.7626 0)
@@ -1432,10 +1692,46 @@
     (pin "1" (uuid d5fbe29f-64b9-43bb-8ceb-602c4eb494ca))
   )
 
+  (symbol (lib_id "power:GND") (at 113.03 127 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5bb08088-e249-4ed5-9c4d-e3a5ceb19927)
+    (property "Reference" "#PWR0123" (id 0) (at 113.03 133.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 113.03 131.5626 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 113.03 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 113.03 127 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 97532483-ff3e-445a-a5ba-ccb65cad4a2f))
+  )
+
+  (symbol (lib_id "power:GND") (at 113.03 142.24 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e276e156-489c-4071-93c2-3eeb051ff642)
+    (property "Reference" "#PWR0124" (id 0) (at 113.03 148.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 113.03 146.8026 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 113.03 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 113.03 142.24 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9118a8ec-265a-43ad-8f4e-d40ae5647529))
+  )
+
   (symbol (lib_id "power:GND") (at 142.24 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a1831df2-3281-4acc-9c2f-294c23b7e14f)
-    (property "Reference" "#PWR074" (id 0) (at 142.24 156.21 0)
+    (property "Reference" "#PWR0125" (id 0) (at 142.24 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 142.24 154.4226 0)
@@ -1453,7 +1749,7 @@
   (symbol (lib_id "power:GND") (at 162.56 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7132610b-dbcf-414d-b903-24d0015c36b7)
-    (property "Reference" "#PWR075" (id 0) (at 162.56 156.21 0)
+    (property "Reference" "#PWR0126" (id 0) (at 162.56 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 162.56 154.4226 0)
@@ -1471,7 +1767,7 @@
   (symbol (lib_id "power:GND") (at 171.45 110.49 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c8fb53a1-7fdb-4f48-ad81-f2721acd5bf8)
-    (property "Reference" "#PWR076" (id 0) (at 171.45 116.84 0)
+    (property "Reference" "#PWR0127" (id 0) (at 171.45 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 171.45 115.0526 0)
@@ -1489,7 +1785,7 @@
   (symbol (lib_id "power:GND") (at 172.72 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8653099a-f82b-47c6-b13c-9ec60a3811e3)
-    (property "Reference" "#PWR077" (id 0) (at 172.72 156.21 0)
+    (property "Reference" "#PWR0128" (id 0) (at 172.72 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 172.72 154.4226 0)
@@ -1507,7 +1803,7 @@
   (symbol (lib_id "power:GND") (at 184.15 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3c54bba4-5c89-4abc-9657-12b2f1715150)
-    (property "Reference" "#PWR078" (id 0) (at 184.15 156.21 0)
+    (property "Reference" "#PWR0129" (id 0) (at 184.15 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 184.15 154.4226 0)
@@ -1525,7 +1821,7 @@
   (symbol (lib_id "power:GND") (at 194.31 124.46 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 247451fa-910c-49f6-b7da-2aadc7b68c9b)
-    (property "Reference" "#PWR079" (id 0) (at 194.31 130.81 0)
+    (property "Reference" "#PWR0130" (id 0) (at 194.31 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 194.31 129.0226 0)
@@ -1543,7 +1839,7 @@
   (symbol (lib_id "power:GND") (at 198.12 149.86 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 464f8168-21c6-445f-bd5c-7757b322d9c8)
-    (property "Reference" "#PWR080" (id 0) (at 198.12 156.21 0)
+    (property "Reference" "#PWR0131" (id 0) (at 198.12 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 198.12 154.4226 0)
@@ -1561,7 +1857,7 @@
   (symbol (lib_id "power:GND") (at 232.41 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 828ad18c-11ca-417b-a62c-c54932bf800e)
-    (property "Reference" "#PWR081" (id 0) (at 232.41 31.75 0)
+    (property "Reference" "#PWR0132" (id 0) (at 232.41 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 29.9626 0)
@@ -1579,7 +1875,7 @@
   (symbol (lib_id "power:GND") (at 232.41 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 707419b7-8481-4073-8c56-c02576861d95)
-    (property "Reference" "#PWR082" (id 0) (at 232.41 45.72 0)
+    (property "Reference" "#PWR0133" (id 0) (at 232.41 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 43.9326 0)
@@ -1597,7 +1893,7 @@
   (symbol (lib_id "power:GND") (at 232.41 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b20aed0f-4c6d-4114-b874-8f48a80bd5f9)
-    (property "Reference" "#PWR083" (id 0) (at 232.41 59.69 0)
+    (property "Reference" "#PWR0134" (id 0) (at 232.41 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 57.9026 0)
@@ -1615,7 +1911,7 @@
   (symbol (lib_id "power:GND") (at 232.41 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c7722768-7dad-4038-9b23-0b95eece9c19)
-    (property "Reference" "#PWR084" (id 0) (at 232.41 73.66 0)
+    (property "Reference" "#PWR0135" (id 0) (at 232.41 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 71.8726 0)
@@ -1633,7 +1929,7 @@
   (symbol (lib_id "power:GND") (at 232.41 81.28 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 090afa8d-a4b0-4688-aa57-e0992ef93c63)
-    (property "Reference" "#PWR085" (id 0) (at 232.41 87.63 0)
+    (property "Reference" "#PWR0136" (id 0) (at 232.41 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 232.41 85.8426 0)
@@ -1651,7 +1947,7 @@
   (symbol (lib_id "power:GND") (at 241.3 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7111b9e1-c254-4e58-9894-81debb0aadae)
-    (property "Reference" "#PWR086" (id 0) (at 241.3 31.75 0)
+    (property "Reference" "#PWR0137" (id 0) (at 241.3 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 29.9626 0)
@@ -1669,7 +1965,7 @@
   (symbol (lib_id "power:GND") (at 241.3 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a22c66a1-4028-43f1-9e0d-b9ec07ad7526)
-    (property "Reference" "#PWR087" (id 0) (at 241.3 45.72 0)
+    (property "Reference" "#PWR0138" (id 0) (at 241.3 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 43.9326 0)
@@ -1687,7 +1983,7 @@
   (symbol (lib_id "power:GND") (at 241.3 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ea304d1c-c60d-43ea-b51e-3dc99a5f5529)
-    (property "Reference" "#PWR088" (id 0) (at 241.3 59.69 0)
+    (property "Reference" "#PWR0139" (id 0) (at 241.3 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 57.9026 0)
@@ -1705,7 +2001,7 @@
   (symbol (lib_id "power:GND") (at 241.3 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c66fc375-a821-4cfa-aca4-512ba9a7312f)
-    (property "Reference" "#PWR089" (id 0) (at 241.3 73.66 0)
+    (property "Reference" "#PWR0140" (id 0) (at 241.3 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 241.3 71.8726 0)
@@ -1723,7 +2019,7 @@
   (symbol (lib_id "power:GND") (at 250.19 25.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6d37f012-d963-47f9-b4aa-198122a4c2f4)
-    (property "Reference" "#PWR090" (id 0) (at 250.19 31.75 0)
+    (property "Reference" "#PWR0141" (id 0) (at 250.19 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 29.9626 0)
@@ -1741,7 +2037,7 @@
   (symbol (lib_id "power:GND") (at 250.19 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 21cfd915-a5bc-41e0-bbc6-e0c0a9311aa1)
-    (property "Reference" "#PWR091" (id 0) (at 250.19 45.72 0)
+    (property "Reference" "#PWR0142" (id 0) (at 250.19 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 43.9326 0)
@@ -1759,7 +2055,7 @@
   (symbol (lib_id "power:GND") (at 250.19 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 398b6b0a-eb96-4c7b-9334-ea689b98fcf0)
-    (property "Reference" "#PWR092" (id 0) (at 250.19 59.69 0)
+    (property "Reference" "#PWR0143" (id 0) (at 250.19 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 57.9026 0)
@@ -1777,7 +2073,7 @@
   (symbol (lib_id "power:GND") (at 250.19 67.31 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0f3e7457-9ac3-4d4f-90cd-28211af3faed)
-    (property "Reference" "#PWR093" (id 0) (at 250.19 73.66 0)
+    (property "Reference" "#PWR0144" (id 0) (at 250.19 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 250.19 71.8726 0)
@@ -1795,7 +2091,7 @@
   (symbol (lib_id "power:GND") (at 259.08 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b42ba4dc-3800-4425-a866-c110d94ada2f)
-    (property "Reference" "#PWR094" (id 0) (at 259.08 45.72 0)
+    (property "Reference" "#PWR0145" (id 0) (at 259.08 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 259.08 43.9326 0)
@@ -1813,7 +2109,7 @@
   (symbol (lib_id "power:GND") (at 259.08 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f3bec9fa-ce26-4484-9223-61ef902325da)
-    (property "Reference" "#PWR095" (id 0) (at 259.08 59.69 0)
+    (property "Reference" "#PWR0146" (id 0) (at 259.08 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 259.08 57.9026 0)
@@ -1831,7 +2127,7 @@
   (symbol (lib_id "power:GND") (at 267.97 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2ab523d5-3257-4b77-8cc7-8d4e4ae96fa9)
-    (property "Reference" "#PWR096" (id 0) (at 267.97 45.72 0)
+    (property "Reference" "#PWR0147" (id 0) (at 267.97 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 267.97 43.9326 0)
@@ -1849,7 +2145,7 @@
   (symbol (lib_id "power:GND") (at 267.97 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid addf0110-7d89-4734-821e-2aa37e221d54)
-    (property "Reference" "#PWR097" (id 0) (at 267.97 59.69 0)
+    (property "Reference" "#PWR0148" (id 0) (at 267.97 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 267.97 57.9026 0)
@@ -1867,7 +2163,7 @@
   (symbol (lib_id "power:GND") (at 276.86 39.37 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2823f81-df1d-4a47-9df9-d3656c9dd195)
-    (property "Reference" "#PWR098" (id 0) (at 276.86 45.72 0)
+    (property "Reference" "#PWR0149" (id 0) (at 276.86 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 276.86 43.9326 0)
@@ -1885,7 +2181,7 @@
   (symbol (lib_id "power:GND") (at 276.86 53.34 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5aed38f5-eb70-425e-b42b-6234283ab34a)
-    (property "Reference" "#PWR099" (id 0) (at 276.86 59.69 0)
+    (property "Reference" "#PWR0150" (id 0) (at 276.86 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 276.86 57.9026 0)
@@ -1937,7 +2233,7 @@
   (symbol (lib_id "Device:R") (at 27.94 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e94a69a1-0efb-4192-86ff-8fae8a732a82)
-    (property "Reference" "R?" (id 0) (at 29.7181 110.8515 0)
+    (property "Reference" "R40" (id 0) (at 29.7181 110.8515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 29.7181 113.6266 0)
@@ -1956,7 +2252,7 @@
   (symbol (lib_id "Device:R") (at 27.94 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8dcffa42-abb0-4b96-a9e1-3a4ee9a1b1e5)
-    (property "Reference" "R?" (id 0) (at 29.7181 121.0115 0)
+    (property "Reference" "R41" (id 0) (at 29.7181 121.0115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "6.8k" (id 1) (at 29.7181 123.7866 0)
@@ -1975,7 +2271,7 @@
   (symbol (lib_id "Device:R") (at 36.83 111.76 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3d428954-cf73-4b86-8791-7ebdb978d293)
-    (property "Reference" "R?" (id 0) (at 38.6081 110.8515 0)
+    (property "Reference" "R42" (id 0) (at 38.6081 110.8515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10k" (id 1) (at 38.6081 113.6266 0)
@@ -1994,7 +2290,7 @@
   (symbol (lib_id "Device:R") (at 36.83 121.92 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 093ea0d8-447c-4717-9b2d-5680672cc539)
-    (property "Reference" "R?" (id 0) (at 38.6081 121.0115 0)
+    (property "Reference" "R43" (id 0) (at 38.6081 121.0115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "12.7k" (id 1) (at 38.6081 123.7866 0)
@@ -2013,7 +2309,7 @@
   (symbol (lib_id "Device:R") (at 118.11 76.2 90)
     (in_bom yes) (on_board yes)
     (uuid c688cde1-64a1-4d3d-a308-8146ecc7110e)
-    (property "Reference" "R21" (id 0) (at 115.57 73.7574 90))
+    (property "Reference" "R44" (id 0) (at 115.57 73.7574 90))
     (property "Value" "280R" (id 1) (at 120.65 73.9925 90))
     (property "Footprint" "" (id 2) (at 118.11 77.978 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2028,7 +2324,7 @@
   (symbol (lib_id "Device:R") (at 118.11 80.01 90)
     (in_bom yes) (on_board yes)
     (uuid 535ee410-d1b4-4bfe-8fb7-e2336dbd7de8)
-    (property "Reference" "R22" (id 0) (at 115.57 82.6474 90))
+    (property "Reference" "R45" (id 0) (at 115.57 82.6474 90))
     (property "Value" "280R" (id 1) (at 120.65 82.8825 90))
     (property "Footprint" "" (id 2) (at 118.11 81.788 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2043,7 +2339,7 @@
   (symbol (lib_id "Device:R") (at 162.56 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a43c3f0f-1118-486d-8166-db9bca04c0f8)
-    (property "Reference" "R23" (id 0) (at 164.3381 142.6015 0)
+    (property "Reference" "R46" (id 0) (at 164.3381 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7k" (id 1) (at 164.3381 145.3766 0)
@@ -2062,10 +2358,10 @@
   (symbol (lib_id "Device:R") (at 172.72 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d5e402f1-932e-420f-9774-0822b30b2f0e)
-    (property "Reference" "R24" (id 0) (at 174.4981 132.4415 0)
+    (property "Reference" "R47" (id 0) (at 174.4981 132.4415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "127k" (id 1) (at 174.4981 135.2166 0)
+    (property "Value" "100k" (id 1) (at 174.4981 135.2166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 170.942 133.35 90)
@@ -2081,10 +2377,10 @@
   (symbol (lib_id "Device:R") (at 172.72 143.51 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ecc4fa6d-c4c4-44d4-b891-141906df0a0c)
-    (property "Reference" "R25" (id 0) (at 174.4981 142.6015 0)
+    (property "Reference" "R48" (id 0) (at 174.4981 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100k" (id 1) (at 174.4981 145.3766 0)
+    (property "Value" "57k" (id 1) (at 174.4981 145.3766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 170.942 143.51 90)
@@ -2100,7 +2396,7 @@
   (symbol (lib_id "Device:R") (at 176.53 73.66 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f4d6f4ef-0256-473f-8b46-ec4d4f232e95)
-    (property "Reference" "R26" (id 0) (at 176.53 68.6774 90))
+    (property "Reference" "R49" (id 0) (at 176.53 68.6774 90))
     (property "Value" "2.2k" (id 1) (at 176.53 71.4525 90))
     (property "Footprint" "" (id 2) (at 176.53 75.438 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2115,7 +2411,7 @@
   (symbol (lib_id "Device:R") (at 177.8 115.57 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d45b4f05-d8e9-4eba-9eb3-ce065b686501)
-    (property "Reference" "R27" (id 0) (at 177.8 110.5874 90))
+    (property "Reference" "R50" (id 0) (at 177.8 110.5874 90))
     (property "Value" "100R" (id 1) (at 177.8 113.3625 90))
     (property "Footprint" "" (id 2) (at 177.8 117.348 90)
       (effects (font (size 1.27 1.27)) hide)
@@ -2130,10 +2426,10 @@
   (symbol (lib_id "Device:R") (at 184.15 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 19eea21e-498a-433a-8362-31b6cf803066)
-    (property "Reference" "R28" (id 0) (at 185.9281 132.4415 0)
+    (property "Reference" "R51" (id 0) (at 185.9281 132.4415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "5.24k" (id 1) (at 185.9281 135.2166 0)
+    (property "Value" "5.02k" (id 1) (at 185.9281 135.2166 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 182.372 133.35 90)
@@ -2149,10 +2445,10 @@
   (symbol (lib_id "Device:R") (at 184.15 143.51 0)
     (in_bom yes) (on_board yes)
     (uuid 93ae52de-82a7-47e0-b9e7-c5135decc743)
-    (property "Reference" "R29" (id 0) (at 185.9281 142.6015 0)
+    (property "Reference" "R52" (id 0) (at 185.9281 142.6015 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "30.31k" (id 1) (at 185.9281 145.3766 0)
+    (property "Value" "26.07k" (id 1) (at 185.9281 145.3766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 182.372 143.51 90)
@@ -2183,7 +2479,7 @@
   (symbol (lib_id "Device:C") (at 85.09 53.34 0)
     (in_bom yes) (on_board yes)
     (uuid 7a02180a-8e86-455c-b20a-dac1a53d9390)
-    (property "Reference" "C30" (id 0) (at 88.0111 52.4315 0)
+    (property "Reference" "C50" (id 0) (at 88.0111 52.4315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 86.7411 56.4766 0)
@@ -2202,7 +2498,7 @@
   (symbol (lib_id "Device:C") (at 85.09 72.39 0)
     (in_bom yes) (on_board yes)
     (uuid 3fe38c74-c4d8-4449-acb3-7ccb7e8784b3)
-    (property "Reference" "C31" (id 0) (at 88.0111 71.4815 0)
+    (property "Reference" "C51" (id 0) (at 88.0111 71.4815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 86.7411 75.5266 0)
@@ -2221,7 +2517,7 @@
   (symbol (lib_id "Device:C") (at 111.76 101.6 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 995e37af-02ee-439b-a170-d5d24974d185)
-    (property "Reference" "C32" (id 0) (at 114.6811 100.6915 0)
+    (property "Reference" "C52" (id 0) (at 114.6811 100.6915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "47nF" (id 1) (at 114.6811 103.4666 0)
@@ -2240,7 +2536,7 @@
   (symbol (lib_id "Device:C") (at 111.76 116.84 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3c513c33-a524-419b-a1b9-2b0242ddcce5)
-    (property "Reference" "C33" (id 0) (at 114.6811 115.9315 0)
+    (property "Reference" "C53" (id 0) (at 114.6811 115.9315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "47nF" (id 1) (at 114.6811 118.7066 0)
@@ -2259,7 +2555,7 @@
   (symbol (lib_id "Device:C") (at 166.37 109.22 90)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid edfca363-e948-4fa4-9399-9601cea1a08c)
-    (property "Reference" "C34" (id 0) (at 166.37 103.0944 90))
+    (property "Reference" "C54" (id 0) (at 166.37 103.0944 90))
     (property "Value" "1nF" (id 1) (at 166.37 105.8695 90))
     (property "Footprint" "" (id 2) (at 170.18 108.2548 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -2274,7 +2570,7 @@
   (symbol (lib_id "Device:C") (at 232.41 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 8625cca4-215d-4b94-b4af-4c9b8e0f92d0)
-    (property "Reference" "C35" (id 0) (at 235.3311 20.6815 0)
+    (property "Reference" "C55" (id 0) (at 235.3311 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 24.7266 0)
@@ -2293,7 +2589,7 @@
   (symbol (lib_id "Device:C") (at 232.41 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid becaa33a-fb73-43a0-8f59-007f60952743)
-    (property "Reference" "C36" (id 0) (at 235.3311 34.6515 0)
+    (property "Reference" "C56" (id 0) (at 235.3311 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 38.6966 0)
@@ -2312,7 +2608,7 @@
   (symbol (lib_id "Device:C") (at 232.41 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 2419ac2b-38f2-48a3-a3fb-d064a81b0a9f)
-    (property "Reference" "C37" (id 0) (at 235.3311 48.6215 0)
+    (property "Reference" "C57" (id 0) (at 235.3311 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 52.6666 0)
@@ -2331,7 +2627,7 @@
   (symbol (lib_id "Device:C") (at 232.41 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid b7a2c962-35f9-47a1-84fd-7eac94185fae)
-    (property "Reference" "C38" (id 0) (at 235.3311 62.5915 0)
+    (property "Reference" "C58" (id 0) (at 235.3311 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 234.0611 66.6366 0)
@@ -2350,7 +2646,7 @@
   (symbol (lib_id "Device:C") (at 232.41 77.47 0)
     (in_bom yes) (on_board yes)
     (uuid 8c38b1c0-fbad-468f-99e4-01985190b173)
-    (property "Reference" "C39" (id 0) (at 235.3311 76.5615 0)
+    (property "Reference" "C59" (id 0) (at 235.3311 76.5615 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "4.7uF" (id 1) (at 234.0611 80.6066 0)
@@ -2369,7 +2665,7 @@
   (symbol (lib_id "Device:C") (at 241.3 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 5953e159-b5a7-4b55-99f2-fda012d0384c)
-    (property "Reference" "C40" (id 0) (at 244.2211 20.6815 0)
+    (property "Reference" "C60" (id 0) (at 244.2211 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 24.7266 0)
@@ -2388,7 +2684,7 @@
   (symbol (lib_id "Device:C") (at 241.3 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 979d7e34-72d9-450b-a07f-f6fa33cf161e)
-    (property "Reference" "C41" (id 0) (at 244.2211 34.6515 0)
+    (property "Reference" "C61" (id 0) (at 244.2211 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 38.6966 0)
@@ -2407,7 +2703,7 @@
   (symbol (lib_id "Device:C") (at 241.3 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid ac59a9a6-1736-41b1-9b08-841456a81725)
-    (property "Reference" "C42" (id 0) (at 244.2211 48.6215 0)
+    (property "Reference" "C62" (id 0) (at 244.2211 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 52.6666 0)
@@ -2426,7 +2722,7 @@
   (symbol (lib_id "Device:C") (at 241.3 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid 5f1b55eb-9c0c-4022-b7a4-23c5358363c9)
-    (property "Reference" "C43" (id 0) (at 244.2211 62.5915 0)
+    (property "Reference" "C63" (id 0) (at 244.2211 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 242.9511 66.6366 0)
@@ -2445,7 +2741,7 @@
   (symbol (lib_id "Device:C") (at 250.19 21.59 0)
     (in_bom yes) (on_board yes)
     (uuid 19689cbf-511d-4423-bdcb-e53a00afaa95)
-    (property "Reference" "C44" (id 0) (at 253.1111 20.6815 0)
+    (property "Reference" "C64" (id 0) (at 253.1111 20.6815 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 24.7266 0)
@@ -2464,7 +2760,7 @@
   (symbol (lib_id "Device:C") (at 250.19 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid f0da81f1-5f92-42d2-b81b-b77ec983a2c2)
-    (property "Reference" "C45" (id 0) (at 253.1111 34.6515 0)
+    (property "Reference" "C65" (id 0) (at 253.1111 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 38.6966 0)
@@ -2483,7 +2779,7 @@
   (symbol (lib_id "Device:C") (at 250.19 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid ba278ad7-c8e4-43da-92fe-e0849cea1ee6)
-    (property "Reference" "C46" (id 0) (at 253.1111 48.6215 0)
+    (property "Reference" "C66" (id 0) (at 253.1111 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 52.6666 0)
@@ -2502,7 +2798,7 @@
   (symbol (lib_id "Device:C") (at 250.19 63.5 0)
     (in_bom yes) (on_board yes)
     (uuid b82d4bb6-bfca-40cb-a30b-52bc6ee23da8)
-    (property "Reference" "C47" (id 0) (at 253.1111 62.5915 0)
+    (property "Reference" "C67" (id 0) (at 253.1111 62.5915 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 251.8411 66.6366 0)
@@ -2521,7 +2817,7 @@
   (symbol (lib_id "Device:C") (at 259.08 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 9155eb60-9132-4e1d-9ae4-d139278681e4)
-    (property "Reference" "C48" (id 0) (at 262.0011 34.6515 0)
+    (property "Reference" "C68" (id 0) (at 262.0011 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 260.7311 38.6966 0)
@@ -2540,7 +2836,7 @@
   (symbol (lib_id "Device:C") (at 259.08 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 3906c072-6efd-4ba5-b04f-a1fc530d3116)
-    (property "Reference" "C49" (id 0) (at 262.0011 48.6215 0)
+    (property "Reference" "C69" (id 0) (at 262.0011 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 260.7311 52.6666 0)
@@ -2559,7 +2855,7 @@
   (symbol (lib_id "Device:C") (at 267.97 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 8d29c794-1929-4550-854c-1e3b715a6949)
-    (property "Reference" "C50" (id 0) (at 270.8911 34.6515 0)
+    (property "Reference" "C70" (id 0) (at 270.8911 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 269.6211 38.6966 0)
@@ -2578,7 +2874,7 @@
   (symbol (lib_id "Device:C") (at 267.97 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid 18ce107d-5e3f-48e2-bbf3-61d4d2156c26)
-    (property "Reference" "C51" (id 0) (at 270.8911 48.6215 0)
+    (property "Reference" "C71" (id 0) (at 270.8911 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 269.6211 52.6666 0)
@@ -2597,7 +2893,7 @@
   (symbol (lib_id "Device:C") (at 276.86 35.56 0)
     (in_bom yes) (on_board yes)
     (uuid 6bc7c2f3-4ec5-4076-b0ce-7f03ca76ffce)
-    (property "Reference" "C52" (id 0) (at 279.7811 34.6515 0)
+    (property "Reference" "C72" (id 0) (at 279.7811 34.6515 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "33uF" (id 1) (at 278.5111 38.6966 0)
@@ -2616,7 +2912,7 @@
   (symbol (lib_id "Device:C") (at 276.86 49.53 0)
     (in_bom yes) (on_board yes)
     (uuid f0825abb-62c4-4d28-8ebc-40cab9db266b)
-    (property "Reference" "C53" (id 0) (at 279.7811 48.6215 0)
+    (property "Reference" "C73" (id 0) (at 279.7811 48.6215 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "10uF" (id 1) (at 278.5111 52.6666 0)
@@ -2635,10 +2931,10 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 198.12 142.24 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d8aa6b3c-69e3-4d30-87a8-0c78bb6f19db)
-    (property "Reference" "J16" (id 0) (at 200.1521 144.6335 0)
+    (property "Reference" "J19" (id 0) (at 200.1521 144.6335 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAT_TERM" (id 1) (at 200.1521 147.4086 0)
+    (property "Value" "BAT_TEMP_MCU" (id 1) (at 200.1521 147.4086 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Footprint" "" (id 2) (at 198.12 142.24 0)
@@ -2709,10 +3005,10 @@
     (property "Datasheet" "https://www.tme.eu/Document/fa3f2aaa37eaef20cf8bb0832a66190d/YJQ3400A.pdf" (id 3) (at 93.98 67.31 0)
       (effects (font (size 1 1)) (justify left) hide)
     )
-    (pin "D1" (uuid 75b67f2c-a41a-4963-9994-85a759d08fff))
-    (pin "D1" (uuid 75b67f2c-a41a-4963-9994-85a759d08fff))
-    (pin "G1" (uuid 905770d3-f0cf-4e71-aa68-ff3634f7b26c))
-    (pin "S1" (uuid 98b2b963-31db-4894-95b7-73b2537dbf93))
+    (pin "D2" (uuid 8335df93-cd00-4d0e-8753-4f4bd0fa08dd))
+    (pin "D2" (uuid 8335df93-cd00-4d0e-8753-4f4bd0fa08dd))
+    (pin "G2" (uuid f6e7887b-d925-4f6d-93b6-991023240661))
+    (pin "S2" (uuid 07238e46-773e-48ab-a5b1-cc7210181173))
   )
 
   (symbol (lib_id "TCY_transistors:AON7804") (at 113.03 68.58 270) (mirror x)
@@ -2730,16 +3026,16 @@
     (property "Datasheet" "https://www.tme.eu/Document/fa3f2aaa37eaef20cf8bb0832a66190d/YJQ3400A.pdf" (id 3) (at 93.98 86.36 0)
       (effects (font (size 1 1)) (justify left) hide)
     )
-    (pin "D1" (uuid 1d9bbcfe-73d9-4557-95b7-ef0c7eeb7952))
-    (pin "D1" (uuid 1d9bbcfe-73d9-4557-95b7-ef0c7eeb7952))
-    (pin "G1" (uuid cfa96d59-df88-4141-ab25-a1db5790a41d))
-    (pin "S1" (uuid eccfa491-5137-4a76-9ef9-411d77cf908c))
+    (pin "D2" (uuid 850aff04-1b5e-4e29-b48f-1085464a5a94))
+    (pin "D2" (uuid 850aff04-1b5e-4e29-b48f-1085464a5a94))
+    (pin "G2" (uuid 25511dac-cce9-44a3-a2d9-8bcdedb4c3d0))
+    (pin "S2" (uuid d712ad58-171b-4d74-ac4c-eb38e4548d4b))
   )
 
   (symbol (lib_id "TCY_battery_management:BQ25798") (at 142.24 105.41 0)
     (in_bom yes) (on_board yes)
     (uuid 78318f1b-7631-47e2-afea-cbb78b37ad53)
-    (property "Reference" "U10" (id 0) (at 149.86 63.0894 0))
+    (property "Reference" "U15" (id 0) (at 149.86 63.0894 0))
     (property "Value" "BQ25798" (id 1) (at 149.86 65.8645 0))
     (property "Footprint" "TCY_IC:VQFN-HR_29(34)_4x4mm_P0.4mm" (id 2) (at 142.24 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
diff --git a/modules/EPS/Battery_pack.kicad_sch b/modules/EPS/Battery_pack.kicad_sch
index 97a188a..194c6b5 100644
--- a/modules/EPS/Battery_pack.kicad_sch
+++ b/modules/EPS/Battery_pack.kicad_sch
@@ -322,7 +322,7 @@
       (property "Value" "SiSA96DDN" (id 1) (at 7.62 -1.27 0)
         (effects (font (size 1 1)) (justify left))
       )
-      (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_3x3mm_P0.65mm_EP1.55x2.4mm" (id 2) (at -20.32 -16.51 0)
+      (property "Footprint" "Package_SO:Vishay_PowerPAK_1212-8_Single" (id 2) (at -20.32 -16.51 0)
         (effects (font (size 1 1) italic) (justify left) hide)
       )
       (property "Datasheet" "https://www.vishay.com/docs/75285/sisa96dn.pdf" (id 3) (at -17.78 -19.05 0)
@@ -645,13 +645,13 @@
   (symbol (lib_id "Connector:TestPoint") (at 203.2 85.09 0)
     (in_bom yes) (on_board yes)
     (uuid 99e44a44-a22b-450d-8b6b-53360d5399d2)
-    (property "Reference" "TP12" (id 0) (at 202.0571 75.99 0)
+    (property "Reference" "TP30" (id 0) (at 202.0571 75.99 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "BAT" (id 1) (at 202.0571 78.7651 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 208.28 85.09 0)
+    (property "Footprint" "TCY_connectors:TestPoint_Pad_D0.5mm" (id 2) (at 208.28 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 208.28 85.09 0)
@@ -663,7 +663,7 @@
   (symbol (lib_id "Device:R") (at 116.84 82.55 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 54ac00c5-8085-4a3c-885d-c574139f6a01)
-    (property "Reference" "R43" (id 0) (at 118.6181 81.6415 0)
+    (property "Reference" "R81" (id 0) (at 118.6181 81.6415 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "330R" (id 1) (at 118.6181 84.4166 0)
@@ -682,7 +682,7 @@
   (symbol (lib_id "Device:R") (at 123.19 104.14 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 02f0341e-54b7-46d0-84c1-b57ae6b2f234)
-    (property "Reference" "R44" (id 0) (at 124.9681 103.2315 0)
+    (property "Reference" "R82" (id 0) (at 124.9681 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "2.2k" (id 1) (at 124.9681 106.0066 0)
@@ -701,7 +701,7 @@
   (symbol (lib_id "Device:C") (at 116.84 104.14 0)
     (in_bom yes) (on_board yes)
     (uuid 1b8352a6-950c-40a2-8cc5-44e898ebc8b3)
-    (property "Reference" "C58" (id 0) (at 109.6011 103.2315 0)
+    (property "Reference" "C94" (id 0) (at 109.6011 103.2315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "100nF" (id 1) (at 108.3311 106.0066 0)
@@ -720,7 +720,7 @@
   (symbol (lib_id "Device:Battery_Cell") (at 203.2 97.79 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 187169a6-ccff-4f29-8db9-3e89fd7b7827)
-    (property "Reference" "U24" (id 0) (at 206.1211 95.6115 0)
+    (property "Reference" "U32" (id 0) (at 206.1211 95.6115 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
     (property "Value" "Battery_holder_21700" (id 1) (at 206.1211 98.3866 0)
@@ -745,7 +745,7 @@
     (property "Value" "SiSA96DDN" (id 1) (at 146.05 119.0556 90)
       (effects (font (size 1 1)))
     )
-    (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_3x3mm_P0.65mm_EP1.55x2.4mm" (id 2) (at 129.54 90.17 0)
+    (property "Footprint" "Package_SO:Vishay_PowerPAK_1212-8_Single" (id 2) (at 129.54 90.17 0)
       (effects (font (size 1 1) italic) (justify left) hide)
     )
     (property "Datasheet" "https://www.vishay.com/docs/75285/sisa96dn.pdf" (id 3) (at 127 92.71 0)
@@ -771,7 +771,7 @@
     (property "Value" "SiSA96DDN" (id 1) (at 156.21 119.0556 90)
       (effects (font (size 1 1)))
     )
-    (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_3x3mm_P0.65mm_EP1.55x2.4mm" (id 2) (at 172.72 90.17 0)
+    (property "Footprint" "Package_SO:Vishay_PowerPAK_1212-8_Single" (id 2) (at 172.72 90.17 0)
       (effects (font (size 1 1) italic) (justify left) hide)
     )
     (property "Datasheet" "https://www.vishay.com/docs/75285/sisa96dn.pdf" (id 3) (at 175.26 92.71 0)
@@ -791,7 +791,7 @@
   (symbol (lib_id "Battery_Management:BQ297xy") (at 133.35 91.44 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 018b95b0-edac-4665-8dbf-3eaf6a917f38)
-    (property "Reference" "U22" (id 0) (at 133.35 82.3934 0))
+    (property "Reference" "U30" (id 0) (at 133.35 82.3934 0))
     (property "Value" "BQ29716" (id 1) (at 133.35 85.1685 0))
     (property "Footprint" "Package_SON:WSON-6_1.5x1.5mm_P0.5mm" (id 2) (at 133.35 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -810,7 +810,7 @@
   (symbol (lib_id "TCY_battery_management:MAX17048") (at 184.15 99.06 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 36130603-28fd-41cd-af25-6f9f1987af9c)
-    (property "Reference" "U23" (id 0) (at 184.15 115.4336 0))
+    (property "Reference" "U31" (id 0) (at 184.15 115.4336 0))
     (property "Value" "MAX17048" (id 1) (at 184.15 118.2087 0))
     (property "Footprint" "Package_DFN_QFN:DFN-8-1EP_2x2mm_P0.5mm_EP1.05x1.75mm" (id 2) (at 184.15 120.65 0)
       (effects (font (size 1.27 1.27)) hide)