diff --git a/board/board_right.kicad_pcb b/board/board_right.kicad_pcb
index 66adf5c..49ac9fe 100644
--- a/board/board_right.kicad_pcb
+++ b/board/board_right.kicad_pcb
@@ -510,135 +510,6 @@
 		)
 		(embedded_fonts no)
 	)
-	(footprint "phiboard:swd_pad"
-		(layer "F.Cu")
-		(uuid "09acd8e0-4d2a-4466-bbdd-7f5c011450cb")
-		(at 58.54 71.23)
-		(property "Reference" "J6"
-			(at 0 -3 0)
-			(unlocked yes)
-			(layer "F.SilkS")
-			(hide yes)
-			(uuid "44328b77-5426-47f6-a8a2-e623399fa9b0")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.1)
-				)
-			)
-		)
-		(property "Value" "Conn_01x06"
-			(at 0 3 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "4369656c-9ed0-4e60-a8e4-1f527fd977fc")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "4739df29-ab99-4ec8-a259-393294202ee6")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 0 0 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(hide yes)
-			(uuid "d663b8c5-cafd-4e8d-b46d-24b5102a6389")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(property ki_fp_filters "Connector*:*_1x??_*")
-		(path "/028c853a-37cc-4ba0-90fa-e323c33e0c70/9b80810a-94b4-4a71-896f-bf41bfe8cb96")
-		(sheetname "/swd/")
-		(sheetfile "swd.kicad_sch")
-		(attr smd exclude_from_bom)
-		(fp_text user "${REFERENCE}"
-			(at 0 3.2 0)
-			(unlocked yes)
-			(layer "F.Fab")
-			(uuid "56e8a6f5-b816-4148-b5c6-6f543cadeaea")
-			(effects
-				(font
-					(size 1 1)
-					(thickness 0.15)
-				)
-			)
-		)
-		(pad "1" smd rect
-			(at -2.54 -1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 71 "unconnected-(J6-Pin_1-Pad1)")
-			(pinfunction "Pin_1")
-			(pintype "passive+no_connect")
-			(uuid "37c2c7cc-4e90-40d5-a307-8c3a59052cac")
-		)
-		(pad "2" smd circle
-			(at -2.54 1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 20 "+3V3")
-			(pinfunction "Pin_2")
-			(pintype "passive")
-			(uuid "13545911-8bb3-4812-b2ac-607cc0c093ed")
-		)
-		(pad "3" smd circle
-			(at 0 -1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 17 "swd_data")
-			(pinfunction "Pin_3")
-			(pintype "passive")
-			(uuid "aac3bc94-95b1-4b5b-99c7-489c7a744fad")
-		)
-		(pad "4" smd circle
-			(at 0 1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 11 "swd_clk")
-			(pinfunction "Pin_4")
-			(pintype "passive")
-			(uuid "743b0a87-baa6-4071-bdde-3bf5bfca21be")
-		)
-		(pad "5" smd circle
-			(at 2.54 -1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 21 "nreset")
-			(pinfunction "Pin_5")
-			(pintype "passive")
-			(uuid "1f90effc-5ff2-4a3e-8566-8d65ecf583ef")
-		)
-		(pad "6" smd circle
-			(at 2.54 1.27)
-			(size 2 2)
-			(layers "F.Cu" "F.Mask" "F.Paste")
-			(net 19 "GND")
-			(pinfunction "Pin_6")
-			(pintype "passive")
-			(uuid "b39a3869-ab0a-4b1d-939e-4a24d09e638b")
-		)
-		(embedded_fonts no)
-	)
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "18fcfb53-0ec0-4fe9-a0ad-035a42a53095")
@@ -850,7 +721,7 @@
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "1f0a33ab-7261-4b75-9b34-f4e003b7c792")
-		(at 64.25 62.95 180)
+		(at 68.795 65.15 180)
 		(descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "resistor")
 		(property "Reference" "R8"
@@ -2425,7 +2296,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "2d9f9d91-a789-4ca5-8a13-8e65481ce4a4")
-		(at 71.5 61.3 180)
+		(at 61.505 63.25 180)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C11"
@@ -2620,14 +2491,14 @@
 	(footprint "LED_SMD:LED_0805_2012Metric"
 		(layer "F.Cu")
 		(uuid "382868fb-a66b-4b10-9b5f-c41cbe032923")
-		(at 66.4 56.8 90)
+		(at 66.25 59 90)
 		(descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
 		(tags "LED")
 		(property "Reference" "D4"
 			(at 0 -1.65 90)
 			(layer "F.SilkS")
 			(hide yes)
-			(uuid "2064fb6e-0374-4534-b6f2-c01b312b23c1")
+			(uuid "28f50c29-bd48-402f-ba33-81eadf475a37")
 			(effects
 				(font
 					(size 1 1)
@@ -2639,7 +2510,7 @@
 			(at 0 1.65 90)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "ac27538d-6aeb-4c71-acbb-4fe09b2d1dac")
+			(uuid "85ffcf80-610b-4b10-8581-bc6355dc3f64")
 			(effects
 				(font
 					(size 1 1)
@@ -2651,7 +2522,7 @@
 			(at 0 0 90)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "378b300e-5798-40d1-87c1-a7a795eb5094")
+			(uuid "47e98294-f4e9-408b-bfcc-61b942290aae")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2663,7 +2534,7 @@
 			(at 0 0 90)
 			(layer "F.Fab")
 			(hide yes)
-			(uuid "df6c8b04-ffb6-43f6-a64e-3a5667bd7819")
+			(uuid "e4075a6e-e9b8-4fff-a0f7-3a959516ac1d")
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2866,6 +2737,259 @@
 			)
 		)
 	)
+	(footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical"
+		(layer "F.Cu")
+		(uuid "3a226f9a-5428-45b0-b278-bd102c733dc4")
+		(at 69.1 70.025)
+		(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+		(tags "Through hole pin header THT 1x02 2.54mm single row")
+		(property "Reference" "J5"
+			(at 0 -2.38 0)
+			(layer "F.SilkS")
+			(uuid "5e402921-7d6f-43fe-8862-e8c5a6b14a6c")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Value" "Conn_01x02"
+			(at 0 4.92 0)
+			(layer "F.Fab")
+			(uuid "7afbc022-929b-43f0-8215-f522732d8b3d")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "cf570598-353b-4fa9-a28d-c2c1f700fb70")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 0 0 0)
+			(layer "F.Fab")
+			(hide yes)
+			(uuid "32300be8-cafa-4a86-b22d-f81ef9142ee2")
+			(effects
+				(font
+					(size 1.27 1.27)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property ki_fp_filters "Connector*:*_1x??_*")
+		(path "/4543c738-0d26-4c0c-91cd-6e4abf059641/4cd7b498-c367-4d16-9f14-226843d6794b")
+		(sheetname "/battery/")
+		(sheetfile "battery.kicad_sch")
+		(attr through_hole exclude_from_bom dnp)
+		(fp_line
+			(start -1.38 -1.38)
+			(end 0 -1.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "d10e76e1-d249-467d-8178-df7810622c73")
+		)
+		(fp_line
+			(start -1.38 0)
+			(end -1.38 -1.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "a928ea04-b819-4ff8-822a-c27b1807ac31")
+		)
+		(fp_line
+			(start -1.38 1.27)
+			(end -1.38 3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "f6f6a62f-590d-44f1-9a97-17e786219cb3")
+		)
+		(fp_line
+			(start -1.38 1.27)
+			(end 1.38 1.27)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "891f721b-d0a3-4b9c-9a60-f9540ab6d259")
+		)
+		(fp_line
+			(start -1.38 3.92)
+			(end 1.38 3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "0d34b922-320d-48a7-b294-ad5b047662ca")
+		)
+		(fp_line
+			(start 1.38 1.27)
+			(end 1.38 3.92)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+			(uuid "6e692a79-6abd-4a9c-a291-451b4f6844d8")
+		)
+		(fp_line
+			(start -1.77 -1.77)
+			(end -1.77 4.32)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "67b1ad01-b5ab-4ec0-b24e-75df308b3607")
+		)
+		(fp_line
+			(start -1.77 4.32)
+			(end 1.77 4.32)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "ff89cc28-a766-43a1-a7d6-925a0b8d14e3")
+		)
+		(fp_line
+			(start 1.77 -1.77)
+			(end -1.77 -1.77)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "bcb619ee-f08c-45bd-93a8-b6d5a0da858a")
+		)
+		(fp_line
+			(start 1.77 4.32)
+			(end 1.77 -1.77)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+			(uuid "0ec4c497-e984-427c-b756-cbf3c8064839")
+		)
+		(fp_line
+			(start -1.27 -0.635)
+			(end -0.635 -1.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "45d00020-2fd2-4d82-bef2-e1eb46e94c77")
+		)
+		(fp_line
+			(start -1.27 3.81)
+			(end -1.27 -0.635)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "05b40886-1339-46c4-945e-beb627ed1a56")
+		)
+		(fp_line
+			(start -0.635 -1.27)
+			(end 1.27 -1.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "130d324a-d271-46d6-b0e4-95932df287ea")
+		)
+		(fp_line
+			(start 1.27 -1.27)
+			(end 1.27 3.81)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "da53f42c-3a4c-4b2d-ba1b-a7b17109e79f")
+		)
+		(fp_line
+			(start 1.27 3.81)
+			(end -1.27 3.81)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+			(uuid "eea9b040-f7a6-4679-9464-abd22a4fa75e")
+		)
+		(fp_text user "${REFERENCE}"
+			(at 0 1.27 90)
+			(layer "F.Fab")
+			(uuid "4acc7266-e54e-431d-9bfc-8c0d480e7f32")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(pad "1" thru_hole rect
+			(at 0 0)
+			(size 1.7 1.7)
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 3 "vbat")
+			(pinfunction "Pin_1")
+			(pintype "passive")
+			(uuid "3fa06136-2d81-4667-98ef-1df0ba5ff3c8")
+		)
+		(pad "2" thru_hole circle
+			(at 0 2.54)
+			(size 1.7 1.7)
+			(drill 1)
+			(layers "*.Cu" "*.Mask")
+			(remove_unused_layers no)
+			(net 19 "GND")
+			(pinfunction "Pin_2")
+			(pintype "passive")
+			(uuid "5e68457c-e230-40dd-a754-1b90281ec710")
+		)
+		(embedded_fonts no)
+		(model "${KICAD9_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.stpZ"
+			(offset
+				(xyz 0 0 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 0 0 0)
+			)
+		)
+	)
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "445684ea-2bfe-4aff-90c6-3cd69438cec1")
@@ -3272,7 +3396,7 @@
 	(footprint "LED_SMD:LED_0805_2012Metric"
 		(layer "F.Cu")
 		(uuid "4bcdaa50-4049-4be1-ac53-0e3516b80baa")
-		(at 68.45 56.8 90)
+		(at 64.2 59 90)
 		(descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
 		(tags "LED")
 		(property "Reference" "D5"
@@ -3521,7 +3645,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "4fa0d7b5-bb78-4ad1-8cd0-917406092361")
-		(at 69.75 57.805 90)
+		(at 62.75 60 90)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C13"
@@ -4340,7 +4464,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "61bbbbf3-0898-463d-8d08-858e807439a3")
-		(at 64.25 60.15)
+		(at 68.795 62.35)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C14"
@@ -4743,7 +4867,7 @@
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "8df11d82-b1ad-4e8c-8a81-4c6e9704e648")
-		(at 66.25 65.5 90)
+		(at 66.75 67.7 90)
 		(descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "resistor")
 		(property "Reference" "R10"
@@ -5545,7 +5669,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "9ddeec12-5a79-411c-8ca9-61cd740419dd")
-		(at 64.25 61.55)
+		(at 68.795 63.75)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C12"
@@ -5948,7 +6072,7 @@
 	(footprint "LED_SMD:LED_0805_2012Metric"
 		(layer "F.Cu")
 		(uuid "a70b5b59-4cd7-4bb1-b6a8-a441dca4cd9d")
-		(at 64.35 56.8 90)
+		(at 68.3 59 90)
 		(descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
 		(tags "LED")
 		(property "Reference" "D3"
@@ -6197,7 +6321,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "ae51f612-4d9f-4799-949d-0ad19db40bc0")
-		(at 64.25 60.85 180)
+		(at 68.795 63.05 180)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C9"
@@ -6405,7 +6529,7 @@
 	(footprint "Capacitor_SMD:C_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "bfb1214d-ccbb-4629-9840-c282620078a1")
-		(at 64.25 62.25)
+		(at 68.795 64.45)
 		(descr "Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "capacitor")
 		(property "Reference" "C10"
@@ -6613,7 +6737,7 @@
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "c5458082-2e88-4a50-9deb-1b56bdda7b39")
-		(at 67 65.5 90)
+		(at 66 67.7 90)
 		(descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "resistor")
 		(property "Reference" "R9"
@@ -7323,7 +7447,7 @@
 	(footprint "phiboard:nordic_npm1300-QEAA_qfn"
 		(layer "F.Cu")
 		(uuid "e089e691-03fa-495f-a8ee-301fcefef083")
-		(at 68 61.3)
+		(at 65 63.5)
 		(property "Reference" "U3"
 			(at 0 -3.5 0)
 			(unlocked yes)
@@ -7836,7 +7960,7 @@
 	(footprint "phiboard:L_0806_2016Metric"
 		(layer "F.Cu")
 		(uuid "ee510826-abea-4085-8002-c4c71b876c16")
-		(at 71.75 59.4 90)
+		(at 61.2 61.65 90)
 		(property "Reference" "L1"
 			(at 0 -1.5 90)
 			(unlocked yes)
@@ -9891,7 +10015,7 @@
 	(footprint "Resistor_SMD:R_0201_0603Metric"
 		(layer "F.Cu")
 		(uuid "fec6f707-674e-49ab-a384-31d832f26895")
-		(at 67.75 65.5 90)
+		(at 65.25 67.7 90)
 		(descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
 		(tags "resistor")
 		(property "Reference" "R11"
@@ -10096,28 +10220,30 @@
 			)
 		)
 	)
-	(footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical"
+	(footprint "phiboard:swd_pad"
 		(layer "B.Cu")
-		(uuid "3a226f9a-5428-45b0-b278-bd102c733dc4")
-		(at 69.1 70.025 180)
-		(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
-		(tags "Through hole pin header THT 1x02 2.54mm single row")
-		(property "Reference" "J5"
-			(at 0 2.38 0)
+		(uuid "09acd8e0-4d2a-4466-bbdd-7f5c011450cb")
+		(at 58.54 71.23 180)
+		(property "Reference" "J6"
+			(at 0 3 0)
+			(unlocked yes)
 			(layer "B.SilkS")
-			(uuid "5e402921-7d6f-43fe-8862-e8c5a6b14a6c")
+			(hide yes)
+			(uuid "44328b77-5426-47f6-a8a2-e623399fa9b0")
 			(effects
 				(font
 					(size 1 1)
-					(thickness 0.15)
+					(thickness 0.1)
 				)
 				(justify mirror)
 			)
 		)
-		(property "Value" "Conn_01x02"
-			(at 0 -4.92 0)
+		(property "Value" "Conn_01x06"
+			(at 0 -3 0)
+			(unlocked yes)
 			(layer "B.Fab")
-			(uuid "7afbc022-929b-43f0-8215-f522732d8b3d")
+			(hide yes)
+			(uuid "4369656c-9ed0-4e60-a8e4-1f527fd977fc")
 			(effects
 				(font
 					(size 1 1)
@@ -10128,189 +10254,10 @@
 		)
 		(property "Datasheet" "~"
 			(at 0 0 0)
+			(unlocked yes)
 			(layer "B.Fab")
 			(hide yes)
-			(uuid "cf570598-353b-4fa9-a28d-c2c1f700fb70")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)"
-			(at 0 0 0)
-			(layer "B.Fab")
-			(hide yes)
-			(uuid "32300be8-cafa-4a86-b22d-f81ef9142ee2")
-			(effects
-				(font
-					(size 1.27 1.27)
-					(thickness 0.15)
-				)
-				(justify mirror)
-			)
-		)
-		(property ki_fp_filters "Connector*:*_1x??_*")
-		(path "/4543c738-0d26-4c0c-91cd-6e4abf059641/4cd7b498-c367-4d16-9f14-226843d6794b")
-		(sheetname "/battery/")
-		(sheetfile "battery.kicad_sch")
-		(attr through_hole exclude_from_bom dnp)
-		(fp_line
-			(start 1.38 -1.27)
-			(end 1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "6e692a79-6abd-4a9c-a291-451b4f6844d8")
-		)
-		(fp_line
-			(start -1.38 1.38)
-			(end 0 1.38)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "d10e76e1-d249-467d-8178-df7810622c73")
-		)
-		(fp_line
-			(start -1.38 0)
-			(end -1.38 1.38)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "a928ea04-b819-4ff8-822a-c27b1807ac31")
-		)
-		(fp_line
-			(start -1.38 -1.27)
-			(end 1.38 -1.27)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "891f721b-d0a3-4b9c-9a60-f9540ab6d259")
-		)
-		(fp_line
-			(start -1.38 -1.27)
-			(end -1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "f6f6a62f-590d-44f1-9a97-17e786219cb3")
-		)
-		(fp_line
-			(start -1.38 -3.92)
-			(end 1.38 -3.92)
-			(stroke
-				(width 0.12)
-				(type solid)
-			)
-			(layer "B.SilkS")
-			(uuid "0d34b922-320d-48a7-b294-ad5b047662ca")
-		)
-		(fp_line
-			(start 1.77 1.77)
-			(end -1.77 1.77)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "bcb619ee-f08c-45bd-93a8-b6d5a0da858a")
-		)
-		(fp_line
-			(start 1.77 -4.32)
-			(end 1.77 1.77)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "0ec4c497-e984-427c-b756-cbf3c8064839")
-		)
-		(fp_line
-			(start -1.77 1.77)
-			(end -1.77 -4.32)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "67b1ad01-b5ab-4ec0-b24e-75df308b3607")
-		)
-		(fp_line
-			(start -1.77 -4.32)
-			(end 1.77 -4.32)
-			(stroke
-				(width 0.05)
-				(type solid)
-			)
-			(layer "B.CrtYd")
-			(uuid "ff89cc28-a766-43a1-a7d6-925a0b8d14e3")
-		)
-		(fp_line
-			(start 1.27 1.27)
-			(end 1.27 -3.81)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "da53f42c-3a4c-4b2d-ba1b-a7b17109e79f")
-		)
-		(fp_line
-			(start 1.27 -3.81)
-			(end -1.27 -3.81)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "eea9b040-f7a6-4679-9464-abd22a4fa75e")
-		)
-		(fp_line
-			(start -0.635 1.27)
-			(end 1.27 1.27)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "130d324a-d271-46d6-b0e4-95932df287ea")
-		)
-		(fp_line
-			(start -1.27 0.635)
-			(end -0.635 1.27)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "45d00020-2fd2-4d82-bef2-e1eb46e94c77")
-		)
-		(fp_line
-			(start -1.27 -3.81)
-			(end -1.27 0.635)
-			(stroke
-				(width 0.1)
-				(type solid)
-			)
-			(layer "B.Fab")
-			(uuid "05b40886-1339-46c4-945e-beb627ed1a56")
-		)
-		(fp_text user "${REFERENCE}"
-			(at 0 -1.27 90)
-			(layer "B.Fab")
-			(uuid "4acc7266-e54e-431d-9bfc-8c0d480e7f32")
+			(uuid "4739df29-ab99-4ec8-a259-393294202ee6")
 			(effects
 				(font
 					(size 1 1)
@@ -10319,40 +10266,93 @@
 				(justify mirror)
 			)
 		)
-		(pad "1" thru_hole rect
-			(at 0 0 180)
-			(size 1.7 1.7)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 3 "vbat")
-			(pinfunction "Pin_1")
-			(pintype "passive")
-			(uuid "3fa06136-2d81-4667-98ef-1df0ba5ff3c8")
+		(property "Description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 0 0 0)
+			(unlocked yes)
+			(layer "B.Fab")
+			(hide yes)
+			(uuid "d663b8c5-cafd-4e8d-b46d-24b5102a6389")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
 		)
-		(pad "2" thru_hole circle
-			(at 0 -2.54 180)
-			(size 1.7 1.7)
-			(drill 1)
-			(layers "*.Cu" "*.Mask")
-			(remove_unused_layers no)
-			(net 19 "GND")
+		(property ki_fp_filters "Connector*:*_1x??_*")
+		(path "/028c853a-37cc-4ba0-90fa-e323c33e0c70/9b80810a-94b4-4a71-896f-bf41bfe8cb96")
+		(sheetname "/swd/")
+		(sheetfile "swd.kicad_sch")
+		(attr smd exclude_from_bom)
+		(fp_text user "${REFERENCE}"
+			(at 0 -3.2 0)
+			(unlocked yes)
+			(layer "B.Fab")
+			(uuid "56e8a6f5-b816-4148-b5c6-6f543cadeaea")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+				(justify mirror)
+			)
+		)
+		(pad "1" smd rect
+			(at -2.54 1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 71 "unconnected-(J6-Pin_1-Pad1)")
+			(pinfunction "Pin_1")
+			(pintype "passive+no_connect")
+			(uuid "37c2c7cc-4e90-40d5-a307-8c3a59052cac")
+		)
+		(pad "2" smd circle
+			(at -2.54 -1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 20 "+3V3")
 			(pinfunction "Pin_2")
 			(pintype "passive")
-			(uuid "5e68457c-e230-40dd-a754-1b90281ec710")
+			(uuid "13545911-8bb3-4812-b2ac-607cc0c093ed")
+		)
+		(pad "3" smd circle
+			(at 0 1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 17 "swd_data")
+			(pinfunction "Pin_3")
+			(pintype "passive")
+			(uuid "aac3bc94-95b1-4b5b-99c7-489c7a744fad")
+		)
+		(pad "4" smd circle
+			(at 0 -1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 11 "swd_clk")
+			(pinfunction "Pin_4")
+			(pintype "passive")
+			(uuid "743b0a87-baa6-4071-bdde-3bf5bfca21be")
+		)
+		(pad "5" smd circle
+			(at 2.54 1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 21 "nreset")
+			(pinfunction "Pin_5")
+			(pintype "passive")
+			(uuid "1f90effc-5ff2-4a3e-8566-8d65ecf583ef")
+		)
+		(pad "6" smd circle
+			(at 2.54 -1.27 180)
+			(size 2 2)
+			(layers "B.Cu" "B.Mask" "B.Paste")
+			(net 19 "GND")
+			(pinfunction "Pin_6")
+			(pintype "passive")
+			(uuid "b39a3869-ab0a-4b1d-939e-4a24d09e638b")
 		)
 		(embedded_fonts no)
-		(model "${KICAD9_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.stpZ"
-			(offset
-				(xyz 0 0 0)
-			)
-			(scale
-				(xyz 1 1 1)
-			)
-			(rotate
-				(xyz 0 0 0)
-			)
-		)
 	)
 	(gr_poly
 		(pts
diff --git a/board/board_right.kicad_prl b/board/board_right.kicad_prl
index f108f8d..e2d8444 100644
--- a/board/board_right.kicad_prl
+++ b/board/board_right.kicad_prl
@@ -16,17 +16,17 @@
       "zones": 0.6
     },
     "selection_filter": {
-      "dimensions": false,
-      "footprints": false,
-      "graphics": false,
-      "keepouts": false,
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
       "lockedItems": false,
-      "otherItems": false,
-      "pads": false,
-      "text": false,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
       "tracks": true,
       "vias": true,
-      "zones": false
+      "zones": true
     },
     "visible_items": [
       "vias",