diff --git a/cad/cad-cache.lib b/cad/cad-cache.lib
index 93d70a9..6fdb4bb 100644
--- a/cad/cad-cache.lib
+++ b/cad/cad-cache.lib
@@ -1,6 +1,28 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# Device_D_Schottky
+#
+DEF Device_D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 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
+#
 # MCU_Module_Arduino_Nano_v2.x
 #
 DEF MCU_Module_Arduino_Nano_v2.x A 0 20 Y Y 1 F N
@@ -47,6 +69,20 @@ X D6 9 -500 0 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# cad-parts_18650-batt
+#
+DEF cad-parts_18650-batt U 0 40 Y Y 1 F N
+F0 "U" 0 0 50 H V C CNN
+F1 "cad-parts_18650-batt" 50 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -350 100 400 -100 0 1 0 N
+X BATT- 1 500 0 100 L 50 50 1 1 I
+X BATT+ 2 -450 0 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # cad-parts_JOYSTICK-ALPS
 #
 DEF cad-parts_JOYSTICK-ALPS J 0 40 Y Y 1 F N
@@ -64,24 +100,58 @@ X GND 4 -300 750 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# cad-parts_TC4056-MOD
+#
+DEF cad-parts_TC4056-MOD U 0 40 Y Y 1 F N
+F0 "U" 0 100 50 H V C CNN
+F1 "cad-parts_TC4056-MOD" 50 200 50 H V C CNN
+F2 "cad-parts:TC4056A-MOD" 0 -450 50 H I C CNN
+F3 "" 0 100 50 H I C CNN
+DRAW
+S 350 150 -250 -300 0 1 0 f
+X C-POS 1 -350 0 100 R 50 50 1 1 I
+X C-NEG 2 -350 -200 100 R 50 50 1 1 I
+X OUT+ 3 450 50 100 L 50 50 1 1 O
+X B+ 4 450 -50 100 L 50 50 1 1 I
+X B- 5 450 -150 100 L 50 50 1 1 I
+X OUT- 6 450 -250 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# cad-parts_dc-converter
+#
+DEF cad-parts_dc-converter U 0 40 Y Y 1 F N
+F0 "U" 0 50 50 H V C CNN
+F1 "cad-parts_dc-converter" 0 250 50 H V C CNN
+F2 "cad-parts:dc-converter" 0 150 50 H I C CNN
+F3 "" 0 50 50 H I C CNN
+DRAW
+S 300 -150 -300 100 0 1 0 N
+X VIN+ 1 400 0 100 L 50 50 1 1 I
+X VIN- 2 400 -100 100 L 50 50 1 1 I
+X VOUT+ 3 -400 0 100 R 50 50 1 1 I
+X VOUT- 4 -400 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # cad-parts_nRF24
 #
 DEF cad-parts_nRF24 U 0 40 Y Y 1 F N
-F0 "U" -50 100 50 V I C CNN
+F0 "U" 0 300 50 H I C CNN
 F1 "cad-parts_nRF24" 0 -250 50 H V C CNN
-F2 "" -50 100 50 V I C CNN
-F3 "" -50 100 50 V I C CNN
+F2 "cad-parts:nRF24" 0 300 50 H I C CNN
+F3 "" 0 300 50 H I C CNN
 DRAW
-S -200 200 250 -200 0 1 0 N
+S -200 200 250 -200 0 1 0 f
 S 0 -250 0 -250 0 1 0 N
-X Gnd 0 -300 150 100 R 50 50 1 1 I
-X CF 1 -300 50 100 R 50 50 1 1 I
-X SCK 2 -300 -50 100 R 50 50 1 1 I
-X MISO 3 -300 -150 100 R 50 50 1 1 I
-X IQ 4 350 -150 100 L 50 50 1 1 I
-X MOSI 5 350 -50 100 L 50 50 1 1 I
-X CSN 6 350 50 100 L 50 50 1 1 I
-X VCC 7 350 150 100 L 50 50 1 1 I
+X Gnd 1 -300 150 100 R 50 50 1 1 I
+X VCC 2 350 150 100 L 50 50 1 1 I
+X CF 3 -300 50 100 R 50 50 1 1 I
+X CSN 4 350 50 100 L 50 50 1 1 I
+X SCK 5 -300 -50 100 R 50 50 1 1 I
+X MOSI 6 350 -50 100 L 50 50 1 1 I
+X MISO 7 -300 -150 100 R 50 50 1 1 I
+X IQ 8 350 -150 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
diff --git a/cad/cad-parts.lib b/cad/cad-parts.lib
index fc8b2b1..b5f2224 100644
--- a/cad/cad-parts.lib
+++ b/cad/cad-parts.lib
@@ -1,6 +1,20 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# 18650-batt
+#
+DEF 18650-batt U 0 40 Y Y 1 F N
+F0 "U" 0 0 50 H V C CNN
+F1 "18650-batt" 50 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S -350 100 400 -100 0 1 0 N
+X BATT- 1 500 0 100 L 50 50 1 1 I
+X BATT+ 2 -450 0 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # JOYSTICK-ALPS
 #
 DEF JOYSTICK-ALPS J 0 40 Y Y 1 F N
@@ -26,34 +40,50 @@ F1 "TC4056-MOD" 50 200 50 H V C CNN
 F2 "cad-parts:TC4056A-MOD" 0 -450 50 H I C CNN
 F3 "" 0 100 50 H I C CNN
 DRAW
-S 350 150 -250 -300 0 1 0 N
-X C-POS 0 -350 0 100 R 50 50 1 1 I
-X C-NEG 1 -350 -200 100 R 50 50 1 1 I
-X OUT+ 2 450 50 100 L 50 50 1 1 O
-X B+ 3 450 -50 100 L 50 50 1 1 I
-X B- 4 450 -150 100 L 50 50 1 1 I
-X OUT- 5 450 -250 100 L 50 50 1 1 O
+S 350 150 -250 -300 0 1 0 f
+X C-POS 1 -350 0 100 R 50 50 1 1 I
+X C-NEG 2 -350 -200 100 R 50 50 1 1 I
+X OUT+ 3 450 50 100 L 50 50 1 1 O
+X B+ 4 450 -50 100 L 50 50 1 1 I
+X B- 5 450 -150 100 L 50 50 1 1 I
+X OUT- 6 450 -250 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# dc-converter
+#
+DEF dc-converter U 0 40 Y Y 1 F N
+F0 "U" 0 50 50 H V C CNN
+F1 "dc-converter" 0 250 50 H V C CNN
+F2 "cad-parts:dc-converter" 0 150 50 H I C CNN
+F3 "" 0 50 50 H I C CNN
+DRAW
+S 300 -150 -300 100 0 1 0 N
+X VIN+ 1 400 0 100 L 50 50 1 1 I
+X VIN- 2 400 -100 100 L 50 50 1 1 I
+X VOUT+ 3 -400 0 100 R 50 50 1 1 I
+X VOUT- 4 -400 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
 # nRF24
 #
 DEF nRF24 U 0 40 Y Y 1 F N
-F0 "U" -50 100 50 V I C CNN
+F0 "U" 0 300 50 H I C CNN
 F1 "nRF24" 0 -250 50 H V C CNN
-F2 "" -50 100 50 V I C CNN
-F3 "" -50 100 50 V I C CNN
+F2 "cad-parts:nRF24" 0 300 50 H I C CNN
+F3 "" 0 300 50 H I C CNN
 DRAW
-S -200 200 250 -200 0 1 0 N
+S -200 200 250 -200 0 1 0 f
 S 0 -250 0 -250 0 1 0 N
-X Gnd 0 -300 150 100 R 50 50 1 1 I
-X CF 1 -300 50 100 R 50 50 1 1 I
-X SCK 2 -300 -50 100 R 50 50 1 1 I
-X MISO 3 -300 -150 100 R 50 50 1 1 I
-X IQ 4 350 -150 100 L 50 50 1 1 I
-X MOSI 5 350 -50 100 L 50 50 1 1 I
-X CSN 6 350 50 100 L 50 50 1 1 I
-X VCC 7 350 150 100 L 50 50 1 1 I
+X Gnd 1 -300 150 100 R 50 50 1 1 I
+X VCC 2 350 150 100 L 50 50 1 1 I
+X CF 3 -300 50 100 R 50 50 1 1 I
+X CSN 4 350 50 100 L 50 50 1 1 I
+X SCK 5 -300 -50 100 R 50 50 1 1 I
+X MOSI 6 350 -50 100 L 50 50 1 1 I
+X MISO 7 -300 -150 100 R 50 50 1 1 I
+X IQ 8 350 -150 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
diff --git a/cad/cad-parts.pretty/18650-batt.kicad_mod b/cad/cad-parts.pretty/18650-batt.kicad_mod
new file mode 100644
index 0000000..130c408
--- /dev/null
+++ b/cad/cad-parts.pretty/18650-batt.kicad_mod
@@ -0,0 +1,14 @@
+(module 18650-batt (layer F.Cu) (tedit 5F670EAD)
+  (fp_text reference REF** (at 0.25 3.25) (layer F.SilkS) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 18650-batt (at 0 -8) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -38.5 -10.5) (end 38.5 -10.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 38.5 -10.5) (end 38.5 10.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 38.5 10.5) (end -38.5 10.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -38.5 10.5) (end -38.5 -10.5) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole circle (at 36.25 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at -36.25 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/cad/cad-parts.pretty/TC4056A-MOD.kicad_mod b/cad/cad-parts.pretty/TC4056A-MOD.kicad_mod
index 0e7aac8..117ad02 100644
--- a/cad/cad-parts.pretty/TC4056A-MOD.kicad_mod
+++ b/cad/cad-parts.pretty/TC4056A-MOD.kicad_mod
@@ -1,4 +1,4 @@
-(module TC4056A-MOD (layer F.Cu) (tedit 5F61B66C)
+(module TC4056A-MOD (layer F.Cu) (tedit 5F66FAC7)
   (fp_text reference REF** (at 0 -15.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
@@ -11,10 +11,10 @@
   (fp_line (start -8.5 -14) (end -8.5 14) (layer F.SilkS) (width 0.12))
   (fp_line (start 8.5 -14) (end 8.5 14) (layer F.SilkS) (width 0.12))
   (fp_line (start 8.5 14) (end -8.5 14) (layer F.SilkS) (width 0.12))
-  (pad 1 thru_hole circle (at -7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-  (pad 2 thru_hole circle (at 7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at -7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 3 thru_hole circle (at 7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 4 thru_hole circle (at 3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-  (pad 5 thru_hole circle (at -7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-  (pad 6 thru_hole circle (at -3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at -7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at -3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
 )
diff --git a/cad/cad-parts.pretty/dc-converter.kicad_mod b/cad/cad-parts.pretty/dc-converter.kicad_mod
new file mode 100644
index 0000000..4a3f0c9
--- /dev/null
+++ b/cad/cad-parts.pretty/dc-converter.kicad_mod
@@ -0,0 +1,16 @@
+(module dc-converter (layer F.Cu) (tedit 5F66F47D)
+  (fp_text reference REF** (at 0.5 1.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value dc-converter (at 0.25 -1) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -18.25 -8.5) (end 18.25 -8.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 18.25 -8.5) (end 18.25 8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -18.25 -8.5) (end -18.25 8) (layer F.SilkS) (width 0.12))
+  (fp_line (start -18.25 8) (end 18.25 8) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole circle (at 15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at -15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at -15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/cad/cad-parts.pretty/nRF24.kicad_mod b/cad/cad-parts.pretty/nRF24.kicad_mod
index 92f78b0..3c87055 100644
--- a/cad/cad-parts.pretty/nRF24.kicad_mod
+++ b/cad/cad-parts.pretty/nRF24.kicad_mod
@@ -1,28 +1,25 @@
-(module nRF24 (layer F.Cu) (tedit 5F4CA049)
+(module nRF24 (layer F.Cu) (tedit 5F66FAA4)
   (fp_text reference " " (at -5.91 0 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value nRf24 (at 0 -3.81) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_line (start -4.91 2.769999) (end 4.91 2.77) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.91 2.77) (end 4.91 -2.769999) (layer F.SilkS) (width 0.12))
-  (fp_line (start 4.91 -2.769999) (end -4.91 -2.77) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.91 -2.77) (end -4.91 -0.923333) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.91 -0.923333) (end -4.55 -0.923333) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.55 -0.923333) (end -4.55 0.923333) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.55 0.923333) (end -4.91 0.923333) (layer F.SilkS) (width 0.12))
-  (fp_line (start -4.91 0.923333) (end -4.91 2.769999) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.5 -25) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.5 2.5) (end -5.5 -25) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.5 3) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.5 3) (end 8.5 3) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.5 2.5) (end -5.5 3) (layer F.SilkS) (width 0.12))
   (fp_line (start -4.66 -2.52) (end 4.66 -2.52) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4.66 -2.52) (end 4.66 2.52) (layer F.CrtYd) (width 0.05))
   (fp_line (start 4.66 2.52) (end -4.66 2.52) (layer F.CrtYd) (width 0.05))
   (fp_line (start -4.66 2.52) (end -4.66 -2.52) (layer F.CrtYd) (width 0.05))
-  (pad 8 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
   (pad 1 thru_hole oval (at -3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 7 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 2 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 4 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
   (pad 6 thru_hole oval (at 1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 3 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 5 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
-  (pad 4 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 5 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 8 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
+  (pad 7 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask))
 )
diff --git a/cad/cad.kicad_pcb b/cad/cad.kicad_pcb
index adb62e5..cfb2fe9 100644
--- a/cad/cad.kicad_pcb
+++ b/cad/cad.kicad_pcb
@@ -2,11 +2,11 @@
 
   (general
     (thickness 1.6)
-    (drawings 0)
-    (tracks 130)
+    (drawings 4)
+    (tracks 176)
     (zones 0)
-    (modules 6)
-    (nets 32)
+    (modules 12)
+    (nets 39)
   )
 
   (page A4)
@@ -55,8 +55,8 @@
     (mod_edge_width 0.12)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.778 1.778)
-    (pad_drill 1.2)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
     (pad_to_mask_clearance 0.05)
     (aux_axis_origin 0 0)
     (visible_elements FFFFFF7F)
@@ -120,7 +120,14 @@
   (net 28 "Net-(A1-Pad2)")
   (net 29 "Net-(A1-Pad17)")
   (net 30 "Net-(A1-Pad1)")
-  (net 31 "Net-(U1-Pad4)")
+  (net 31 "Net-(U2-Pad5)")
+  (net 32 "Net-(U2-Pad3)")
+  (net 33 "Net-(U2-Pad2)")
+  (net 34 "Net-(U2-Pad1)")
+  (net 35 "Net-(U1-Pad8)")
+  (net 36 "Net-(U2-Pad6)")
+  (net 37 "Net-(D1-Pad1)")
+  (net 38 "Net-(D1-Pad2)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -159,146 +166,289 @@
     (add_net "Net-(A1-Pad7)")
     (add_net "Net-(A1-Pad8)")
     (add_net "Net-(A1-Pad9)")
-    (add_net "Net-(U1-Pad4)")
+    (add_net "Net-(D1-Pad1)")
+    (add_net "Net-(D1-Pad2)")
+    (add_net "Net-(U1-Pad8)")
+    (add_net "Net-(U2-Pad1)")
+    (add_net "Net-(U2-Pad2)")
+    (add_net "Net-(U2-Pad3)")
+    (add_net "Net-(U2-Pad5)")
+    (add_net "Net-(U2-Pad6)")
   )
 
-  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5B924765) (tstamp 5F6212AD)
-    (at 78.74 157.48)
-    (descr "Mounting Hole 2.1mm, no annular")
-    (tags "mounting hole 2.1mm no annular")
+  (module Diode_THT:D_A-405_P12.70mm_Horizontal (layer F.Cu) (tedit 5AE50CD5) (tstamp 5F6893B8)
+    (at 200.406 125.73 90)
+    (descr "Diode, A-405 series, Axial, Horizontal, pin pitch=12.7mm, , length*diameter=5.2*2.7mm^2, , http://www.diodes.com/_files/packages/A-405.pdf")
+    (tags "Diode A-405 series Axial Horizontal pin pitch 12.7mm  length 5.2mm diameter 2.7mm")
+    (path /5F6E4965)
+    (fp_text reference D1 (at 6.35 -2.47 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value D_Schottky (at 6.35 2.47 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.9 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user K (at 0 -1.9 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 6.74 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 3.75 -1.35) (end 3.75 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.75 1.35) (end 8.95 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.95 1.35) (end 8.95 -1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.95 -1.35) (end 3.75 -1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 3.75 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 12.7 0) (end 8.95 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.53 -1.35) (end 4.53 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.63 -1.35) (end 4.63 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.43 -1.35) (end 4.43 1.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.63 -1.47) (end 3.63 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.63 1.47) (end 9.07 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.07 1.47) (end 9.07 -1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.07 -1.47) (end 3.63 -1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.14 0) (end 3.63 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.56 0) (end 9.07 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.53 -1.47) (end 4.53 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.65 -1.47) (end 4.65 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.41 -1.47) (end 4.41 1.47) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.15 -1.6) (end -1.15 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.15 1.6) (end 13.85 1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 13.85 1.6) (end 13.85 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 13.85 -1.6) (end -1.15 -1.6) (layer F.CrtYd) (width 0.05))
+    (pad 2 thru_hole oval (at 12.7 0 90) (size 1.8 1.8) (drill 0.9) (layers *.Cu *.Mask)
+      (net 38 "Net-(D1-Pad2)"))
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.8 1.8) (drill 0.9) (layers *.Cu *.Mask)
+      (net 37 "Net-(D1-Pad1)"))
+    (model ${KISYS3DMOD}/Diode_THT.3dshapes/D_A-405_P12.70mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module cad-parts:18650-batt (layer B.Cu) (tedit 5F670EAD) (tstamp 5F684466)
+    (at 153.924 114.3 180)
+    (path /5F6CCA6F)
+    (fp_text reference U4 (at 0.25 -3.25) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 18650-batt (at 0 8) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -38.5 10.5) (end 38.5 10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 38.5 10.5) (end 38.5 -10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 38.5 -10.5) (end -38.5 -10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start -38.5 -10.5) (end -38.5 10.5) (layer B.SilkS) (width 0.12))
+    (pad 2 thru_hole circle (at -36.25 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 38 "Net-(D1-Pad2)"))
+    (pad 1 thru_hole circle (at 36.25 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 31 "Net-(U2-Pad5)"))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8C6)
+    (at 208.28 123.444)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
     (attr virtual)
-    (fp_text reference BAT+ (at 0 -3.2) (layer F.SilkS)
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.1mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.1 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 2.35 0) (layer F.CrtYd) (width 0.05))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.1 2.1) (drill 2.1) (layers *.Cu *.Mask))
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
   )
 
-  (module MountingHole:MountingHole_2.1mm (layer F.Cu) (tedit 5B924765) (tstamp 5F621297)
-    (at 148.59 157.48)
-    (descr "Mounting Hole 2.1mm, no annular")
-    (tags "mounting hole 2.1mm no annular")
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8A6)
+    (at 208.28 78.74)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
     (attr virtual)
-    (fp_text reference BAT- (at 0 -3.2) (layer F.SilkS)
+    (fp_text reference REF** (at -7.62 -0.508) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole_2.1mm (at 0 3.2) (layer F.Fab)
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0.3 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.1 0) (layer Cmts.User) (width 0.15))
-    (fp_circle (center 0 0) (end 2.35 0) (layer F.CrtYd) (width 0.05))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.1 2.1) (drill 2.1) (layers *.Cu *.Mask))
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
   )
 
-  (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F508F32) (tstamp 5F50F288)
-    (at 71.12 109.22)
-    (path /5F50A4B2)
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8A6)
+    (at 98.044 123.444)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
     (attr virtual)
-    (fp_text reference J1 (at -1.905 4.445) (layer B.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value JOYSTICK-ALPS (at -1.27 5.715) (layer B.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
-    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
-    (fp_circle (center 0 0) (end -6.35 6.35) (layer F.SilkS) (width 0.1016))
-    (pad 4 thru_hole circle (at -8.73 2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 1 thru_hole circle (at -8.73 0) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 15 "Net-(A1-Pad24)"))
-    (pad 0 thru_hole circle (at -8.732 -2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-    (pad MOUN thru_hole circle (at 6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad MOUN thru_hole circle (at 6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad 0 thru_hole circle (at -6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-    (pad MOUN thru_hole circle (at -6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad 4 thru_hole circle (at 2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E649)
+    (at 98.044 78.74)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
+    (attr virtual)
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module cad-parts:nRF24 (layer F.Cu) (tedit 5F66FAA4) (tstamp 5F67CB84)
+    (at 152.4 100.33)
+    (path /5F508671)
+    (fp_text reference U1 (at -5.91 0 90) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value nRF24 (at 0 -3.81) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -5.5 -25) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 2.5) (end -5.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 3) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 3) (end 8.5 3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 2.5) (end -5.5 3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.66 -2.52) (end 4.66 -2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.66 -2.52) (end 4.66 2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.66 2.52) (end -4.66 2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.66 2.52) (end -4.66 -2.52) (layer F.CrtYd) (width 0.05))
+    (pad 7 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 "Net-(A1-Pad15)"))
+    (pad 8 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 35 "Net-(U1-Pad8)"))
+    (pad 5 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 "Net-(A1-Pad16)"))
+    (pad 6 thru_hole oval (at 1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(A1-Pad14)"))
+    (pad 3 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 12 "Net-(A1-Pad10)"))
+    (pad 4 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 "Net-(A1-Pad11)"))
+    (pad 1 thru_hole oval (at -3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 5 "Net-(A1-Pad29)"))
-    (pad 2 thru_hole circle (at 0 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 17 "Net-(A1-Pad23)"))
-    (pad 0 thru_hole circle (at -2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+    (pad 2 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 29 "Net-(A1-Pad17)"))
-    (pad 4 thru_hole circle (at 3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 4 thru_hole circle (at -3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+  )
+
+  (module cad-parts:dc-converter (layer F.Cu) (tedit 5F66F47D) (tstamp 5F67A875)
+    (at 166.37 116.84)
+    (path /5F69BA43)
+    (fp_text reference U3 (at 0.5 1.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value dc-converter (at 0.25 -1) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -18.25 -8.5) (end 18.25 -8.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 18.25 -8.5) (end 18.25 8) (layer F.SilkS) (width 0.12))
+    (fp_line (start -18.25 -8.5) (end -18.25 8) (layer F.SilkS) (width 0.12))
+    (fp_line (start -18.25 8) (end 18.25 8) (layer F.SilkS) (width 0.12))
+    (pad 4 thru_hole circle (at -15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 5 "Net-(A1-Pad29)"))
-    (pad 3 thru_hole circle (at 3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 8 "Net-(A1-Pad12)"))
-    (pad 3 thru_hole circle (at -3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 8 "Net-(A1-Pad12)"))
+    (pad 3 thru_hole circle (at -15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 3 "Net-(A1-Pad30)"))
+    (pad 2 thru_hole circle (at 15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 36 "Net-(U2-Pad6)"))
+    (pad 1 thru_hole circle (at 15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 32 "Net-(U2-Pad3)"))
+  )
+
+  (module cad-parts:TC4056A-MOD (layer F.Cu) (tedit 5F66FC85) (tstamp 5F678EC7)
+    (at 173.99 88.9)
+    (path /5F679D5C)
+    (fp_text reference U2 (at 0.254 -11.684) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TC4056-MOD (at 0 -17.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -14) (end 8.5 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 -14) (end 0 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -14) (end -8.5 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -8.5 -14) (end -8.5 14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 -14) (end 8.5 14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 14) (end -8.5 14) (layer F.SilkS) (width 0.12))
+    (pad 5 thru_hole circle (at -3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 31 "Net-(U2-Pad5)"))
+    (pad 6 thru_hole circle (at -7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 36 "Net-(U2-Pad6)"))
+    (pad 4 thru_hole circle (at 3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 37 "Net-(D1-Pad1)"))
+    (pad 3 thru_hole circle (at 7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 32 "Net-(U2-Pad3)"))
+    (pad 2 thru_hole circle (at 7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 33 "Net-(U2-Pad2)"))
+    (pad 1 thru_hole circle (at -7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 34 "Net-(U2-Pad1)"))
   )
 
   (module Module:Arduino_Nano (layer F.Cu) (tedit 58ACAF70) (tstamp 5F50ECE2)
-    (at 107.95 132.08 180)
+    (at 140.97 114.3 180)
     (descr "Arduino Nano, http://www.mouser.com/pdfdocs/Gravitech_Arduino_Nano3_0.pdf")
     (tags "Arduino Nano")
     (path /5F50914A)
-    (fp_text reference A1 (at 7.62 -5.08) (layer F.SilkS)
+    (fp_text reference A1 (at 7.62 -5.08) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value Arduino_Nano_v2.x (at 8.89 19.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 16.75 42.16) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.75 42.16) (end 16.75 -4.06) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.53 -4.06) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.53 -4.06) (end 16.75 -4.06) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.51 -3.81) (end 16.51 39.37) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -3.81) (end 16.51 -3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 -2.54) (end 0 -3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 39.37) (end -1.27 -2.54) (layer F.Fab) (width 0.1))
-    (fp_line (start 16.51 39.37) (end -1.27 39.37) (layer F.Fab) (width 0.1))
-    (fp_line (start 16.64 -3.94) (end -1.4 -3.94) (layer F.SilkS) (width 0.12))
-    (fp_line (start 16.64 39.5) (end 16.64 -3.94) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.4 39.5) (end 16.64 39.5) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.81 41.91) (end 3.81 31.75) (layer F.Fab) (width 0.1))
-    (fp_line (start 11.43 41.91) (end 3.81 41.91) (layer F.Fab) (width 0.1))
-    (fp_line (start 11.43 31.75) (end 11.43 41.91) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 31.75) (end 11.43 31.75) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 36.83) (end -1.4 36.83) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 1.27) (end 1.27 36.83) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 1.27) (end -1.4 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 13.97 36.83) (end 16.64 36.83) (layer F.SilkS) (width 0.12))
-    (fp_line (start 13.97 -1.27) (end 13.97 36.83) (layer F.SilkS) (width 0.12))
-    (fp_line (start 13.97 -1.27) (end 16.64 -1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.4 -3.94) (end -1.4 -1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.4 1.27) (end -1.4 39.5) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 -1.27) (end -1.4 -1.27) (layer F.SilkS) (width 0.12))
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 -1.27) (end -1.4 -1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.4 1.27) (end -1.4 39.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.4 -3.94) (end -1.4 -1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 13.97 -1.27) (end 16.64 -1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 13.97 -1.27) (end 13.97 36.83) (layer F.SilkS) (width 0.12))
+    (fp_line (start 13.97 36.83) (end 16.64 36.83) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 1.27) (end -1.4 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 1.27) (end 1.27 36.83) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 36.83) (end -1.4 36.83) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.81 31.75) (end 11.43 31.75) (layer F.Fab) (width 0.1))
+    (fp_line (start 11.43 31.75) (end 11.43 41.91) (layer F.Fab) (width 0.1))
+    (fp_line (start 11.43 41.91) (end 3.81 41.91) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 41.91) (end 3.81 31.75) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.4 39.5) (end 16.64 39.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 16.64 39.5) (end 16.64 -3.94) (layer F.SilkS) (width 0.12))
+    (fp_line (start 16.64 -3.94) (end -1.4 -3.94) (layer F.SilkS) (width 0.12))
+    (fp_line (start 16.51 39.37) (end -1.27 39.37) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 39.37) (end -1.27 -2.54) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -2.54) (end 0 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -3.81) (end 16.51 -3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 16.51 -3.81) (end 16.51 39.37) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.53 -4.06) (end 16.75 -4.06) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.53 -4.06) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.75 42.16) (end 16.75 -4.06) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.75 42.16) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 6.35 19.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -369,41 +519,103 @@
     )
   )
 
+  (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F508F32) (tstamp 5F50F288)
+    (at 106.68 99.06)
+    (path /5F50A4B2)
+    (attr virtual)
+    (fp_text reference J1 (at -1.905 4.445) (layer B.SilkS) hide
+      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    )
+    (fp_text value JOYSTICK-ALPS (at -0.254 1.524) (layer B.SilkS) hide
+      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    )
+    (fp_circle (center 0 0) (end -6.35 6.35) (layer F.SilkS) (width 0.1016))
+    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
+    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
+    (pad 4 thru_hole circle (at -8.73 2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 1 thru_hole circle (at -8.73 0) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 15 "Net-(A1-Pad24)"))
+    (pad 0 thru_hole circle (at -8.732 -2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad MOUN thru_hole circle (at 6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad MOUN thru_hole circle (at 6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad 0 thru_hole circle (at -6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad MOUN thru_hole circle (at -6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad 4 thru_hole circle (at 2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 2 thru_hole circle (at 0 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 17 "Net-(A1-Pad23)"))
+    (pad 0 thru_hole circle (at -2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad 4 thru_hole circle (at 3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 4 thru_hole circle (at -3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 3 thru_hole circle (at 3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 8 "Net-(A1-Pad12)"))
+    (pad 3 thru_hole circle (at -3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 8 "Net-(A1-Pad12)"))
+  )
+
   (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F51AB0B) (tstamp 5F51ACDE)
-    (at 153.67 110.49)
+    (at 201.93 99.06)
     (path /5F510B0B)
     (attr virtual)
-    (fp_text reference J2 (at -1.905 4.445) (layer B.SilkS)
+    (fp_text reference J2 (at -1.905 4.445) (layer F.SilkS)
       (effects (font (size 1.27 1.27) (thickness 0.1016)))
     )
-    (fp_text value JOYSTICK-ALPS (at -1.27 5.715) (layer B.SilkS)
+    (fp_text value JOYSTICK-ALPS (at -1.27 5.715) (layer F.SilkS) hide
       (effects (font (size 1.27 1.27) (thickness 0.1016)))
     )
-    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
-    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
     (fp_circle (center 0 0) (end -6.35 6.35) (layer F.SilkS) (width 0.1016))
+    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
+    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
     (pad 4 thru_hole circle (at -8.73 2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
       (net 5 "Net-(A1-Pad29)"))
     (pad 1 thru_hole circle (at -8.73 0) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
@@ -431,174 +643,186 @@
       (net 6 "Net-(A1-Pad13)"))
   )
 
-  (module cad-parts:nRF24 (layer F.Cu) (tedit 5F508F62) (tstamp 5F50F07A)
-    (at 124.46 111.76)
-    (path /5F508671)
-    (fp_text reference U1 (at -5.91 0 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value nRF24 (at 0 -3.81) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -4.66 2.52) (end -4.66 -2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.66 2.52) (end -4.66 2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.66 -2.52) (end 4.66 2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.66 -2.52) (end 4.66 -2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.91 0.923333) (end -4.91 2.769999) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.55 0.923333) (end -4.91 0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.55 -0.923333) (end -4.55 0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 -0.923333) (end -4.55 -0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 -2.77) (end -4.91 -0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.91 -2.769999) (end -4.91 -2.77) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.91 2.77) (end 4.91 -2.769999) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 2.769999) (end 4.91 2.77) (layer F.SilkS) (width 0.12))
-    (pad 3 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 "Net-(A1-Pad15)"))
-    (pad 4 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 31 "Net-(U1-Pad4)"))
-    (pad 2 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 "Net-(A1-Pad16)"))
-    (pad 5 thru_hole oval (at 1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(A1-Pad14)"))
-    (pad 1 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 12 "Net-(A1-Pad10)"))
-    (pad 6 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 10 "Net-(A1-Pad11)"))
-    (pad 0 thru_hole oval (at -3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 7 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-  )
+  (gr_line (start 93.472 128.016) (end 93.472 74.168) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 212.852 128.016) (end 93.472 128.016) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 212.852 74.168) (end 212.852 128.016) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 93.472 74.168) (end 212.852 74.168) (layer Edge.Cuts) (width 0.05))
 
-  (segment (start 125.73 113.03) (end 124.46 111.76) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 124.46 111.76) (end 124.46 106.68) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 92.71 96.52) (end 101.6 105.41) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 101.6 105.41) (end 123.19 105.41) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 123.19 105.41) (end 124.46 106.68) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 127.42 113.03) (end 127 112.61) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 128.27 113.03) (end 127.42 113.03) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 107.95 96.52) (end 114.3 102.87) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 114.3 102.87) (end 125.73 102.87) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 125.73 102.87) (end 127 104.14) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 127 104.14) (end 127 112.61) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 125.73 106.68) (end 125.73 110.49) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 107.95 99.06) (end 113.03 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 113.03 104.14) (end 123.19 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 123.19 104.14) (end 124.46 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 124.46 104.14) (end 125.73 105.41) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 125.73 105.41) (end 125.73 106.68) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 156.92 104.74) (end 150.42 104.74) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 72.455999 119.164001) (end 73.67 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 91.584999 128.414999) (end 92.71 129.54) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 91.584999 118.839999) (end 91.584999 128.414999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.169999 118.254999) (end 91.584999 118.839999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 120.65 113.03) (end 115.425001 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 97.934999 118.254999) (end 92.169999 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 115.425001 118.254999) (end 97.934999 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 89.934998 117.95) (end 73.67 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.169999 115.714999) (end 89.934998 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 95.394999 115.714999) (end 92.169999 115.714999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 97.934999 118.254999) (end 95.394999 115.714999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 69.784001 118.882003) (end 70.065999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 70.065999 119.164001) (end 72.455999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.71 129.54) (end 96.664999 125.585001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 111.454989 123.495011) (end 154.162631 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 96.664999 125.585001) (end 109.364999 125.585001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 109.364999 125.585001) (end 111.454989 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 74.37 103.47) (end 67.87 103.47) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 67.87 103.47) (end 69.784001 105.384001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 69.784001 105.384001) (end 69.784001 118.882003) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 118.52) (end 156.22 119.22) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.37 113.04) (end 156.92 113.59) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 144.94 113.04) (end 156.37 113.04) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 104.74) (end 156.92 113.59) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 113.59) (end 156.92 118.52) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.22 121.437642) (end 154.162631 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.22 119.22) (end 156.22 121.437642) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 62.39 111.77) (end 62.39 115.41) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 66.144001 119.164001) (end 70.065999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 62.39 115.41) (end 66.144001 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 100.24) (end 150.42 100.24) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 107.409999 95.394999) (end 106.68 96.124998) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 145.574999 95.394999) (end 107.409999 95.394999) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 150.42 100.24) (end 145.574999 95.394999) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 106.68 99.455002) (end 107.95 100.725002) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 107.95 100.725002) (end 107.95 101.6) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 106.68 96.124998) (end 106.68 99.455002) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 67.87 98.97) (end 74.37 98.97) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 97.79 93.98) (end 107.95 104.14) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 74.37 98.97) (end 85 98.97) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 89.99 93.98) (end 97.79 93.98) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 85 98.97) (end 89.99 93.98) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 107.95 106.68) (end 121.92 106.68) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 121.92 106.68) (end 123.19 107.95) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 123.19 110.49) (end 123.19 107.95) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 93.835001 123.045001) (end 149.715001 123.045001) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 92.71 121.92) (end 93.835001 123.045001) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 153.540002 119.22) (end 153.67 119.22) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 149.715001 123.045001) (end 153.540002 119.22) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 120.65 107.95) (end 118.11 107.95) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 116.84 109.22) (end 107.95 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 121.92 109.22) (end 120.65 107.95) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 118.11 107.95) (end 116.84 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 123.19 113.03) (end 121.92 111.76) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 121.92 111.76) (end 121.92 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 146.152001 107.357279) (end 145.474722 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 146.152001 109.277999) (end 146.152001 107.357279) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 144.94 110.49) (end 146.152001 109.277999) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 142.24 120.65) (end 142.24 107.95) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 142.24 107.95) (end 143.51 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 140.295009 122.594991) (end 142.24 120.65) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 145.474722 106.68) (end 143.51 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 92.71 119.38) (end 93.835001 120.505001) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 93.835001 120.505001) (end 109.075001 120.505001) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 109.075001 120.505001) (end 111.164991 122.594991) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 111.164991 122.594991) (end 140.295009 122.594991) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 89.935989 119.614011) (end 92.71 116.84) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 65.957601 119.614011) (end 89.935989 119.614011) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 61.175999 110.434001) (end 61.175999 114.832409) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 61.175999 114.832409) (end 65.957601 119.614011) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 62.39 109.22) (end 61.175999 110.434001) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 72.334001 116.735999) (end 71.12 117.95) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 90.274001 116.735999) (end 72.334001 116.735999) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 92.71 114.3) (end 90.274001 116.735999) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 151.12 119.22) (end 151.12 116.83) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 149.78 115.49) (end 147.345 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 151.12 116.83) (end 149.78 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 109.152001) (end 144.938 107.94) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 145.593278 115.49) (end 143.725999 113.622721) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 147.345 115.49) (end 145.593278 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 68.525 117.95) (end 68.57 117.95) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 114.22) (end 68.525 117.95) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 106.535001 112.885001) (end 92.71 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 118.254999 112.885001) (end 106.535001 112.885001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 120.65 110.49) (end 118.254999 112.885001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 91.585999 100.184001) (end 92.71 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.658357 100.184001) (end 91.585999 100.184001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 113.622721) (end 143.725999 111.975999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 111.975999) (end 143.725999 109.152001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.655999 100.181643) (end 66.658357 100.184001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 109.077) (end 62.388 106.67) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 114.22) (end 64.795 109.077) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 106.67) (end 62.388 102.655278) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 102.655278) (end 62.388 101.442) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.074001 97.755999) (end 83.785999 97.755999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 83.785999 97.755999) (end 88.831998 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 88.831998 92.71) (end 97.79 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 63.648357 100.181643) (end 63.5 100.33) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.655999 100.181643) (end 63.648357 100.181643) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 101.442) (end 63.5 100.33) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 63.5 100.33) (end 66.074001 97.755999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 97.79 92.71) (end 151.13 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 158.75 99.06) (end 152.4 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 158.75 101.6) (end 158.75 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.875999 111.825999) (end 145.400723 111.825999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 152.4 92.71) (end 151.13 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 157.48 102.87) (end 158.75 101.6) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 111.975999) (end 143.875999 111.825999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 145.400723 111.825999) (end 148.813001 108.413721) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 148.813001 108.413721) (end 148.813001 103.916999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 148.813001 103.916999) (end 149.86 102.87) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 149.86 102.87) (end 157.48 102.87) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 153.67 101.6) (end 154.94 100.33) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 100.33) (end 154.94 86.36) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 86.36) (end 154.94 78.74) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 78.74) (end 154.94 77.47) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 77.47) (end 153.67 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 125.73 78.74) (end 127 78.74) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 127 78.74) (end 129.54 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 129.54 76.2) (end 153.67 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 156.21 101.6) (end 157.48 100.33) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 100.33) (end 157.48 95.25) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 95.25) (end 157.48 78.74) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 140.97 78.74) (end 147.32 78.74) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 78.74) (end 157.48 78.74) (width 0.25) (layer F.Cu) (net 2) (tstamp 5F67D397))
+  (via (at 157.48 78.74) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 2))
+  (segment (start 147.32 78.74) (end 147.32 78.74) (width 0.25) (layer F.Cu) (net 2) (tstamp 5F67D39F))
+  (via (at 147.32 78.74) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 2))
+  (segment (start 157.48 78.74) (end 147.32 78.74) (width 0.25) (layer B.Cu) (net 2))
+  (segment (start 132.08 123.19) (end 125.73 116.84) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 125.73 114.3) (end 125.73 116.84) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 132.08 123.19) (end 152.4 123.19) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 152.4 114.37) (end 151.12 113.09) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 152.4 123.19) (end 152.4 114.37) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 153.67 99.06) (end 153.67 81.28) (width 0.25) (layer F.Cu) (net 4))
+  (segment (start 140.97 81.28) (end 147.32 81.28) (width 0.25) (layer F.Cu) (net 4))
+  (segment (start 153.67 81.28) (end 153.67 81.28) (width 0.25) (layer F.Cu) (net 4) (tstamp 5F67D39B))
+  (via (at 153.67 81.28) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 147.32 81.28) (end 147.32 81.28) (width 0.25) (layer F.Cu) (net 4) (tstamp 5F67D39D))
+  (via (at 147.32 81.28) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 147.32 81.28) (end 153.67 81.28) (width 0.25) (layer B.Cu) (net 4))
+  (segment (start 97.95 103.827642) (end 103.126359 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 108.015999 109.004001) (end 109.23 107.79) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 97.95 101.61) (end 97.95 103.827642) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.93 93.31) (end 103.43 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 198.68 93.31) (end 205.18 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 204.48 94.01) (end 205.18 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 204.48 107.79) (end 204.48 99.05) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 133.35 121.92) (end 147.32 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.23 107.79) (end 112.87 107.79) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 112.87 107.79) (end 113.03 107.95) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.344001 108.854001) (end 105.194001 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.344001 97.895999) (end 105.344001 108.854001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.93 93.31) (end 105.344001 97.895999) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 103.126359 109.004001) (end 105.194001 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.194001 109.004001) (end 108.015999 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 125.73 111.76) (end 116.84 111.76) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 116.84 111.76) (end 113.03 107.95) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 133.35 119.38) (end 133.35 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 125.73 111.76) (end 133.35 119.38) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 149.040009 104.590009) (end 148.59 104.14) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 101.6) (end 148.59 104.14) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 193.2 101.61) (end 190.575 98.985) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 188.55001 96.96001) (end 165.2964 96.96001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 165.2964 96.96001) (end 157.666401 104.590009) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 157.666401 104.590009) (end 149.040009 104.590009) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 118.06) (end 151.12 120.59) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 104.14) (end 148.59 118.06) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 151.12 120.59) (end 148.65 120.59) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.65 120.59) (end 147.32 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 190.575 98.985) (end 188.55001 96.96001) (width 0.25) (layer F.Cu) (net 5) (tstamp 5F67D393))
+  (via (at 190.575 98.985) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 204.48 99.05) (end 204.48 94.01) (width 0.25) (layer F.Cu) (net 5) (tstamp 5F67D395))
+  (via (at 204.48 99.05) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 203.275999 97.845999) (end 204.48 99.05) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 191.714001 97.845999) (end 203.275999 97.845999) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 190.575 98.985) (end 191.714001 97.845999) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 205.18 88.81) (end 198.68 88.81) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 140.97 83.82) (end 147.32 83.82) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 198.68 88.81) (end 163.74 88.81) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 163.74 88.81) (end 158.75 83.82) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 158.75 83.82) (end 158.75 83.82) (width 0.25) (layer F.Cu) (net 6) (tstamp 5F67D399))
+  (via (at 158.75 83.82) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 6))
+  (segment (start 147.32 83.82) (end 147.32 83.82) (width 0.25) (layer F.Cu) (net 6) (tstamp 5F67D3A1))
+  (via (at 147.32 83.82) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 6))
+  (segment (start 158.75 83.82) (end 147.32 83.82) (width 0.25) (layer B.Cu) (net 6))
+  (segment (start 103.43 88.81) (end 109.93 88.81) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 139.844999 87.485001) (end 140.97 86.36) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 111.254999 87.485001) (end 139.844999 87.485001) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 109.93 88.81) (end 111.254999 87.485001) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 140.97 88.9) (end 147.32 88.9) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 151.13 99.06) (end 151.13 88.9) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 147.32 88.9) (end 147.32 88.9) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F67D3A3))
+  (via (at 147.32 88.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 151.13 88.9) (end 151.13 88.9) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F67D3A7))
+  (via (at 151.13 88.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 151.13 88.9) (end 147.32 88.9) (width 0.25) (layer B.Cu) (net 10))
+  (segment (start 201.93 107.79) (end 182.72 127) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 182.72 127) (end 129.54 127) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 129.54 127) (end 121.92 119.38) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 119.38) (end 121.92 115.57) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 107.95) (end 121.92 110.49) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 115.57) (end 121.92 115.57) (width 0.25) (layer F.Cu) (net 11) (tstamp 5F67B297))
+  (via (at 121.92 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (via (at 121.92 110.49) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (segment (start 121.92 107.95) (end 125.73 104.14) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 115.57) (end 121.92 110.49) (width 0.25) (layer B.Cu) (net 11))
+  (segment (start 151.13 101.6) (end 152.4 100.33) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 152.4 100.33) (end 152.4 92.71) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 152.4 92.71) (end 152.4 91.44) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 140.97 91.44) (end 147.32 91.44) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 147.32 91.44) (end 147.32 91.44) (width 0.25) (layer F.Cu) (net 12) (tstamp 5F67D3A5))
+  (via (at 147.32 91.44) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 152.4 91.44) (end 152.4 91.44) (width 0.25) (layer F.Cu) (net 12) (tstamp 5F67D3A9))
+  (via (at 152.4 91.44) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 147.32 91.44) (end 152.4 91.44) (width 0.25) (layer B.Cu) (net 12))
+  (segment (start 193.2 99.06) (end 194.414001 100.274001) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 194.414001 103.078357) (end 186.69 110.802358) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 194.414001 100.274001) (end 194.414001 103.078357) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 186.69 110.802358) (end 186.69 119.38) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 186.69 119.38) (end 184.392999 121.677001) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 184.392999 121.677001) (end 181.61 124.46) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 181.61 124.46) (end 180.34 125.73) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 180.34 125.73) (end 132.08 125.73) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 132.08 125.73) (end 125.73 119.38) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 125.73 119.38) (end 123.19 116.84) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 123.19 116.84) (end 123.19 115.57) (width 0.25) (layer F.Cu) (net 13))
+  (via (at 123.19 104.14) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
+  (segment (start 123.19 115.57) (end 123.19 115.57) (width 0.25) (layer F.Cu) (net 13) (tstamp 5F67B295))
+  (via (at 123.19 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
+  (segment (start 123.19 104.14) (end 123.19 115.57) (width 0.25) (layer B.Cu) (net 13))
+  (segment (start 123.19 104.14) (end 125.73 101.6) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 120.65 102.87) (end 120.65 110.49) (width 0.25) (layer F.Cu) (net 15))
+  (via (at 120.65 110.49) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 115.57) (width 0.25) (layer F.Cu) (net 15) (tstamp 5F67B29D))
+  (segment (start 120.65 110.49) (end 120.65 115.57) (width 0.25) (layer B.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 115.57) (width 0.25) (layer B.Cu) (net 15) (tstamp 5F67BD92))
+  (via (at 120.65 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 15))
+  (segment (start 120.65 102.87) (end 124.46 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 124.46 99.06) (end 125.73 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 96.52 99.06) (end 97.95 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 120.65 116.586) (end 119.888 117.348) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 116.586) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 119.888 117.348) (end 105.918 117.348) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 105.918 117.348) (end 95.25 106.68) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 95.25 100.33) (end 96.52 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 95.25 106.68) (end 95.25 100.33) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 107.95 99.06) (end 106.68 100.33) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 106.68 100.33) (end 106.68 107.79) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 125.73 96.52) (end 110.49 96.52) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 110.49 96.52) (end 107.95 99.06) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 195.605 98.917) (end 195.605 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 193.198 96.51) (end 195.605 98.917) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 199.335 107.79) (end 199.38 107.79) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 195.605 104.06) (end 199.335 107.79) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 102.87 83.82) (end 97.79 88.9) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.948 89.058) (end 97.948 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.79 88.9) (end 97.948 89.058) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 100.4 104.06) (end 100.355 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 104.13 107.79) (end 100.4 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 100.355 98.917) (end 100.355 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.948 96.51) (end 100.355 98.917) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 165.11 96.51) (end 193.198 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 157.48 104.14) (end 165.11 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 151.13 104.14) (end 157.48 104.14) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 123.19 83.82) (end 125.73 81.28) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 102.87 83.82) (end 123.19 83.82) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 151.13 104.14) (end 149.86 102.87) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 149.86 100.33) (end 148.59 99.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 149.86 102.87) (end 149.86 100.33) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 148.59 99.06) (end 148.59 82.55) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 127 82.55) (end 125.73 81.28) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 148.59 82.55) (end 127 82.55) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 170.24 113.224) (end 170.24 98.9) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 117.674 114.3) (end 117.674 116.15) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 164.592 118.872) (end 170.24 113.224) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 120.396 118.872) (end 164.592 118.872) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 117.674 116.15) (end 120.396 118.872) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 180.99 112.46) (end 181.62 113.09) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 180.99 98.9) (end 180.99 112.46) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 167.43 98.9) (end 166.99 98.9) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 166.99 105.96) (end 181.62 120.59) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 166.99 98.9) (end 166.99 105.96) (width 0.25) (layer F.Cu) (net 36))
+  (segment (start 177.74 98.9) (end 177.74 104.842) (width 0.25) (layer B.Cu) (net 37))
+  (segment (start 198.628 125.73) (end 200.406 125.73) (width 0.25) (layer B.Cu) (net 37))
+  (segment (start 177.74 104.842) (end 198.628 125.73) (width 0.25) (layer B.Cu) (net 37))
+  (segment (start 191.444 113.03) (end 190.174 114.3) (width 0.25) (layer B.Cu) (net 38))
+  (segment (start 200.406 113.03) (end 191.444 113.03) (width 0.25) (layer B.Cu) (net 38))
 
 )
diff --git a/cad/cad.kicad_pcb-bak b/cad/cad.kicad_pcb-bak
index 1a2245d..b360732 100644
--- a/cad/cad.kicad_pcb-bak
+++ b/cad/cad.kicad_pcb-bak
@@ -2,11 +2,11 @@
 
   (general
     (thickness 1.6)
-    (drawings 0)
-    (tracks 130)
+    (drawings 4)
+    (tracks 187)
     (zones 0)
-    (modules 4)
-    (nets 32)
+    (modules 11)
+    (nets 38)
   )
 
   (page A4)
@@ -55,8 +55,8 @@
     (mod_edge_width 0.12)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.778 1.778)
-    (pad_drill 1.2)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
     (pad_to_mask_clearance 0.05)
     (aux_axis_origin 0 0)
     (visible_elements FFFFFF7F)
@@ -120,7 +120,13 @@
   (net 28 "Net-(A1-Pad2)")
   (net 29 "Net-(A1-Pad17)")
   (net 30 "Net-(A1-Pad1)")
-  (net 31 "Net-(U1-Pad4)")
+  (net 31 "Net-(U2-Pad5)")
+  (net 32 "Net-(U2-Pad4)")
+  (net 33 "Net-(U2-Pad3)")
+  (net 34 "Net-(U2-Pad2)")
+  (net 35 "Net-(U2-Pad1)")
+  (net 36 "Net-(U1-Pad8)")
+  (net 37 "Net-(U2-Pad6)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -159,85 +165,209 @@
     (add_net "Net-(A1-Pad7)")
     (add_net "Net-(A1-Pad8)")
     (add_net "Net-(A1-Pad9)")
-    (add_net "Net-(U1-Pad4)")
+    (add_net "Net-(U1-Pad8)")
+    (add_net "Net-(U2-Pad1)")
+    (add_net "Net-(U2-Pad2)")
+    (add_net "Net-(U2-Pad3)")
+    (add_net "Net-(U2-Pad4)")
+    (add_net "Net-(U2-Pad5)")
+    (add_net "Net-(U2-Pad6)")
   )
 
-  (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F508F32) (tstamp 5F50F288)
-    (at 71.12 109.22)
-    (path /5F50A4B2)
+  (module cad-parts:18650-batt (layer B.Cu) (tedit 5F670EAD) (tstamp 5F684466)
+    (at 153.924 114.3 180)
+    (path /5F6CCA6F)
+    (fp_text reference U4 (at 0.25 -3.25) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 18650-batt (at 0 8) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -38.5 10.5) (end 38.5 10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 38.5 10.5) (end 38.5 -10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 38.5 -10.5) (end -38.5 -10.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start -38.5 -10.5) (end -38.5 10.5) (layer B.SilkS) (width 0.12))
+    (pad 2 thru_hole circle (at -36.25 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 32 "Net-(U2-Pad4)"))
+    (pad 1 thru_hole circle (at 36.25 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 31 "Net-(U2-Pad5)"))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8C6)
+    (at 208.28 123.444)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
     (attr virtual)
-    (fp_text reference J1 (at -1.905 4.445) (layer B.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value JOYSTICK-ALPS (at -1.27 5.715) (layer B.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end -6.35 6.35) (layer F.SilkS) (width 0.1016))
-    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
-    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
-    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
-    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
-    (pad 4 thru_hole circle (at -8.73 2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 1 thru_hole circle (at -8.73 0) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 15 "Net-(A1-Pad24)"))
-    (pad 0 thru_hole circle (at -8.732 -2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-    (pad MOUN thru_hole circle (at 6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad MOUN thru_hole circle (at 6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad 0 thru_hole circle (at -6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-    (pad MOUN thru_hole circle (at -6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
-    (pad 4 thru_hole circle (at 2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8A6)
+    (at 208.28 78.74)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
+    (attr virtual)
+    (fp_text reference REF** (at -7.62 -0.508) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E8A6)
+    (at 98.044 123.444)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
+    (attr virtual)
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module MountingHole:MountingHole_4mm (layer F.Cu) (tedit 56D1B4CB) (tstamp 5F67E649)
+    (at 98.044 78.74)
+    (descr "Mounting Hole 4mm, no annular")
+    (tags "mounting hole 4mm no annular")
+    (attr virtual)
+    (fp_text reference REF** (at 0 -5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_4mm (at 0 5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 4 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 4.25 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 np_thru_hole circle (at 0 0) (size 4 4) (drill 4) (layers *.Cu *.Mask))
+  )
+
+  (module cad-parts:nRF24 (layer F.Cu) (tedit 5F66FAA4) (tstamp 5F67CB84)
+    (at 152.4 100.33)
+    (path /5F508671)
+    (fp_text reference U1 (at -5.91 0 90) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value nRF24 (at 0 -3.81) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -5.5 -25) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 2.5) (end -5.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 3) (end 8.5 -25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 3) (end 8.5 3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -5.5 2.5) (end -5.5 3) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.66 -2.52) (end 4.66 -2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.66 -2.52) (end 4.66 2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.66 2.52) (end -4.66 2.52) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.66 2.52) (end -4.66 -2.52) (layer F.CrtYd) (width 0.05))
+    (pad 7 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 "Net-(A1-Pad15)"))
+    (pad 8 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 36 "Net-(U1-Pad8)"))
+    (pad 5 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 "Net-(A1-Pad16)"))
+    (pad 6 thru_hole oval (at 1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(A1-Pad14)"))
+    (pad 3 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 12 "Net-(A1-Pad10)"))
+    (pad 4 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 "Net-(A1-Pad11)"))
+    (pad 1 thru_hole oval (at -3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 5 "Net-(A1-Pad29)"))
-    (pad 2 thru_hole circle (at 0 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 17 "Net-(A1-Pad23)"))
-    (pad 0 thru_hole circle (at -2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+    (pad 2 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 29 "Net-(A1-Pad17)"))
-    (pad 4 thru_hole circle (at 3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 4 thru_hole circle (at -3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+  )
+
+  (module cad-parts:dc-converter (layer F.Cu) (tedit 5F66F47D) (tstamp 5F67A875)
+    (at 166.37 116.84)
+    (path /5F69BA43)
+    (fp_text reference U3 (at 0.5 1.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value dc-converter (at 0.25 -1) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -18.25 -8.5) (end 18.25 -8.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 18.25 -8.5) (end 18.25 8) (layer F.SilkS) (width 0.12))
+    (fp_line (start -18.25 -8.5) (end -18.25 8) (layer F.SilkS) (width 0.12))
+    (fp_line (start -18.25 8) (end 18.25 8) (layer F.SilkS) (width 0.12))
+    (pad 4 thru_hole circle (at -15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 5 "Net-(A1-Pad29)"))
-    (pad 3 thru_hole circle (at 3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 8 "Net-(A1-Pad12)"))
-    (pad 3 thru_hole circle (at -3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
-      (net 8 "Net-(A1-Pad12)"))
+    (pad 3 thru_hole circle (at -15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 3 "Net-(A1-Pad30)"))
+    (pad 2 thru_hole circle (at 15.25 3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 37 "Net-(U2-Pad6)"))
+    (pad 1 thru_hole circle (at 15.25 -3.75) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 33 "Net-(U2-Pad3)"))
+  )
+
+  (module cad-parts:TC4056A-MOD (layer F.Cu) (tedit 5F66FC85) (tstamp 5F678EC7)
+    (at 173.99 88.9)
+    (path /5F679D5C)
+    (fp_text reference U2 (at 0.254 -11.684) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value TC4056-MOD (at 0 -17.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0 -14) (end 8.5 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 -14) (end 0 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -14) (end -8.5 -14) (layer F.SilkS) (width 0.12))
+    (fp_line (start -8.5 -14) (end -8.5 14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 -14) (end 8.5 14) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.5 14) (end -8.5 14) (layer F.SilkS) (width 0.12))
+    (pad 5 thru_hole circle (at -3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 31 "Net-(U2-Pad5)"))
+    (pad 6 thru_hole circle (at -7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 37 "Net-(U2-Pad6)"))
+    (pad 4 thru_hole circle (at 3.75 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 32 "Net-(U2-Pad4)"))
+    (pad 3 thru_hole circle (at 7 10) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 33 "Net-(U2-Pad3)"))
+    (pad 2 thru_hole circle (at 7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 34 "Net-(U2-Pad2)"))
+    (pad 1 thru_hole circle (at -7 -12.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 35 "Net-(U2-Pad1)"))
   )
 
   (module Module:Arduino_Nano (layer F.Cu) (tedit 58ACAF70) (tstamp 5F50ECE2)
-    (at 107.95 132.08 180)
+    (at 140.97 114.3 180)
     (descr "Arduino Nano, http://www.mouser.com/pdfdocs/Gravitech_Arduino_Nano3_0.pdf")
     (tags "Arduino Nano")
     (path /5F50914A)
-    (fp_text reference A1 (at 7.62 -5.08) (layer F.SilkS)
+    (fp_text reference A1 (at 7.62 -5.08) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value Arduino_Nano_v2.x (at 8.89 19.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 6.35 19.05 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
     (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.12))
     (fp_line (start 1.27 -1.27) (end -1.4 -1.27) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.4 1.27) (end -1.4 39.5) (layer F.SilkS) (width 0.12))
@@ -264,6 +394,9 @@
     (fp_line (start -1.53 -4.06) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
     (fp_line (start 16.75 42.16) (end 16.75 -4.06) (layer F.CrtYd) (width 0.05))
     (fp_line (start 16.75 42.16) (end -1.53 42.16) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 6.35 19.05 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
     (pad 16 thru_hole oval (at 15.24 35.56 180) (size 1.6 1.6) (drill 1) (layers *.Cu *.Mask)
       (net 1 "Net-(A1-Pad16)"))
     (pad 15 thru_hole oval (at 0 35.56 180) (size 1.6 1.6) (drill 1) (layers *.Cu *.Mask)
@@ -331,8 +464,70 @@
     )
   )
 
+  (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F508F32) (tstamp 5F50F288)
+    (at 106.68 99.06)
+    (path /5F50A4B2)
+    (attr virtual)
+    (fp_text reference J1 (at -1.905 4.445) (layer B.SilkS)
+      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    )
+    (fp_text value JOYSTICK-ALPS (at -1.27 5.715) (layer B.SilkS)
+      (effects (font (size 1.27 1.27) (thickness 0.1016)))
+    )
+    (fp_circle (center 0 0) (end -6.35 6.35) (layer F.SilkS) (width 0.1016))
+    (fp_circle (center 0 0) (end -0.3175 0.3175) (layer B.SilkS) (width 0.1016))
+    (fp_line (start 0.635 -5.84) (end 1.905 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -0.635 -5.84) (end 0.635 -6.475) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -1.905 -5.84) (end -0.635 -5.84) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -11.176 -4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 4.826) (end -11.176 4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -7.62 -4.826) (end -11.176 -4.826) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -12) (end -5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -5.588 -6.985) (end -7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -6.985) (end 5.588 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 9.525 -4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 4.064) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 7.62 -4.064) (end 7.62 -6.985) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 9.525 -4.064) (end 9.525 4.064) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 8.89) (end -7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 8.89) (end 7.62 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start -4.826 11.43) (end -4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end 4.826 8.89) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 4.826 11.43) (end -4.826 11.43) (layer B.SilkS) (width 0.2032))
+    (fp_line (start 5.588 -12) (end -5.588 -12) (layer B.SilkS) (width 0.2032))
+    (pad 4 thru_hole circle (at -8.73 2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 1 thru_hole circle (at -8.73 0) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 15 "Net-(A1-Pad24)"))
+    (pad 0 thru_hole circle (at -8.732 -2.55) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad MOUN thru_hole circle (at 6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad MOUN thru_hole circle (at 6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad 0 thru_hole circle (at -6.325 5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad MOUN thru_hole circle (at -6.325 -5) (size 2.286 2.286) (drill 1.5) (layers *.Cu F.Paste F.SilkS F.Mask))
+    (pad 4 thru_hole circle (at 2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 2 thru_hole circle (at 0 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 17 "Net-(A1-Pad23)"))
+    (pad 0 thru_hole circle (at -2.55 8.73) (size 1.778 1.778) (drill 1) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 29 "Net-(A1-Pad17)"))
+    (pad 4 thru_hole circle (at 3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 4 thru_hole circle (at -3.25 -5.75) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 5 "Net-(A1-Pad29)"))
+    (pad 3 thru_hole circle (at 3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 8 "Net-(A1-Pad12)"))
+    (pad 3 thru_hole circle (at -3.25 -10.25) (size 1.778 1.778) (drill 1.2) (layers *.Cu F.Paste F.SilkS F.Mask)
+      (net 8 "Net-(A1-Pad12)"))
+  )
+
   (module cad-parts:JOYSTICK-ALPS (layer F.Cu) (tedit 5F51AB0B) (tstamp 5F51ACDE)
-    (at 153.67 110.49)
+    (at 201.93 99.06)
     (path /5F510B0B)
     (attr virtual)
     (fp_text reference J2 (at -1.905 4.445) (layer B.SilkS)
@@ -393,174 +588,197 @@
       (net 6 "Net-(A1-Pad13)"))
   )
 
-  (module cad-parts:nRF24 (layer F.Cu) (tedit 5F508F62) (tstamp 5F50F07A)
-    (at 124.46 111.76)
-    (path /5F508671)
-    (fp_text reference U1 (at -5.91 0 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value nRF24 (at 0 -3.81) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -4.91 2.769999) (end 4.91 2.77) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.91 2.77) (end 4.91 -2.769999) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.91 -2.769999) (end -4.91 -2.77) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 -2.77) (end -4.91 -0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 -0.923333) (end -4.55 -0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.55 -0.923333) (end -4.55 0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.55 0.923333) (end -4.91 0.923333) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.91 0.923333) (end -4.91 2.769999) (layer F.SilkS) (width 0.12))
-    (fp_line (start -4.66 -2.52) (end 4.66 -2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.66 -2.52) (end 4.66 2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.66 2.52) (end -4.66 2.52) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.66 2.52) (end -4.66 -2.52) (layer F.CrtYd) (width 0.05))
-    (pad 3 thru_hole oval (at 3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 "Net-(A1-Pad15)"))
-    (pad 4 thru_hole oval (at 3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 31 "Net-(U1-Pad4)"))
-    (pad 2 thru_hole oval (at 1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 "Net-(A1-Pad16)"))
-    (pad 5 thru_hole oval (at 1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(A1-Pad14)"))
-    (pad 1 thru_hole oval (at -1.27 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 12 "Net-(A1-Pad10)"))
-    (pad 6 thru_hole oval (at -1.27 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 10 "Net-(A1-Pad11)"))
-    (pad 0 thru_hole oval (at -3.81 1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 5 "Net-(A1-Pad29)"))
-    (pad 7 thru_hole oval (at -3.81 -1.27) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 "Net-(A1-Pad17)"))
-  )
+  (gr_line (start 93.472 128.016) (end 93.472 74.168) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 212.852 128.016) (end 93.472 128.016) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 212.852 74.168) (end 212.852 128.016) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 93.472 74.168) (end 212.852 74.168) (layer Edge.Cuts) (width 0.05))
 
-  (segment (start 125.73 113.03) (end 124.46 111.76) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 124.46 111.76) (end 124.46 106.68) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 92.71 96.52) (end 101.6 105.41) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 101.6 105.41) (end 123.19 105.41) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 123.19 105.41) (end 124.46 106.68) (width 0.25) (layer F.Cu) (net 1))
-  (segment (start 127.42 113.03) (end 127 112.61) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 128.27 113.03) (end 127.42 113.03) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 107.95 96.52) (end 114.3 102.87) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 114.3 102.87) (end 125.73 102.87) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 125.73 102.87) (end 127 104.14) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 127 104.14) (end 127 112.61) (width 0.25) (layer F.Cu) (net 2))
-  (segment (start 125.73 106.68) (end 125.73 110.49) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 107.95 99.06) (end 113.03 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 113.03 104.14) (end 123.19 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 123.19 104.14) (end 124.46 104.14) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 124.46 104.14) (end 125.73 105.41) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 125.73 105.41) (end 125.73 106.68) (width 0.25) (layer F.Cu) (net 4))
-  (segment (start 156.92 104.74) (end 150.42 104.74) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 72.455999 119.164001) (end 73.67 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 91.584999 128.414999) (end 92.71 129.54) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 91.584999 118.839999) (end 91.584999 128.414999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.169999 118.254999) (end 91.584999 118.839999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 120.65 113.03) (end 115.425001 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 97.934999 118.254999) (end 92.169999 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 115.425001 118.254999) (end 97.934999 118.254999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 89.934998 117.95) (end 73.67 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.169999 115.714999) (end 89.934998 117.95) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 95.394999 115.714999) (end 92.169999 115.714999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 97.934999 118.254999) (end 95.394999 115.714999) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 69.784001 118.882003) (end 70.065999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 70.065999 119.164001) (end 72.455999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 92.71 129.54) (end 96.664999 125.585001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 111.454989 123.495011) (end 154.162631 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 96.664999 125.585001) (end 109.364999 125.585001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 109.364999 125.585001) (end 111.454989 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 74.37 103.47) (end 67.87 103.47) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 67.87 103.47) (end 69.784001 105.384001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 69.784001 105.384001) (end 69.784001 118.882003) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 118.52) (end 156.22 119.22) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.37 113.04) (end 156.92 113.59) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 144.94 113.04) (end 156.37 113.04) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 104.74) (end 156.92 113.59) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 113.59) (end 156.92 118.52) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.22 121.437642) (end 154.162631 123.495011) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.22 119.22) (end 156.22 121.437642) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 62.39 111.77) (end 62.39 115.41) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 66.144001 119.164001) (end 70.065999 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 62.39 115.41) (end 66.144001 119.164001) (width 0.25) (layer F.Cu) (net 5))
-  (segment (start 156.92 100.24) (end 150.42 100.24) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 107.409999 95.394999) (end 106.68 96.124998) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 145.574999 95.394999) (end 107.409999 95.394999) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 150.42 100.24) (end 145.574999 95.394999) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 106.68 99.455002) (end 107.95 100.725002) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 107.95 100.725002) (end 107.95 101.6) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 106.68 96.124998) (end 106.68 99.455002) (width 0.25) (layer F.Cu) (net 6))
-  (segment (start 146.152001 107.357279) (end 145.474722 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 146.152001 109.277999) (end 146.152001 107.357279) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 144.94 110.49) (end 146.152001 109.277999) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 67.87 98.97) (end 74.37 98.97) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 97.79 93.98) (end 107.95 104.14) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 74.37 98.97) (end 85 98.97) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 89.99 93.98) (end 97.79 93.98) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 85 98.97) (end 89.99 93.98) (width 0.25) (layer F.Cu) (net 8))
-  (segment (start 107.95 106.68) (end 121.92 106.68) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 121.92 106.68) (end 123.19 107.95) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 123.19 110.49) (end 123.19 107.95) (width 0.25) (layer F.Cu) (net 10))
-  (segment (start 93.835001 123.045001) (end 149.715001 123.045001) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 92.71 121.92) (end 93.835001 123.045001) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 153.540002 119.22) (end 153.67 119.22) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 149.715001 123.045001) (end 153.540002 119.22) (width 0.25) (layer F.Cu) (net 11))
-  (segment (start 120.65 107.95) (end 118.11 107.95) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 116.84 109.22) (end 107.95 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 121.92 109.22) (end 120.65 107.95) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 118.11 107.95) (end 116.84 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 123.19 113.03) (end 121.92 111.76) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 121.92 111.76) (end 121.92 109.22) (width 0.25) (layer F.Cu) (net 12))
-  (segment (start 142.24 120.65) (end 142.24 107.95) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 142.24 107.95) (end 143.51 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 140.295009 122.594991) (end 142.24 120.65) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 145.474722 106.68) (end 143.51 106.68) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 92.71 119.38) (end 93.835001 120.505001) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 93.835001 120.505001) (end 109.075001 120.505001) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 109.075001 120.505001) (end 111.164991 122.594991) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 111.164991 122.594991) (end 140.295009 122.594991) (width 0.25) (layer F.Cu) (net 13))
-  (segment (start 89.935989 119.614011) (end 92.71 116.84) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 65.957601 119.614011) (end 89.935989 119.614011) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 61.175999 110.434001) (end 61.175999 114.832409) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 61.175999 114.832409) (end 65.957601 119.614011) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 62.39 109.22) (end 61.175999 110.434001) (width 0.25) (layer F.Cu) (net 15))
-  (segment (start 72.334001 116.735999) (end 71.12 117.95) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 90.274001 116.735999) (end 72.334001 116.735999) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 92.71 114.3) (end 90.274001 116.735999) (width 0.25) (layer F.Cu) (net 17))
-  (segment (start 151.12 119.22) (end 151.12 116.83) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 149.78 115.49) (end 147.345 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 151.12 116.83) (end 149.78 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 109.152001) (end 144.938 107.94) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 145.593278 115.49) (end 143.725999 113.622721) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 147.345 115.49) (end 145.593278 115.49) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 68.525 117.95) (end 68.57 117.95) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 114.22) (end 68.525 117.95) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 106.535001 112.885001) (end 92.71 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 118.254999 112.885001) (end 106.535001 112.885001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 120.65 110.49) (end 118.254999 112.885001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 91.585999 100.184001) (end 92.71 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.658357 100.184001) (end 91.585999 100.184001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 113.622721) (end 143.725999 111.975999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 111.975999) (end 143.725999 109.152001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.655999 100.181643) (end 66.658357 100.184001) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 109.077) (end 62.388 106.67) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 64.795 114.22) (end 64.795 109.077) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 106.67) (end 62.388 102.655278) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 102.655278) (end 62.388 101.442) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.074001 97.755999) (end 83.785999 97.755999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 83.785999 97.755999) (end 88.831998 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 88.831998 92.71) (end 97.79 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 63.648357 100.181643) (end 63.5 100.33) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 66.655999 100.181643) (end 63.648357 100.181643) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 62.388 101.442) (end 63.5 100.33) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 63.5 100.33) (end 66.074001 97.755999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 97.79 92.71) (end 151.13 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 158.75 99.06) (end 152.4 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 158.75 101.6) (end 158.75 99.06) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.875999 111.825999) (end 145.400723 111.825999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 152.4 92.71) (end 151.13 92.71) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 157.48 102.87) (end 158.75 101.6) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 143.725999 111.975999) (end 143.875999 111.825999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 145.400723 111.825999) (end 148.813001 108.413721) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 148.813001 108.413721) (end 148.813001 103.916999) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 148.813001 103.916999) (end 149.86 102.87) (width 0.25) (layer F.Cu) (net 29))
-  (segment (start 149.86 102.87) (end 157.48 102.87) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 153.67 101.6) (end 154.94 100.33) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 100.33) (end 154.94 86.36) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 86.36) (end 154.94 78.74) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 78.74) (end 154.94 77.47) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 154.94 77.47) (end 153.67 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 125.73 78.74) (end 127 78.74) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 127 78.74) (end 129.54 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 129.54 76.2) (end 153.67 76.2) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 156.21 101.6) (end 157.48 100.33) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 100.33) (end 157.48 95.25) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 95.25) (end 157.48 78.74) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 140.97 78.74) (end 147.32 78.74) (width 0.25) (layer F.Cu) (net 2))
+  (segment (start 157.48 78.74) (end 157.48 78.74) (width 0.25) (layer F.Cu) (net 2) (tstamp 5F67D397))
+  (via (at 157.48 78.74) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 2))
+  (segment (start 147.32 78.74) (end 147.32 78.74) (width 0.25) (layer F.Cu) (net 2) (tstamp 5F67D39F))
+  (via (at 147.32 78.74) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 2))
+  (segment (start 157.48 78.74) (end 147.32 78.74) (width 0.25) (layer B.Cu) (net 2))
+  (segment (start 132.08 123.19) (end 125.73 116.84) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 125.73 114.3) (end 125.73 116.84) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 132.08 123.19) (end 152.4 123.19) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 152.4 114.37) (end 151.12 113.09) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 152.4 123.19) (end 152.4 114.37) (width 0.25) (layer F.Cu) (net 3))
+  (segment (start 153.67 99.06) (end 153.67 81.28) (width 0.25) (layer F.Cu) (net 4))
+  (segment (start 140.97 81.28) (end 147.32 81.28) (width 0.25) (layer F.Cu) (net 4))
+  (segment (start 153.67 81.28) (end 153.67 81.28) (width 0.25) (layer F.Cu) (net 4) (tstamp 5F67D39B))
+  (via (at 153.67 81.28) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 147.32 81.28) (end 147.32 81.28) (width 0.25) (layer F.Cu) (net 4) (tstamp 5F67D39D))
+  (via (at 147.32 81.28) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 147.32 81.28) (end 153.67 81.28) (width 0.25) (layer B.Cu) (net 4))
+  (segment (start 97.95 103.827642) (end 103.126359 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 108.015999 109.004001) (end 109.23 107.79) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 97.95 101.61) (end 97.95 103.827642) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.93 93.31) (end 103.43 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 198.68 93.31) (end 205.18 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 204.48 94.01) (end 205.18 93.31) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 204.48 107.79) (end 204.48 99.05) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 133.35 121.92) (end 147.32 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.23 107.79) (end 112.87 107.79) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 112.87 107.79) (end 113.03 107.95) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.344001 108.854001) (end 105.194001 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.344001 97.895999) (end 105.344001 108.854001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 109.93 93.31) (end 105.344001 97.895999) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 103.126359 109.004001) (end 105.194001 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 105.194001 109.004001) (end 108.015999 109.004001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 125.73 111.76) (end 116.84 111.76) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 116.84 111.76) (end 113.03 107.95) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 133.35 119.38) (end 133.35 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 125.73 111.76) (end 133.35 119.38) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 149.040009 104.590009) (end 148.59 104.14) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 101.6) (end 148.59 104.14) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 193.2 101.61) (end 190.575 98.985) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 188.55001 96.96001) (end 165.2964 96.96001) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 165.2964 96.96001) (end 157.666401 104.590009) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 157.666401 104.590009) (end 149.040009 104.590009) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 118.06) (end 151.12 120.59) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.59 104.14) (end 148.59 118.06) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 151.12 120.59) (end 148.65 120.59) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 148.65 120.59) (end 147.32 121.92) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 190.575 98.985) (end 188.55001 96.96001) (width 0.25) (layer F.Cu) (net 5) (tstamp 5F67D393))
+  (via (at 190.575 98.985) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 204.48 99.05) (end 204.48 94.01) (width 0.25) (layer F.Cu) (net 5) (tstamp 5F67D395))
+  (via (at 204.48 99.05) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 203.275999 97.845999) (end 204.48 99.05) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 191.714001 97.845999) (end 203.275999 97.845999) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 190.575 98.985) (end 191.714001 97.845999) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 205.18 88.81) (end 198.68 88.81) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 140.97 83.82) (end 147.32 83.82) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 198.68 88.81) (end 163.74 88.81) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 163.74 88.81) (end 158.75 83.82) (width 0.25) (layer F.Cu) (net 6))
+  (segment (start 158.75 83.82) (end 158.75 83.82) (width 0.25) (layer F.Cu) (net 6) (tstamp 5F67D399))
+  (via (at 158.75 83.82) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 6))
+  (segment (start 147.32 83.82) (end 147.32 83.82) (width 0.25) (layer F.Cu) (net 6) (tstamp 5F67D3A1))
+  (via (at 147.32 83.82) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 6))
+  (segment (start 158.75 83.82) (end 147.32 83.82) (width 0.25) (layer B.Cu) (net 6))
+  (segment (start 103.43 88.81) (end 109.93 88.81) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 139.844999 87.485001) (end 140.97 86.36) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 111.254999 87.485001) (end 139.844999 87.485001) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 109.93 88.81) (end 111.254999 87.485001) (width 0.25) (layer F.Cu) (net 8))
+  (segment (start 140.97 88.9) (end 147.32 88.9) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 151.13 99.06) (end 151.13 88.9) (width 0.25) (layer F.Cu) (net 10))
+  (segment (start 147.32 88.9) (end 147.32 88.9) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F67D3A3))
+  (via (at 147.32 88.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 151.13 88.9) (end 151.13 88.9) (width 0.25) (layer F.Cu) (net 10) (tstamp 5F67D3A7))
+  (via (at 151.13 88.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 151.13 88.9) (end 147.32 88.9) (width 0.25) (layer B.Cu) (net 10))
+  (segment (start 201.93 107.79) (end 182.72 127) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 182.72 127) (end 129.54 127) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 129.54 127) (end 121.92 119.38) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 119.38) (end 121.92 115.57) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 107.95) (end 121.92 110.49) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 115.57) (end 121.92 115.57) (width 0.25) (layer F.Cu) (net 11) (tstamp 5F67B297))
+  (via (at 121.92 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (via (at 121.92 110.49) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (segment (start 121.92 107.95) (end 125.73 104.14) (width 0.25) (layer F.Cu) (net 11))
+  (segment (start 121.92 115.57) (end 121.92 110.49) (width 0.25) (layer B.Cu) (net 11))
+  (segment (start 151.13 101.6) (end 152.4 100.33) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 152.4 100.33) (end 152.4 92.71) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 152.4 92.71) (end 152.4 91.44) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 140.97 91.44) (end 147.32 91.44) (width 0.25) (layer F.Cu) (net 12))
+  (segment (start 147.32 91.44) (end 147.32 91.44) (width 0.25) (layer F.Cu) (net 12) (tstamp 5F67D3A5))
+  (via (at 147.32 91.44) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 152.4 91.44) (end 152.4 91.44) (width 0.25) (layer F.Cu) (net 12) (tstamp 5F67D3A9))
+  (via (at 152.4 91.44) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 147.32 91.44) (end 152.4 91.44) (width 0.25) (layer B.Cu) (net 12))
+  (segment (start 193.2 99.06) (end 194.414001 100.274001) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 194.414001 103.078357) (end 186.69 110.802358) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 194.414001 100.274001) (end 194.414001 103.078357) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 186.69 110.802358) (end 186.69 119.38) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 186.69 119.38) (end 184.392999 121.677001) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 184.392999 121.677001) (end 181.61 124.46) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 181.61 124.46) (end 180.34 125.73) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 180.34 125.73) (end 132.08 125.73) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 132.08 125.73) (end 125.73 119.38) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 125.73 119.38) (end 123.19 116.84) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 123.19 116.84) (end 123.19 115.57) (width 0.25) (layer F.Cu) (net 13))
+  (via (at 123.19 104.14) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
+  (segment (start 123.19 115.57) (end 123.19 115.57) (width 0.25) (layer F.Cu) (net 13) (tstamp 5F67B295))
+  (via (at 123.19 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
+  (segment (start 123.19 104.14) (end 123.19 115.57) (width 0.25) (layer B.Cu) (net 13))
+  (segment (start 123.19 104.14) (end 125.73 101.6) (width 0.25) (layer F.Cu) (net 13))
+  (segment (start 120.65 102.87) (end 120.65 110.49) (width 0.25) (layer F.Cu) (net 15))
+  (via (at 120.65 110.49) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 115.57) (width 0.25) (layer F.Cu) (net 15) (tstamp 5F67B29D))
+  (segment (start 120.65 110.49) (end 120.65 115.57) (width 0.25) (layer B.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 115.57) (width 0.25) (layer B.Cu) (net 15) (tstamp 5F67BD92))
+  (via (at 120.65 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 15))
+  (segment (start 120.65 102.87) (end 124.46 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 124.46 99.06) (end 125.73 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 96.52 99.06) (end 97.95 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 120.65 116.586) (end 119.888 117.348) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 120.65 115.57) (end 120.65 116.586) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 119.888 117.348) (end 105.918 117.348) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 105.918 117.348) (end 95.25 106.68) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 95.25 100.33) (end 96.52 99.06) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 95.25 106.68) (end 95.25 100.33) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 107.95 99.06) (end 106.68 100.33) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 106.68 100.33) (end 106.68 107.79) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 125.73 96.52) (end 110.49 96.52) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 110.49 96.52) (end 107.95 99.06) (width 0.25) (layer F.Cu) (net 17))
+  (segment (start 195.605 98.917) (end 195.605 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 193.198 96.51) (end 195.605 98.917) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 199.335 107.79) (end 199.38 107.79) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 195.605 104.06) (end 199.335 107.79) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 102.87 83.82) (end 97.79 88.9) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.948 89.058) (end 97.948 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.79 88.9) (end 97.948 89.058) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 100.4 104.06) (end 100.355 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 104.13 107.79) (end 100.4 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 100.355 98.917) (end 100.355 104.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 97.948 96.51) (end 100.355 98.917) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 165.11 96.51) (end 193.198 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 157.48 104.14) (end 165.11 96.51) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 151.13 104.14) (end 157.48 104.14) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 123.19 83.82) (end 125.73 81.28) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 102.87 83.82) (end 123.19 83.82) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 151.13 104.14) (end 149.86 102.87) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 149.86 100.33) (end 148.59 99.06) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 149.86 102.87) (end 149.86 100.33) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 148.59 99.06) (end 148.59 82.55) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 127 82.55) (end 125.73 81.28) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 148.59 82.55) (end 127 82.55) (width 0.25) (layer F.Cu) (net 29))
+  (segment (start 117.674 114.3) (end 118.944 115.57) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 118.944 115.57) (end 119.38 115.57) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 119.38 115.57) (end 119.38 115.57) (width 0.25) (layer F.Cu) (net 31) (tstamp 5F68468A))
+  (via (at 119.38 115.57) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 31))
+  (segment (start 120.105001 116.295001) (end 165.898999 116.295001) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 119.38 115.57) (end 120.105001 116.295001) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 165.898999 116.295001) (end 170.18 112.014) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 170.18 112.014) (end 170.18 105.664) (width 0.25) (layer B.Cu) (net 31))
+  (segment (start 170.18 105.664) (end 170.18 105.664) (width 0.25) (layer B.Cu) (net 31) (tstamp 5F68468C))
+  (via (at 170.18 105.664) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 31))
+  (segment (start 170.24 105.604) (end 170.18 105.664) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 170.24 98.9) (end 170.24 105.604) (width 0.25) (layer F.Cu) (net 31))
+  (segment (start 177.74 98.9) (end 177.74 112.208) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 177.74 112.208) (end 181.864 116.332) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 181.864 116.332) (end 181.864 116.332) (width 0.25) (layer F.Cu) (net 32) (tstamp 5F684663))
+  (via (at 181.864 116.332) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 32))
+  (segment (start 181.864 116.332) (end 187.96 116.332) (width 0.25) (layer B.Cu) (net 32))
+  (segment (start 187.96 116.332) (end 187.96 116.332) (width 0.25) (layer B.Cu) (net 32) (tstamp 5F68467D))
+  (via (at 187.96 116.332) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 32))
+  (segment (start 188.142 116.332) (end 187.96 116.332) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 190.174 114.3) (end 188.142 116.332) (width 0.25) (layer F.Cu) (net 32))
+  (segment (start 180.99 112.46) (end 181.62 113.09) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 180.99 98.9) (end 180.99 112.46) (width 0.25) (layer F.Cu) (net 33))
+  (segment (start 167.43 98.9) (end 166.99 98.9) (width 0.25) (layer F.Cu) (net 37))
+  (segment (start 166.99 105.96) (end 181.62 120.59) (width 0.25) (layer F.Cu) (net 37))
+  (segment (start 166.99 98.9) (end 166.99 105.96) (width 0.25) (layer F.Cu) (net 37))
 
 )
diff --git a/cad/cad.sch b/cad/cad.sch
index 7294293..c8c0518 100644
--- a/cad/cad.sch
+++ b/cad/cad.sch
@@ -207,4 +207,92 @@ Wire Wire Line
 	6450 3750 6350 3750
 Wire Wire Line
 	6350 3850 6500 3850
+$Comp
+L cad-parts:TC4056-MOD U2
+U 1 1 5F679D5C
+P 2350 4500
+F 0 "U2" H 2400 4815 50  0000 C CNN
+F 1 "TC4056-MOD" H 2400 4724 50  0000 C CNN
+F 2 "cad-parts:TC4056A-MOD" H 2350 4050 50  0001 C CNN
+F 3 "" H 2350 4600 50  0001 C CNN
+	1    2350 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 2050 5750 2050
+Connection ~ 5950 4350
+$Comp
+L cad-parts:dc-converter U3
+U 1 1 5F69BA43
+P 3550 4700
+F 0 "U3" H 3550 4965 50  0000 C CNN
+F 1 "dc-converter" H 3550 4874 50  0000 C CNN
+F 2 "cad-parts:dc-converter" H 3550 4850 50  0001 C CNN
+F 3 "" H 3550 4750 50  0001 C CNN
+	1    3550 4700
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3950 4700 4800 4700
+Wire Wire Line
+	4800 2050 4800 4700
+Wire Wire Line
+	3950 4600 5950 4600
+Wire Wire Line
+	5950 4350 5950 4600
+Connection ~ 5950 4600
+Wire Wire Line
+	5950 4600 5950 4650
+Wire Wire Line
+	2800 4450 3000 4450
+Wire Wire Line
+	3000 4450 3000 4700
+Wire Wire Line
+	3000 4700 3150 4700
+Wire Wire Line
+	2800 4750 3050 4750
+Wire Wire Line
+	3050 4750 3050 4600
+Wire Wire Line
+	3050 4600 3150 4600
+$Comp
+L cad-parts:18650-batt U4
+U 1 1 5F6CCA6F
+P 2950 5350
+F 0 "U4" H 2975 5085 50  0000 C CNN
+F 1 "18650-batt" H 2975 5176 50  0000 C CNN
+F 2 "cad-parts:18650-batt" H 2950 5350 50  0001 C CNN
+F 3 "" H 2950 5350 50  0001 C CNN
+	1    2950 5350
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	2800 4550 2950 4550
+Wire Wire Line
+	2950 5150 3400 5150
+Wire Wire Line
+	3400 5150 3400 5350
+Wire Wire Line
+	2800 4650 2900 4650
+Wire Wire Line
+	2900 4650 2900 5150
+Wire Wire Line
+	2900 5150 2450 5150
+Wire Wire Line
+	2450 5150 2450 5350
+Wire Wire Line
+	2950 5100 2950 5150
+$Comp
+L Device:D_Schottky D1
+U 1 1 5F6E4965
+P 2950 4950
+F 0 "D1" V 2904 5030 50  0000 L CNN
+F 1 "D_Schottky" V 2995 5030 50  0000 L CNN
+F 2 "Diode_THT:D_A-405_P12.70mm_Horizontal" H 2950 4950 50  0001 C CNN
+F 3 "~" H 2950 4950 50  0001 C CNN
+	1    2950 4950
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2950 4550 2950 4800
 $EndSCHEMATC
diff --git a/cad/cad.sch-bak b/cad/cad.sch-bak
index 0b9c977..3dcda6c 100644
--- a/cad/cad.sch-bak
+++ b/cad/cad.sch-bak
@@ -14,14 +14,285 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L car-parts:nRF24 U1
-U 1 1 5F4CB89A
-P 6000 1950
-F 0 "U1" V 5950 2050 50  0001 C CNN
-F 1 "nRF24" H 6025 2233 50  0000 C CNN
-F 2 "cad-parts:nRF24" V 5950 2050 50  0001 C CNN
-F 3 "" V 5950 2050 50  0001 C CNN
-	1    6000 1950
+L cad-parts:nRF24 U1
+U 1 1 5F508671
+P 7750 3700
+F 0 "U1" V 7700 3800 50  0001 C CNN
+F 1 "nRF24" H 7775 3983 50  0000 C CNN
+F 2 "cad-parts:nRF24" V 7700 3800 50  0001 C CNN
+F 3 "" V 7700 3800 50  0001 C CNN
+	1    7750 3700
 	1    0    0    -1  
 $EndComp
+$Comp
+L cad-parts:JOYSTICK-ALPS J1
+U 1 1 5F50A4B2
+P 8350 3050
+F 0 "J1" H 8528 3646 50  0000 L CNN
+F 1 "JOYSTICK-ALPS" H 8528 3555 50  0000 L CNN
+F 2 "cad-parts:JOYSTICK-ALPS" H 8350 3050 50  0001 C CNN
+F 3 "" H 8350 3050 50  0001 C CNN
+	1    8350 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L cad-parts:JOYSTICK-ALPS J2
+U 1 1 5F510B0B
+P 2600 2700
+F 0 "J2" H 2778 3296 50  0000 L CNN
+F 1 "JOYSTICK-ALPS" H 2778 3205 50  0000 L CNN
+F 2 "cad-parts:JOYSTICK-ALPS" H 2600 2700 50  0001 C CNN
+F 3 "" H 2600 2700 50  0001 C CNN
+	1    2600 2700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7450 3550 7150 3550
+Wire Wire Line
+	6700 3550 6700 4350
+Wire Wire Line
+	5350 3950 5100 3950
+Wire Wire Line
+	5100 3950 5100 4800
+Wire Wire Line
+	5100 4800 7450 4800
+Wire Wire Line
+	7450 4800 7450 3850
+Wire Wire Line
+	5350 4050 5250 4050
+Wire Wire Line
+	5250 4050 5250 4700
+Wire Wire Line
+	5250 4700 7300 4700
+Wire Wire Line
+	7300 4700 7300 3750
+Wire Wire Line
+	7300 3750 7450 3750
+Wire Wire Line
+	8100 3750 8350 3750
+Wire Wire Line
+	8350 3750 8350 4950
+Wire Wire Line
+	8350 4950 4850 4950
+Wire Wire Line
+	4850 4950 4850 3850
+Wire Wire Line
+	4850 3850 5350 3850
+Wire Wire Line
+	5350 3550 4650 3550
+Wire Wire Line
+	4650 3550 4650 5100
+Wire Wire Line
+	4650 5100 8500 5100
+Wire Wire Line
+	8500 5100 8500 3650
+Wire Wire Line
+	8500 3650 8100 3650
+Wire Wire Line
+	7500 2150 7500 2700
+Wire Wire Line
+	7500 3200 8100 3200
+Wire Wire Line
+	8100 3200 8100 3550
+Wire Wire Line
+	8050 2700 7500 2700
+Connection ~ 7500 2700
+Wire Wire Line
+	7500 2700 7500 3200
+Wire Wire Line
+	7150 3550 7150 2300
+Wire Wire Line
+	7150 2300 7700 2300
+Connection ~ 7150 3550
+Wire Wire Line
+	7150 3550 6700 3550
+Wire Wire Line
+	5350 3450 4500 3450
+Wire Wire Line
+	4500 3450 4500 5400
+Wire Wire Line
+	4500 5400 7100 5400
+Wire Wire Line
+	7100 5400 7100 3650
+Wire Wire Line
+	7100 3650 7450 3650
+Wire Wire Line
+	2300 1950 2150 1950
+Wire Wire Line
+	2150 1950 2150 1650
+Wire Wire Line
+	2150 1650 7700 1650
+Wire Wire Line
+	7700 1650 7700 2300
+Connection ~ 7700 2300
+Wire Wire Line
+	7700 2300 8050 2300
+Wire Wire Line
+	2300 2050 2050 2050
+Wire Wire Line
+	2300 2250 2200 2250
+Wire Wire Line
+	2200 2250 2200 3250
+Wire Wire Line
+	2200 3250 4400 3250
+Wire Wire Line
+	4400 3250 4400 1900
+Wire Wire Line
+	4400 1900 6600 1900
+Wire Wire Line
+	2300 2150 2150 2150
+Wire Wire Line
+	2150 2150 2150 3300
+Wire Wire Line
+	2150 3300 4500 3300
+Wire Wire Line
+	4500 3300 4500 1950
+Wire Wire Line
+	4500 1950 6550 1950
+Wire Wire Line
+	8050 2400 5000 2400
+Wire Wire Line
+	5000 2400 5000 3650
+Wire Wire Line
+	5750 2050 5750 2350
+Wire Wire Line
+	7500 2150 5950 2150
+Wire Wire Line
+	5950 2150 5950 2350
+Wire Wire Line
+	5950 2150 3500 2150
+Wire Wire Line
+	3500 2150 3500 2700
+Wire Wire Line
+	3500 2700 2300 2700
+Wire Wire Line
+	2300 2700 2300 2350
+Connection ~ 5950 2150
+Wire Wire Line
+	6500 2600 8050 2600
+Wire Wire Line
+	6700 4350 5950 4350
+Wire Wire Line
+	6500 2600 6500 3850
+$Comp
+L MCU_Module:Arduino_Nano_v2.x A1
+U 1 1 5F50914A
+P 5850 3350
+F 0 "A1" H 5850 2261 50  0000 C CNN
+F 1 "Arduino_Nano_v2.x" H 5850 2170 50  0000 C CNN
+F 2 "Module:Arduino_Nano" H 5850 3350 50  0001 C CIN
+F 3 "https://www.arduino.cc/en/uploads/Main/ArduinoNanoManual23.pdf" H 5850 3350 50  0001 C CNN
+	1    5850 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8050 2500 6450 2500
+Wire Wire Line
+	6450 2500 6450 3750
+Wire Wire Line
+	2050 3750 5350 3750
+Wire Wire Line
+	2050 2050 2050 3750
+Wire Wire Line
+	5000 3650 5350 3650
+Wire Wire Line
+	6550 1950 6550 4050
+Wire Wire Line
+	6600 1900 6600 3950
+Wire Wire Line
+	6550 4050 6350 4050
+Wire Wire Line
+	6600 3950 6350 3950
+Wire Wire Line
+	6450 3750 6350 3750
+Wire Wire Line
+	6350 3850 6500 3850
+$Comp
+L cad-parts:TC4056-MOD U2
+U 1 1 5F679D5C
+P 2350 4500
+F 0 "U2" H 2400 4815 50  0000 C CNN
+F 1 "TC4056-MOD" H 2400 4724 50  0000 C CNN
+F 2 "cad-parts:TC4056A-MOD" H 2350 4050 50  0001 C CNN
+F 3 "" H 2350 4600 50  0001 C CNN
+	1    2350 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 2050 5750 2050
+Connection ~ 5950 4350
+$Comp
+L cad-parts:dc-converter U3
+U 1 1 5F69BA43
+P 3550 4700
+F 0 "U3" H 3550 4965 50  0000 C CNN
+F 1 "dc-converter" H 3550 4874 50  0000 C CNN
+F 2 "cad-parts:dc-converter" H 3550 4850 50  0001 C CNN
+F 3 "" H 3550 4750 50  0001 C CNN
+	1    3550 4700
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3950 4700 4800 4700
+Wire Wire Line
+	4800 2050 4800 4700
+Wire Wire Line
+	3950 4600 5950 4600
+Wire Wire Line
+	5950 4350 5950 4600
+Connection ~ 5950 4600
+Wire Wire Line
+	5950 4600 5950 4650
+Wire Wire Line
+	2800 4450 3000 4450
+Wire Wire Line
+	3000 4450 3000 4700
+Wire Wire Line
+	3000 4700 3150 4700
+Wire Wire Line
+	2800 4750 3050 4750
+Wire Wire Line
+	3050 4750 3050 4600
+Wire Wire Line
+	3050 4600 3150 4600
+$Comp
+L cad-parts:18650-batt U4
+U 1 1 5F6CCA6F
+P 2950 5350
+F 0 "U4" H 2975 5085 50  0000 C CNN
+F 1 "18650-batt" H 2975 5176 50  0000 C CNN
+F 2 "cad-parts:18650-batt" H 2950 5350 50  0001 C CNN
+F 3 "" H 2950 5350 50  0001 C CNN
+	1    2950 5350
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	2800 4550 2950 4550
+Wire Wire Line
+	2950 5150 3400 5150
+Wire Wire Line
+	3400 5150 3400 5350
+Wire Wire Line
+	2800 4650 2900 4650
+Wire Wire Line
+	2900 4650 2900 5150
+Wire Wire Line
+	2900 5150 2450 5150
+Wire Wire Line
+	2450 5150 2450 5350
+Wire Wire Line
+	2950 5100 2950 5150
+$Comp
+L Device:D_Schottky D?
+U 1 1 5F6E4965
+P 2950 4950
+F 0 "D?" V 2904 5030 50  0000 L CNN
+F 1 "D_Schottky" V 2995 5030 50  0000 L CNN
+F 2 "" H 2950 4950 50  0001 C CNN
+F 3 "~" H 2950 4950 50  0001 C CNN
+	1    2950 4950
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2950 4550 2950 4800
 $EndSCHEMATC