diff --git a/faceplate/gay-ipod-faceplate.kicad_prl b/faceplate/gay-ipod-faceplate.kicad_prl
index 5f53c63..8620e97 100644
--- a/faceplate/gay-ipod-faceplate.kicad_prl
+++ b/faceplate/gay-ipod-faceplate.kicad_prl
@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 31,
+    "active_layer": 0,
     "active_layer_preset": "All Layers",
     "auto_track_width": true,
     "hidden_nets": [],
diff --git a/mainboard/audio.kicad_sch b/mainboard/audio.kicad_sch
index 4f43adc..04ad0fa 100644
--- a/mainboard/audio.kicad_sch
+++ b/mainboard/audio.kicad_sch
@@ -397,198 +397,6 @@
         )
       )
     )
-    (symbol "Transistor_FET:DMC2053UVT" (pin_names hide) (in_bom yes) (on_board yes)
-      (property "Reference" "Q" (id 0) (at 3.175 1.27 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Value" "DMC2053UVT" (id 1) (at 3.175 -1.27 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:TSOT-23-6" (id 2) (at -1.27 -12.065 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMC2053UVT.pdf" (id 3) (at -2.54 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "complementary mosfet" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "4.6A/-3.2A Id, 20V Vds, Complementary pair enhancement mode P-Channel and N-Channel MOSFET, TSOT-23-6" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "TSOT?23*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "DMC2053UVT_0_1"
-        (circle (center -0.889 0) (radius 2.794)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 0 -1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy -2.286 0)
-            (xy -5.08 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -2.286 1.905)
-            (xy -2.286 -1.905)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.778 -1.27)
-            (xy -1.778 -2.286)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.778 0.508)
-            (xy -1.778 -0.508)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.778 2.286)
-            (xy -1.778 1.27)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 2.54)
-            (xy 0 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 -2.54)
-            (xy 0 0)
-            (xy -1.778 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -1.778 -1.778)
-            (xy 0.762 -1.778)
-            (xy 0.762 1.778)
-            (xy -1.778 1.778)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 0 1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-      )
-      (symbol "DMC2053UVT_1_1"
-        (polyline
-          (pts
-            (xy -1.524 0)
-            (xy -0.508 0.381)
-            (xy -0.508 -0.381)
-            (xy -1.524 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 0.254 0.508)
-            (xy 0.381 0.381)
-            (xy 1.143 0.381)
-            (xy 1.27 0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 0.381)
-            (xy 0.381 -0.254)
-            (xy 1.143 -0.254)
-            (xy 0.762 0.381)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (pin passive line (at -7.62 0 0) (length 2.54)
-          (name "G" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -5.08 90) (length 2.54)
-          (name "S" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-      )
-      (symbol "DMC2053UVT_2_1"
-        (polyline
-          (pts
-            (xy -0.254 0)
-            (xy -1.27 0.381)
-            (xy -1.27 -0.381)
-            (xy -0.254 0)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 0.254 -0.508)
-            (xy 0.381 -0.381)
-            (xy 1.143 -0.381)
-            (xy 1.27 -0.254)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.762 -0.381)
-            (xy 0.381 0.254)
-            (xy 1.143 0.254)
-            (xy 0.762 -0.381)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (pin passive line (at 0 -5.08 90) (length 2.54)
-          (name "S" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -7.62 0 0) (length 2.54)
-          (name "G" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 5.08 270) (length 2.54)
-          (name "D" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "power:+3V3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
@@ -681,46 +489,6 @@
         )
       )
     )
-    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "PWR_FLAG_0_0"
-        (pin power_out line (at 0 0 90) (length 0)
-          (name "pwr" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-      (symbol "PWR_FLAG_0_1"
-        (polyline
-          (pts
-            (xy 0 0)
-            (xy 0 1.27)
-            (xy -1.016 1.905)
-            (xy 0 2.54)
-            (xy 1.016 1.905)
-            (xy 0 1.27)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-    )
     (symbol "symbols:LM4917" (in_bom yes) (on_board yes)
       (property "Reference" "U" (id 0) (at 0 0 0)
         (effects (font (size 1.27 1.27)))
@@ -1214,1649 +982,1488 @@
     )
   )
 
-  (junction (at 120.015 83.185) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 101.6) (diameter 0) (color 0 0 0 0)
     (uuid 01e5e0ab-74db-4afb-b938-f8934cd13185)
   )
-  (junction (at 55.88 66.04) (diameter 0) (color 0 0 0 0)
+  (junction (at 70.485 84.455) (diameter 0) (color 0 0 0 0)
     (uuid 02721ca4-90d4-49e7-9c97-6774caa8a3ae)
   )
-  (junction (at 120.015 75.565) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 0a5f308f-8ec3-4450-badf-b008f0985d2a)
   )
-  (junction (at 120.015 73.025) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 91.44) (diameter 0) (color 0 0 0 0)
     (uuid 121b2008-dade-4818-8441-b05949c50926)
   )
-  (junction (at 189.865 42.545) (diameter 0) (color 0 0 0 0)
+  (junction (at 186.055 60.96) (diameter 0) (color 0 0 0 0)
     (uuid 1bbded29-5fb0-48d5-bd09-b649de4d9fa8)
   )
-  (junction (at 205.74 102.87) (diameter 0) (color 0 0 0 0)
+  (junction (at 201.93 121.285) (diameter 0) (color 0 0 0 0)
     (uuid 2256bfa1-b9ea-4404-afe3-1a51720895bf)
   )
-  (junction (at 199.39 42.545) (diameter 0) (color 0 0 0 0)
+  (junction (at 42.545 50.165) (diameter 0) (color 0 0 0 0)
+    (uuid 2836294a-fcf4-488b-8697-f419aa7c7170)
+  )
+  (junction (at 195.58 60.96) (diameter 0) (color 0 0 0 0)
     (uuid 299cac9d-580a-4857-b29e-b7ce2fbdbb9d)
   )
-  (junction (at 27.94 48.895) (diameter 0) (color 0 0 0 0)
-    (uuid 37f32edb-3350-4cfa-9f38-0f34552b2f68)
-  )
-  (junction (at 104.14 107.315) (diameter 0) (color 0 0 0 0)
+  (junction (at 118.745 125.73) (diameter 0) (color 0 0 0 0)
     (uuid 38e20a08-230a-45df-93ee-e610ee2d3f06)
   )
-  (junction (at 74.295 185.42) (diameter 0) (color 0 0 0 0)
-    (uuid 3b434cc4-905c-4360-be1c-39b245dd47f0)
+  (junction (at 42.545 67.31) (diameter 0) (color 0 0 0 0)
+    (uuid 4cc18642-37fa-4c85-852d-3a45feae11b7)
   )
-  (junction (at 189.865 50.165) (diameter 0) (color 0 0 0 0)
+  (junction (at 186.055 68.58) (diameter 0) (color 0 0 0 0)
     (uuid 54417f81-5c8c-4ba6-b13e-425090521504)
   )
-  (junction (at 45.085 48.895) (diameter 0) (color 0 0 0 0)
+  (junction (at 59.69 67.31) (diameter 0) (color 0 0 0 0)
     (uuid 59d20ad2-6edf-4a37-a0f0-7eec9ab8b3d5)
   )
-  (junction (at 55.88 31.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 70.485 50.165) (diameter 0) (color 0 0 0 0)
     (uuid 5b03dab2-d33f-465c-a5d2-d00c01735cb3)
   )
-  (junction (at 101.6 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 116.205 122.555) (diameter 0) (color 0 0 0 0)
     (uuid 5b5933c4-b9db-4d03-8c69-7a195558f8eb)
   )
-  (junction (at 241.935 82.55) (diameter 0) (color 0 0 0 0)
+  (junction (at 238.125 100.965) (diameter 0) (color 0 0 0 0)
     (uuid 5ef6fdab-76af-49f1-835c-550fbf8786ec)
   )
-  (junction (at 187.96 88.9) (diameter 0) (color 0 0 0 0)
+  (junction (at 184.15 107.315) (diameter 0) (color 0 0 0 0)
     (uuid 623bde36-1740-49b4-a814-893a84f95c8d)
   )
-  (junction (at 231.14 82.55) (diameter 0) (color 0 0 0 0)
+  (junction (at 227.33 100.965) (diameter 0) (color 0 0 0 0)
     (uuid 6260a637-fb92-4e7f-953f-43899a032c5d)
   )
-  (junction (at 45.085 76.2) (diameter 0) (color 0 0 0 0)
+  (junction (at 59.69 94.615) (diameter 0) (color 0 0 0 0)
     (uuid 6dc13d71-e311-4282-9d6d-bc12ec77965e)
   )
-  (junction (at 180.975 42.545) (diameter 0) (color 0 0 0 0)
+  (junction (at 177.165 60.96) (diameter 0) (color 0 0 0 0)
     (uuid 6e71b821-519d-466c-977f-ad45c6c1e9f0)
   )
-  (junction (at 36.195 66.04) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 84.455) (diameter 0) (color 0 0 0 0)
     (uuid 72884817-d17d-4ec2-bf2e-7c0deab2caab)
   )
-  (junction (at 203.2 56.515) (diameter 0) (color 0 0 0 0)
+  (junction (at 199.39 74.93) (diameter 0) (color 0 0 0 0)
     (uuid 78cbdd12-478c-47ed-80f4-c13a36cb36cd)
   )
-  (junction (at 69.215 165.735) (diameter 0) (color 0 0 0 0)
-    (uuid 83d67b29-e6ad-4d6f-836a-bff9181830fe)
-  )
-  (junction (at 45.085 59.055) (diameter 0) (color 0 0 0 0)
+  (junction (at 59.69 77.47) (diameter 0) (color 0 0 0 0)
     (uuid 91ed75da-88cd-42f6-9fe4-c25e0e3aff06)
   )
-  (junction (at 209.55 102.87) (diameter 0) (color 0 0 0 0)
+  (junction (at 205.74 121.285) (diameter 0) (color 0 0 0 0)
     (uuid 924cbd29-214f-4c8d-919e-7b45744c3c8d)
   )
-  (junction (at 104.14 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 118.745 122.555) (diameter 0) (color 0 0 0 0)
     (uuid 9646c635-c555-492b-921b-2170976f95a8)
   )
-  (junction (at 205.74 97.79) (diameter 0) (color 0 0 0 0)
+  (junction (at 201.93 116.205) (diameter 0) (color 0 0 0 0)
     (uuid a08a33f5-955b-4d91-961c-c72fe60d0bee)
   )
-  (junction (at 36.195 48.895) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 67.31) (diameter 0) (color 0 0 0 0)
     (uuid b4b61f29-89e0-44f7-8a1c-f9a8dc14b0f3)
   )
-  (junction (at 120.015 78.105) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 96.52) (diameter 0) (color 0 0 0 0)
     (uuid b5891120-9e1b-47d6-8416-657309506164)
   )
-  (junction (at 120.015 107.315) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 125.73) (diameter 0) (color 0 0 0 0)
     (uuid b8f7ba47-c05d-474d-ba40-3124a77dd570)
   )
-  (junction (at 165.1 65.405) (diameter 0) (color 0 0 0 0)
+  (junction (at 161.29 83.82) (diameter 0) (color 0 0 0 0)
     (uuid bdc852e9-701a-4d07-94c2-fa5768375dac)
   )
-  (junction (at 37.465 31.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 52.07 50.165) (diameter 0) (color 0 0 0 0)
     (uuid c762f864-d489-4d04-a6ba-8e2f348fe11b)
   )
-  (junction (at 236.855 77.47) (diameter 0) (color 0 0 0 0)
+  (junction (at 233.045 95.885) (diameter 0) (color 0 0 0 0)
     (uuid cce521a9-35ea-47f8-b248-475b445e29f4)
   )
-  (junction (at 37.465 41.275) (diameter 0) (color 0 0 0 0)
+  (junction (at 52.07 59.69) (diameter 0) (color 0 0 0 0)
     (uuid ce34605a-b244-417e-a2c2-c8804443a621)
   )
-  (junction (at 36.195 76.2) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 94.615) (diameter 0) (color 0 0 0 0)
     (uuid d28d25ff-a176-4458-ad65-3cbf69375442)
   )
-  (junction (at 46.355 41.275) (diameter 0) (color 0 0 0 0)
+  (junction (at 60.96 59.69) (diameter 0) (color 0 0 0 0)
     (uuid d8a10320-6598-45c0-8e35-11b2b6901948)
   )
-  (junction (at 55.88 48.895) (diameter 0) (color 0 0 0 0)
+  (junction (at 70.485 67.31) (diameter 0) (color 0 0 0 0)
     (uuid dedcd126-9125-4c35-845b-d6f6d07462d8)
   )
-  (junction (at 46.355 31.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 60.96 50.165) (diameter 0) (color 0 0 0 0)
     (uuid e0d3b36a-b5e4-46d0-bfe7-930d3cd3cd4d)
   )
-  (junction (at 83.185 85.725) (diameter 0) (color 0 0 0 0)
+  (junction (at 97.79 104.14) (diameter 0) (color 0 0 0 0)
     (uuid e4fbe00b-7668-43bb-ab37-c1be18612cd9)
   )
-  (junction (at 180.975 50.165) (diameter 0) (color 0 0 0 0)
+  (junction (at 177.165 68.58) (diameter 0) (color 0 0 0 0)
     (uuid eb742872-979b-4b12-b682-64baf1978900)
   )
-  (junction (at 165.1 62.865) (diameter 0) (color 0 0 0 0)
+  (junction (at 161.29 81.28) (diameter 0) (color 0 0 0 0)
     (uuid ee2c426e-c177-4dfa-b2e4-94079fdd29d6)
   )
-  (junction (at 231.14 77.47) (diameter 0) (color 0 0 0 0)
+  (junction (at 227.33 95.885) (diameter 0) (color 0 0 0 0)
     (uuid f9f37a25-a2ea-4c5e-8b2a-8392d916ce4f)
   )
-  (junction (at 36.195 59.055) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 77.47) (diameter 0) (color 0 0 0 0)
     (uuid fa7db1c1-a498-4889-b5e3-2bccbeb965df)
   )
-  (junction (at 45.085 66.04) (diameter 0) (color 0 0 0 0)
+  (junction (at 59.69 84.455) (diameter 0) (color 0 0 0 0)
     (uuid fc2b7290-f7fa-4731-96cb-ee2b4b66f47c)
   )
 
   (no_connect (at -332.105 50.165) (uuid 150c665f-2126-40c1-a0ff-0df2450de138))
-  (no_connect (at 214.63 96.52) (uuid c4e056e5-d2e2-4c80-b810-42855130ab76))
+  (no_connect (at 210.82 114.935) (uuid c4e056e5-d2e2-4c80-b810-42855130ab76))
   (no_connect (at 229.87 256.54) (uuid cc1da953-d48c-4e91-a21c-2f31b608c95e))
 
-  (polyline (pts (xy 13.97 197.485) (xy 13.97 146.05))
+  (bus_entry (at 87.63 93.98) (size 2.54 2.54)
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0094d882-9f29-4ed4-9668-7e44cbb9e69c)
+    (uuid 0d25bd72-4990-4c81-b838-c5f13442daa2)
+  )
+  (bus_entry (at 87.63 91.44) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0d25bd72-4990-4c81-b838-c5f13442daa3)
+  )
+  (bus_entry (at 88.265 78.74) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 45efdfe7-86cc-4937-ac8c-bf63d5705bcd)
+  )
+  (bus_entry (at 88.265 81.28) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 57fbd346-b97d-4720-a401-81307ce74155)
+  )
+  (bus_entry (at 88.265 86.36) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 847d1c98-7acf-4975-8e1c-5cffd083b63c)
+  )
+  (bus_entry (at 88.265 83.82) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9ede832a-50dd-439a-a6a5-30b78519c3ca)
   )
 
-  (wire (pts (xy 250.825 67.31) (xy 250.825 69.85))
+  (wire (pts (xy 247.015 85.725) (xy 247.015 88.265))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 02e679de-d679-4453-ac22-c2fadf0d714e)
   )
-  (wire (pts (xy 38.735 160.655) (xy 41.275 160.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 033c09ed-9787-47ac-9bce-5c8a95039a35)
-  )
-  (wire (pts (xy 45.085 56.515) (xy 45.085 59.055))
+  (wire (pts (xy 59.69 74.93) (xy 59.69 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04f2d3fb-d93f-4f8d-85d4-e9401a91bae6)
   )
-  (wire (pts (xy 187.96 62.865) (xy 187.96 77.47))
+  (wire (pts (xy 184.15 81.28) (xy 184.15 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 052b70ee-bd52-47fc-8914-10cbdd0aae1c)
   )
-  (wire (pts (xy 156.845 65.405) (xy 156.845 66.675))
+  (wire (pts (xy 153.035 83.82) (xy 153.035 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 05ba5ce2-d39c-42fe-8393-1d402d0348d7)
   )
-  (wire (pts (xy 119.38 86.995) (xy 119.38 88.265))
+  (wire (pts (xy 133.985 105.41) (xy 133.985 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 062b4ef0-9c85-4996-9cd6-c420b69100f5)
   )
-  (wire (pts (xy 119.38 75.565) (xy 120.015 75.565))
+  (wire (pts (xy 133.985 93.98) (xy 134.62 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0658d674-9a0c-40b4-8b8a-b423dbcf8e52)
   )
-  (wire (pts (xy 55.88 39.37) (xy 55.88 41.275))
+  (wire (pts (xy 70.485 57.785) (xy 70.485 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 08450501-8874-4faf-8d81-720868b6e4e2)
   )
-  (wire (pts (xy 251.46 62.23) (xy 250.825 62.23))
+  (wire (pts (xy 247.65 80.645) (xy 247.015 80.645))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 085f264c-4e57-4cc5-a505-fa977d3f9167)
   )
-  (wire (pts (xy 101.6 104.14) (xy 104.14 104.14))
+  (wire (pts (xy 116.205 122.555) (xy 118.745 122.555))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 08dd26e5-02ef-487a-9ba8-47dee1fcf40e)
   )
-  (wire (pts (xy 36.195 59.055) (xy 36.195 59.69))
+  (wire (pts (xy 50.8 77.47) (xy 50.8 78.105))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 08e2d335-98ca-49eb-bd19-500d77ebea73)
   )
-  (wire (pts (xy 251.46 67.31) (xy 250.825 67.31))
+  (wire (pts (xy 247.65 85.725) (xy 247.015 85.725))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09185228-008c-497c-bffa-dc986ea7f7c2)
   )
-  (wire (pts (xy 158.115 62.865) (xy 156.845 62.865))
+  (wire (pts (xy 154.305 81.28) (xy 153.035 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 092676e2-57c5-4cf7-9bf6-97c0ba8a5829)
   )
-  (wire (pts (xy 231.14 82.55) (xy 231.14 109.855))
+  (wire (pts (xy 227.33 100.965) (xy 227.33 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09d2ae3e-ed7b-418c-87f0-c709cae2c486)
   )
-  (wire (pts (xy 156.845 62.865) (xy 156.845 61.595))
+  (wire (pts (xy 153.035 81.28) (xy 153.035 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0a7c21e0-8e01-4ff9-b6e5-cc36eae473b6)
   )
-  (wire (pts (xy 151.765 65.405) (xy 151.765 66.675))
+  (wire (pts (xy 147.955 83.82) (xy 147.955 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0b1d8443-5c10-4d16-b92a-05129c78a12b)
   )
-  (wire (pts (xy 231.14 109.855) (xy 198.755 109.855))
+  (wire (pts (xy 227.33 128.27) (xy 194.945 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0d4d02dc-d175-4a9e-b42a-46fb29999787)
   )
-  (wire (pts (xy 213.36 62.23) (xy 213.36 63.5))
+  (wire (pts (xy 209.55 80.645) (xy 209.55 81.915))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0dbf312c-7a07-4354-a69a-8e5a59a77c2f)
   )
-  (wire (pts (xy 224.79 82.55) (xy 231.14 82.55))
+  (wire (pts (xy 220.98 100.965) (xy 227.33 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0e3c41a5-c0d1-475a-9d86-f4c227c15d29)
   )
-  (wire (pts (xy 36.195 59.055) (xy 45.085 59.055))
+  (wire (pts (xy 50.8 77.47) (xy 59.69 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0ef7a471-77a4-45e6-bbb0-09613a6d9d76)
   )
-  (wire (pts (xy 36.195 51.435) (xy 36.195 48.895))
+  (wire (pts (xy 50.8 69.85) (xy 50.8 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 131dd0ff-085c-4851-b3b1-f9b7bd57e0ac)
   )
-  (wire (pts (xy 37.465 31.75) (xy 46.355 31.75))
+  (wire (pts (xy 52.07 50.165) (xy 60.96 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 13c7f1df-fffe-41a7-8717-c02a52ae58c2)
   )
-  (polyline (pts (xy 93.345 197.485) (xy 175.895 197.485))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1598574c-63d2-45af-a123-f132bb5fac9e)
-  )
-  (polyline (pts (xy 13.97 197.485) (xy 92.075 197.485))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1643b91c-8da1-43be-ab8a-3e2549b9da2f)
-  )
-
-  (wire (pts (xy 45.085 48.895) (xy 55.88 48.895))
+  (wire (pts (xy 59.69 67.31) (xy 70.485 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 191caef7-ed09-4023-add4-3d6cb7b7c1e2)
   )
-  (wire (pts (xy 251.46 82.55) (xy 248.92 82.55))
+  (wire (pts (xy 247.65 100.965) (xy 245.11 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 19ec6636-ff11-4b08-b2f2-39256d948c72)
   )
-  (wire (pts (xy 180.975 50.165) (xy 180.975 50.8))
+  (wire (pts (xy 177.165 68.58) (xy 177.165 69.215))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a3cb48b-e470-475b-be15-ab7e065f9fe2)
   )
-  (wire (pts (xy 60.96 31.75) (xy 60.96 46.355))
+  (wire (pts (xy 75.565 50.165) (xy 75.565 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1c27afd9-ca60-45cb-b062-98339fc0a923)
   )
-  (wire (pts (xy 124.46 107.315) (xy 120.015 107.315))
+  (bus (pts (xy 88.265 78.74) (xy 88.265 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1cb51798-b67f-41e5-b54d-56432f424c89)
+  )
+
+  (wire (pts (xy 139.065 125.73) (xy 134.62 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1dac0315-3ad9-4162-b62f-a35961e1ac6e)
   )
-  (wire (pts (xy 119.38 95.885) (xy 124.46 95.885))
+  (wire (pts (xy 133.985 114.3) (xy 139.065 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1ddc33f7-6e73-4099-a28a-3d7213ca077a)
   )
-  (wire (pts (xy 165.1 38.1) (xy 194.945 38.1))
+  (wire (pts (xy 161.29 55.245) (xy 191.135 55.245))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1e5b162c-1c19-445c-8ba3-2b37ee67e1bc)
   )
-  (wire (pts (xy 180.975 42.545) (xy 180.975 43.815))
+  (wire (pts (xy 177.165 60.96) (xy 177.165 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 21ad0ab0-6a63-47d6-9535-940b2ee37ce9)
   )
-  (wire (pts (xy 199.39 42.545) (xy 203.2 42.545))
+  (wire (pts (xy 195.58 60.96) (xy 199.39 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 22a4c135-02ad-4e03-b24a-3379c296ac8f)
   )
-  (wire (pts (xy 203.2 53.975) (xy 203.2 56.515))
+  (wire (pts (xy 199.39 72.39) (xy 199.39 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 254a97f6-3b25-4385-8aae-5f8ee6f621d4)
   )
-  (wire (pts (xy 27.94 31.75) (xy 37.465 31.75))
+  (wire (pts (xy 42.545 50.165) (xy 52.07 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 275e9c44-73d5-4f88-a6b1-cdaa798eb5ef)
   )
-  (wire (pts (xy 104.14 57.785) (xy 104.14 46.355))
+  (wire (pts (xy 118.745 76.2) (xy 118.745 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 27b17d09-4bcd-4a70-8054-faf71e52c881)
   )
-  (wire (pts (xy 119.38 62.865) (xy 151.765 62.865))
+  (wire (pts (xy 133.985 81.28) (xy 147.955 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2c6b3de3-c5cc-4c2a-bf19-e3da1919d5f4)
   )
-  (wire (pts (xy 189.865 42.545) (xy 189.865 43.815))
+  (wire (pts (xy 186.055 60.96) (xy 186.055 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2eb865d7-a50e-44dd-8e5e-7a9500fc3653)
   )
-  (wire (pts (xy 45.085 48.895) (xy 45.085 51.435))
+  (wire (pts (xy 59.69 67.31) (xy 59.69 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f45f0db-4090-464d-96dd-1c75e77309c6)
   )
-  (wire (pts (xy 83.185 93.345) (xy 83.82 93.345))
+  (wire (pts (xy 97.79 111.76) (xy 98.425 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2f72ca83-4aa8-4640-80de-a7a35f417568)
   )
-  (wire (pts (xy 236.855 77.47) (xy 236.855 89.535))
+  (wire (pts (xy 233.045 95.885) (xy 233.045 107.95))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3068d3f4-d1ae-47bf-86e3-8a693a63c68f)
   )
-  (wire (pts (xy 189.865 48.895) (xy 189.865 50.165))
+  (wire (pts (xy 186.055 67.31) (xy 186.055 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30ee252a-da6f-401e-8101-4a62abcc1aae)
   )
-  (wire (pts (xy 37.465 41.275) (xy 46.355 41.275))
+  (wire (pts (xy 52.07 59.69) (xy 60.96 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 31b05c30-f274-4491-ab6f-b333c4920641)
   )
-  (wire (pts (xy 218.44 96.52) (xy 218.44 102.87))
+  (wire (pts (xy 214.63 114.935) (xy 214.63 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 32a86452-b07c-4c46-87ed-c0728f5b0c8d)
   )
-  (wire (pts (xy 185.42 65.405) (xy 165.1 65.405))
+  (bus (pts (xy 86.995 78.105) (xy 88.265 78.105))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 335bb3b3-7010-4d0e-b8e4-740c38bd51f4)
+  )
+
+  (wire (pts (xy 181.61 83.82) (xy 161.29 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 361dc56d-5438-48a0-ae55-342c444724e5)
   )
-  (wire (pts (xy 83.185 62.865) (xy 83.82 62.865))
+  (wire (pts (xy 227.33 55.245) (xy 227.33 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 36b87f8d-5d8e-4e77-b00a-85ecb1bbbca0)
+    (uuid 3a686be7-7ac0-4604-84f1-15e3d8b9c80d)
   )
-  (wire (pts (xy 99.06 104.14) (xy 101.6 104.14))
+  (wire (pts (xy 113.665 122.555) (xy 116.205 122.555))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3deff093-cf8f-4448-bb6d-6b95c6e4baca)
   )
-  (wire (pts (xy 45.085 66.04) (xy 45.085 67.945))
+  (wire (pts (xy 59.69 84.455) (xy 59.69 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e2e98c3-c510-44a7-9976-d7ed8cbf833b)
   )
-  (wire (pts (xy 120.015 70.485) (xy 120.015 73.025))
+  (wire (pts (xy 134.62 88.9) (xy 134.62 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 40da5f70-9e48-41cb-a664-89358c20d53f)
   )
-  (wire (pts (xy 241.935 82.55) (xy 241.935 80.01))
+  (wire (pts (xy 238.125 100.965) (xy 238.125 98.425))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 41dc6942-bb9c-4e63-95fc-338cfd511953)
   )
-  (wire (pts (xy 27.305 48.895) (xy 27.94 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4498d214-859f-4a06-940a-50b391361b1d)
-  )
-  (wire (pts (xy 83.82 48.895) (xy 55.88 48.895))
+  (wire (pts (xy 98.425 67.31) (xy 70.485 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44b8df86-5adb-42fb-8fc3-d61604cff637)
   )
-  (wire (pts (xy 187.96 88.9) (xy 187.96 91.44))
+  (wire (pts (xy 184.15 107.315) (xy 184.15 109.855))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 474ffb07-fbd1-461f-88e8-7bd5231751f9)
   )
-  (polyline (pts (xy 13.97 146.05) (xy 92.075 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4b4d7eeb-7503-4519-a417-96ed892b1dbd)
-  )
-
-  (wire (pts (xy 83.185 83.185) (xy 83.185 85.725))
+  (wire (pts (xy 97.79 101.6) (xy 97.79 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4b5f2b5b-6d19-4900-9455-46887484c31e)
   )
-  (wire (pts (xy 55.88 56.515) (xy 55.88 59.055))
+  (wire (pts (xy 70.485 74.93) (xy 70.485 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4c1af24d-b973-414a-a60f-4f1e2b7d7da8)
   )
-  (wire (pts (xy 45.085 73.025) (xy 45.085 76.2))
+  (wire (pts (xy 88.9 111.76) (xy 92.71 111.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4d797a63-d2a6-43f5-85cf-d8cbb9b189bc)
+  )
+  (wire (pts (xy 59.69 91.44) (xy 59.69 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4dcf5903-a854-4e2a-aa2d-8db2ac86c3f0)
   )
-  (wire (pts (xy 122.555 92.075) (xy 119.38 92.075))
+  (wire (pts (xy 137.16 110.49) (xy 133.985 110.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e5b2b41-c471-4810-a9e2-7ee5ac8d7dc9)
   )
-  (wire (pts (xy 165.1 62.865) (xy 163.195 62.865))
+  (wire (pts (xy 161.29 81.28) (xy 159.385 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4f9a7b1e-5399-4776-a295-eb26cb9a9edd)
   )
-  (wire (pts (xy 119.38 73.025) (xy 120.015 73.025))
+  (wire (pts (xy 133.985 91.44) (xy 134.62 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5001c547-3c45-487c-8338-4d15bee02bfc)
   )
-  (polyline (pts (xy 92.075 146.05) (xy 92.075 197.485))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5248bf49-26be-4e37-9829-00b538fac61b)
-  )
-
-  (wire (pts (xy 46.355 31.75) (xy 55.88 31.75))
+  (wire (pts (xy 60.96 50.165) (xy 70.485 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 549f10db-d9a3-4d9d-9f83-aaef02cbb472)
   )
-  (wire (pts (xy 158.115 65.405) (xy 156.845 65.405))
+  (wire (pts (xy 154.305 83.82) (xy 153.035 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 569d6f34-903a-4153-abf6-52b35ede8f91)
   )
-  (wire (pts (xy 185.42 65.405) (xy 185.42 82.55))
+  (wire (pts (xy 181.61 83.82) (xy 181.61 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 571ca7fe-36d7-42ef-97d7-f7304c77cef1)
   )
-  (wire (pts (xy 124.46 104.775) (xy 124.46 107.315))
+  (wire (pts (xy 139.065 123.19) (xy 139.065 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 578d6989-8fc5-4b8a-ad71-ef96c6ca0407)
   )
-  (wire (pts (xy 46.355 31.75) (xy 46.355 34.29))
+  (wire (pts (xy 60.96 50.165) (xy 60.96 52.705))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5b3ed19b-a507-4e73-b633-cf1dfc7b366e)
   )
-  (wire (pts (xy 64.77 165.735) (xy 69.215 165.735))
+  (bus (pts (xy 87.63 91.44) (xy 87.63 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5b78a1fc-a850-43b3-a62f-b2c5b7842f0e)
+    (uuid 5cd3a58c-7d35-4319-96f8-cbc4dcff2965)
   )
-  (wire (pts (xy 83.185 83.185) (xy 83.82 83.185))
+
+  (wire (pts (xy 97.79 101.6) (xy 98.425 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5ce77b2f-d495-4f8d-952b-040cd5017c4d)
   )
-  (wire (pts (xy 175.895 42.545) (xy 180.975 42.545))
+  (wire (pts (xy 172.085 60.96) (xy 177.165 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5d2398d8-595b-421f-ad59-13ddf9e8bfc6)
   )
-  (wire (pts (xy 120.015 78.105) (xy 120.015 83.185))
+  (wire (pts (xy 134.62 96.52) (xy 134.62 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5e3fd73e-ed36-415f-acc5-c60fb603cb4c)
   )
-  (wire (pts (xy 55.88 73.025) (xy 55.88 76.2))
+  (wire (pts (xy 70.485 91.44) (xy 70.485 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5ed4bd0a-84dd-4556-8cdd-1478a7f8924b)
   )
-  (wire (pts (xy 36.195 73.025) (xy 36.195 76.2))
+  (wire (pts (xy 50.8 91.44) (xy 50.8 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5ffd108d-01e5-46ac-9392-431df275d8aa)
   )
-  (polyline (pts (xy 175.895 146.05) (xy 175.895 197.485))
+  (wire (pts (xy 90.17 96.52) (xy 98.425 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 60cb3283-40eb-48b2-8604-a0f5d62bd2ba)
+    (uuid 625b9f92-22c2-417f-a033-5bc26662dee0)
   )
-
-  (wire (pts (xy 27.94 48.895) (xy 27.94 66.04))
+  (wire (pts (xy 42.545 67.31) (xy 42.545 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 64289619-8eca-4f2c-b30a-74b9b1dff4ee)
   )
-  (wire (pts (xy 55.88 67.945) (xy 55.88 66.04))
+  (wire (pts (xy 70.485 86.36) (xy 70.485 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 64a77574-7b4d-43d1-b32b-f07083d42266)
   )
-  (wire (pts (xy 189.865 42.545) (xy 199.39 42.545))
+  (wire (pts (xy 186.055 60.96) (xy 195.58 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 654b03ec-0948-4a05-8b19-56079e86a3fd)
   )
-  (wire (pts (xy 55.88 34.29) (xy 55.88 31.75))
+  (wire (pts (xy 42.545 50.165) (xy 42.545 67.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6708bf67-b83d-4987-bba0-e927fcc32075)
+  )
+  (wire (pts (xy 70.485 52.705) (xy 70.485 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a56f9ae-100f-41d1-ab0b-8afe1f42e3d2)
   )
-  (wire (pts (xy 250.825 53.34) (xy 250.825 54.61))
+  (wire (pts (xy 247.015 71.755) (xy 247.015 73.025))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6b375084-040d-41f5-b327-c26705e11467)
   )
-  (wire (pts (xy 74.93 185.42) (xy 74.295 185.42))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6ba2a1f8-0216-4dae-a910-8129c7f2c73b)
-  )
-  (wire (pts (xy 199.39 50.165) (xy 199.39 48.895))
+  (wire (pts (xy 195.58 68.58) (xy 195.58 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6e99d058-c22b-4cf3-927b-fd396ce1461e)
   )
-  (wire (pts (xy 120.015 104.775) (xy 120.015 107.315))
+  (wire (pts (xy 134.62 123.19) (xy 134.62 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f3eab04-9125-4a7d-8130-b63851035ef0)
   )
-  (wire (pts (xy 45.085 59.055) (xy 55.88 59.055))
+  (wire (pts (xy 59.69 77.47) (xy 70.485 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f8d86f3-cb2f-44af-9360-0387424fd073)
   )
-  (wire (pts (xy 119.38 98.425) (xy 120.015 98.425))
+  (wire (pts (xy 133.985 116.84) (xy 134.62 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ff3fe89-d4c1-4ab6-95a4-27260187dbbf)
   )
-  (wire (pts (xy 165.1 62.865) (xy 165.1 38.1))
+  (wire (pts (xy 161.29 55.245) (xy 161.29 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 702d1342-415b-4abe-8b0b-049a5d558e1f)
   )
-  (wire (pts (xy 37.465 34.29) (xy 37.465 31.75))
+  (wire (pts (xy 52.07 52.705) (xy 52.07 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 73a59c82-74ed-4a47-b5eb-19f66fb4d5c8)
   )
-  (wire (pts (xy 165.1 109.855) (xy 165.1 65.405))
+  (wire (pts (xy 161.29 128.27) (xy 161.29 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7504905c-c9cb-4f24-b864-1c974538483e)
   )
-  (wire (pts (xy 231.14 82.55) (xy 241.935 82.55))
+  (wire (pts (xy 227.33 100.965) (xy 238.125 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7616ee87-25f1-41bd-b206-4f2d890788ea)
   )
-  (wire (pts (xy 236.855 77.47) (xy 251.46 77.47))
+  (wire (pts (xy 233.045 95.885) (xy 247.65 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b4d4573-1339-4551-a0b4-1fffd05b743c)
   )
-  (wire (pts (xy 55.88 51.435) (xy 55.88 48.895))
+  (wire (pts (xy 70.485 69.85) (xy 70.485 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7d80d2a3-e67a-40aa-a029-3ca7bf174530)
   )
-  (wire (pts (xy 209.55 102.87) (xy 205.74 102.87))
+  (wire (pts (xy 205.74 121.285) (xy 201.93 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f8b01fc-2666-4272-9613-552418f73c6a)
   )
-  (wire (pts (xy 36.195 76.2) (xy 36.195 76.835))
+  (bus (pts (xy 88.265 83.82) (xy 88.265 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7fc60121-49d4-475f-868b-f348e1d73ee7)
+  )
+
+  (wire (pts (xy 50.8 94.615) (xy 50.8 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 80b6e9ca-368a-4f01-b77a-45408e754114)
   )
-  (wire (pts (xy 224.79 77.47) (xy 231.14 77.47))
+  (wire (pts (xy 220.98 95.885) (xy 227.33 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8138b8b9-0e10-4d39-b345-b1ab49bcbe2f)
   )
-  (wire (pts (xy 203.2 42.545) (xy 203.2 48.895))
+  (wire (pts (xy 199.39 60.96) (xy 199.39 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81add1b1-07c4-49f3-b507-4e3c61679371)
   )
-  (wire (pts (xy 239.395 100.965) (xy 239.395 99.695))
+  (wire (pts (xy 235.585 119.38) (xy 235.585 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 82da7652-ca4c-4556-b1d7-961e1734db91)
   )
-  (wire (pts (xy 36.195 56.515) (xy 36.195 59.055))
+  (wire (pts (xy 50.8 74.93) (xy 50.8 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83ffef6a-f066-4332-9ab9-d7b1607cf259)
   )
-  (wire (pts (xy 165.1 65.405) (xy 163.195 65.405))
+  (wire (pts (xy 161.29 83.82) (xy 159.385 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8562fa07-ce80-4866-a1f7-5fcf253b65b7)
   )
-  (wire (pts (xy 180.975 50.165) (xy 189.865 50.165))
+  (wire (pts (xy 177.165 68.58) (xy 186.055 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 86b4909d-735b-4693-9736-12ee408ab43b)
   )
-  (polyline (pts (xy 93.345 197.485) (xy 93.345 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 88507abb-bfde-42d5-aa3c-9809b7c904f8)
-  )
-
-  (wire (pts (xy 58.42 165.735) (xy 59.69 165.735))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 88c0e43f-64f7-431a-9922-36d0a61f87bd)
-  )
-  (wire (pts (xy 83.185 67.945) (xy 83.82 67.945))
+  (wire (pts (xy 90.805 86.36) (xy 98.425 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 88f36fcc-49b4-4264-b0d1-38d61faf9290)
   )
-  (wire (pts (xy 60.325 66.04) (xy 60.325 51.435))
+  (wire (pts (xy 74.93 84.455) (xy 74.93 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8972c01d-0b16-456e-aaa5-5e09a8e0f162)
   )
-  (wire (pts (xy 241.935 82.55) (xy 241.935 89.535))
+  (wire (pts (xy 238.125 100.965) (xy 238.125 107.95))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8ae2065d-f802-41b5-8528-a7e73154ada4)
   )
-  (wire (pts (xy 120.015 107.315) (xy 104.14 107.315))
+  (wire (pts (xy 134.62 125.73) (xy 118.745 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8af68f51-34e0-4a67-a947-ab45e1721d56)
   )
-  (wire (pts (xy 62.23 90.805) (xy 62.23 95.885))
+  (wire (pts (xy 76.835 109.22) (xy 76.835 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8ba7d881-b08c-4160-bd02-0ee6f23d308b)
   )
-  (wire (pts (xy 187.96 91.44) (xy 189.23 91.44))
+  (wire (pts (xy 184.15 109.855) (xy 185.42 109.855))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d5e83b8-6e9e-45d1-bb6b-4177b109da3b)
   )
-  (wire (pts (xy 248.92 82.55) (xy 248.92 83.82))
+  (wire (pts (xy 245.11 100.965) (xy 245.11 102.235))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d77b65a-3852-4ea7-bde0-250134ee1ee8)
   )
-  (wire (pts (xy 119.38 92.075) (xy 119.38 90.805))
+  (wire (pts (xy 133.985 110.49) (xy 133.985 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8de387d9-dbbb-4c02-b70f-8c08cb3e6e29)
   )
-  (wire (pts (xy 36.195 66.04) (xy 45.085 66.04))
+  (wire (pts (xy 50.8 84.455) (xy 59.69 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8f15be42-8541-4b02-988b-6ad608b37f6f)
   )
-  (wire (pts (xy 83.185 78.105) (xy 83.82 78.105))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 905ecc07-6295-49fc-bbf2-73040a0f38d1)
-  )
-  (wire (pts (xy 45.085 66.04) (xy 55.88 66.04))
+  (wire (pts (xy 59.69 84.455) (xy 70.485 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92209a4c-8788-4bc1-9d57-e766e2bfbd3b)
   )
-  (wire (pts (xy 200.66 96.52) (xy 200.66 97.79))
+  (wire (pts (xy 196.85 114.935) (xy 196.85 116.205))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92a2f48a-2f18-4679-8dec-4a31a16b1ec4)
   )
-  (wire (pts (xy 205.74 103.505) (xy 205.74 102.87))
+  (wire (pts (xy 201.93 121.92) (xy 201.93 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93b0fc38-d516-4d4c-af54-d6524f27ddbd)
   )
-  (wire (pts (xy 46.355 39.37) (xy 46.355 41.275))
+  (wire (pts (xy 60.96 57.785) (xy 60.96 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9405e6dd-2c87-48c2-b66e-c8fbf1a16592)
   )
-  (wire (pts (xy 120.015 83.185) (xy 119.38 83.185))
+  (wire (pts (xy 134.62 101.6) (xy 133.985 101.6))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 988762e2-d861-4fe7-8592-01c6c6e00769)
   )
-  (wire (pts (xy 83.185 98.425) (xy 83.82 98.425))
+  (wire (pts (xy 97.79 116.84) (xy 98.425 116.84))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ba8f8f5-ee8a-465d-94a0-dc6e00e9168c)
   )
-  (wire (pts (xy 198.12 63.5) (xy 198.12 56.515))
+  (wire (pts (xy 194.31 81.915) (xy 194.31 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c92a010-5771-4e31-9cb2-edae2e182595)
   )
-  (wire (pts (xy 218.44 62.23) (xy 218.44 63.5))
+  (wire (pts (xy 214.63 80.645) (xy 214.63 81.915))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9eb79a27-ea17-457f-ab11-6cd32067b8a5)
   )
-  (wire (pts (xy 120.015 75.565) (xy 120.015 78.105))
+  (bus (pts (xy 88.265 81.28) (xy 88.265 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9f7fd7ea-d05f-42dc-93e7-c8318936fc2b)
+  )
+
+  (wire (pts (xy 90.805 83.82) (xy 98.425 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a045c5e8-e673-4061-8e09-17fbd7014298)
+  )
+  (wire (pts (xy 134.62 93.98) (xy 134.62 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a1355148-e330-41f7-a329-f57936c7fa47)
   )
-  (wire (pts (xy 231.14 77.47) (xy 236.855 77.47))
+  (wire (pts (xy 227.33 95.885) (xy 233.045 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a330618d-c6dd-4be9-82c3-dd3e88c6a7b0)
   )
-  (wire (pts (xy 101.6 57.785) (xy 101.6 48.895))
+  (wire (pts (xy 116.205 76.2) (xy 116.205 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a36e2e8b-313f-43f7-a3c9-1e50c29eba11)
   )
-  (wire (pts (xy 99.06 51.435) (xy 99.06 57.785))
+  (wire (pts (xy 113.665 69.85) (xy 113.665 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a3e03816-e142-4625-992a-828dfaff87b4)
   )
-  (wire (pts (xy 62.23 90.805) (xy 83.82 90.805))
+  (wire (pts (xy 76.835 109.22) (xy 98.425 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a418a91b-7ef6-4481-b064-083481fad8d8)
   )
-  (wire (pts (xy 209.55 96.52) (xy 209.55 102.87))
+  (wire (pts (xy 205.74 114.935) (xy 205.74 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a4d6febb-6925-4649-b447-dcf1a4876ee4)
   )
-  (wire (pts (xy 60.325 51.435) (xy 73.025 51.435))
+  (wire (pts (xy 74.93 69.85) (xy 87.63 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a4fa48ff-a76a-4d3e-9232-afff552c0c01)
   )
-  (wire (pts (xy 36.195 67.945) (xy 36.195 66.04))
+  (wire (pts (xy 50.8 86.36) (xy 50.8 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a5e170f8-4296-4387-98bb-63d1218c4ffa)
   )
-  (wire (pts (xy 51.435 160.655) (xy 69.215 160.655))
+  (wire (pts (xy 42.545 46.99) (xy 42.545 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a7a99ed1-1f2f-4dcc-9b7a-00a829b67db9)
+    (uuid a71da421-f182-4e72-ba35-1d7169ac2a19)
   )
-  (wire (pts (xy 55.88 66.04) (xy 60.325 66.04))
+  (wire (pts (xy 70.485 84.455) (xy 74.93 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab574679-82b0-4217-9ba5-2feb30367b96)
   )
-  (wire (pts (xy 209.55 102.87) (xy 218.44 102.87))
+  (wire (pts (xy 205.74 121.285) (xy 214.63 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid abcc975a-6b28-4127-aa8a-8bff740a9f3a)
   )
-  (wire (pts (xy 198.12 56.515) (xy 203.2 56.515))
+  (wire (pts (xy 194.31 74.93) (xy 199.39 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac2dbcb8-fdfd-4bcd-ac9a-5bcd83b4bb47)
   )
-  (wire (pts (xy 187.96 88.9) (xy 189.23 88.9))
+  (wire (pts (xy 184.15 107.315) (xy 185.42 107.315))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac724740-25af-43c3-9be6-15b94e0068c5)
   )
-  (wire (pts (xy 231.14 38.1) (xy 231.14 77.47))
+  (bus (pts (xy 86.36 90.805) (xy 87.63 90.805))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ad12aa6a-1c26-4236-a2a8-4dbdcb148d68)
+    (uuid aec721c3-ebda-435f-b057-26980028abe5)
   )
-  (wire (pts (xy 78.105 51.435) (xy 99.06 51.435))
+
+  (wire (pts (xy 92.71 69.85) (xy 113.665 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid affcf3a3-d96f-4876-9f2f-ab3170986496)
   )
-  (wire (pts (xy 200.025 38.1) (xy 231.14 38.1))
+  (wire (pts (xy 196.215 55.245) (xy 227.33 55.245))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b0b9fc4d-c58b-4e1f-9277-c4461f236470)
   )
-  (wire (pts (xy 250.19 64.77) (xy 251.46 64.77))
+  (wire (pts (xy 246.38 83.185) (xy 247.65 83.185))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b1c3be76-7b19-4d77-adb1-80575723195e)
   )
-  (wire (pts (xy 205.74 97.79) (xy 205.74 96.52))
+  (wire (pts (xy 201.93 116.205) (xy 201.93 114.935))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b3bbb15c-718d-44c1-96e4-389d81331586)
   )
-  (wire (pts (xy 104.14 104.14) (xy 104.14 107.315))
+  (wire (pts (xy 118.745 122.555) (xy 118.745 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b5bd59e7-6667-446c-a8bc-364e8e4b9ceb)
   )
-  (wire (pts (xy 120.015 98.425) (xy 120.015 99.695))
+  (wire (pts (xy 134.62 116.84) (xy 134.62 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b5fa4fcb-f0de-4f8f-8721-695c16ea71fa)
   )
-  (wire (pts (xy 36.195 76.2) (xy 45.085 76.2))
+  (wire (pts (xy 50.8 94.615) (xy 59.69 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b6ce2d4f-8a98-4dc2-9c23-8d5a1e119d32)
   )
-  (wire (pts (xy 99.06 46.355) (xy 104.14 46.355))
+  (wire (pts (xy 113.665 64.77) (xy 118.745 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b7cab5dc-1642-41db-be6f-4710987d2322)
   )
-  (polyline (pts (xy 93.345 146.05) (xy 175.895 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bea303be-d30c-4eae-b96e-fe380255608a)
-  )
-
-  (wire (pts (xy 120.015 73.025) (xy 120.015 75.565))
+  (wire (pts (xy 134.62 91.44) (xy 134.62 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c3c20dfd-8d76-462b-9775-cf12c2c4a95e)
   )
-  (wire (pts (xy 83.185 75.565) (xy 83.82 75.565))
+  (wire (pts (xy 90.17 93.98) (xy 98.425 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c4c97465-827c-4fde-8562-6c7c09022e2d)
   )
-  (wire (pts (xy 36.195 66.04) (xy 27.94 66.04))
+  (wire (pts (xy 50.8 84.455) (xy 42.545 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c6168a78-760f-4bea-b55d-fe4e79174e2a)
   )
-  (wire (pts (xy 69.215 160.655) (xy 69.215 165.735))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c627cc6c-40d8-449a-8deb-18f03eebc7f3)
-  )
-  (wire (pts (xy 101.6 103.505) (xy 101.6 104.14))
+  (wire (pts (xy 116.205 121.92) (xy 116.205 122.555))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c6cb3249-37c3-4a81-9fbe-2036ea636593)
   )
-  (wire (pts (xy 119.38 70.485) (xy 120.015 70.485))
+  (wire (pts (xy 133.985 88.9) (xy 134.62 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c7f1353e-14bf-40ac-9ddf-9e2664643363)
   )
-  (wire (pts (xy 189.23 82.55) (xy 185.42 82.55))
+  (wire (pts (xy 185.42 100.965) (xy 181.61 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c8bf8ba3-6f03-4132-91cb-376c49e77422)
   )
-  (wire (pts (xy 187.96 77.47) (xy 189.23 77.47))
+  (wire (pts (xy 184.15 95.885) (xy 185.42 95.885))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid caf97ffd-5997-4812-b743-ba07d8cf258b)
   )
-  (wire (pts (xy 60.325 185.42) (xy 64.135 185.42))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cba241ff-0164-4d41-90d9-68b64e64a719)
-  )
-  (wire (pts (xy 199.39 42.545) (xy 199.39 43.815))
+  (wire (pts (xy 195.58 60.96) (xy 195.58 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ccd14192-2d02-4372-bf80-fc152970f144)
   )
-  (wire (pts (xy 55.88 31.75) (xy 60.96 31.75))
+  (wire (pts (xy 70.485 50.165) (xy 75.565 50.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd686788-3aa8-4a91-be54-de9ac74e446e)
   )
-  (wire (pts (xy 124.46 99.695) (xy 124.46 95.885))
+  (wire (pts (xy 139.065 118.11) (xy 139.065 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cf071bd7-629e-4bfa-8aa2-b20affa48d71)
   )
-  (wire (pts (xy 37.465 41.275) (xy 37.465 41.91))
+  (wire (pts (xy 52.07 59.69) (xy 52.07 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3695161-ade5-4c24-85ac-725782824108)
   )
-  (wire (pts (xy 36.195 48.895) (xy 45.085 48.895))
+  (wire (pts (xy 50.8 67.31) (xy 59.69 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d55d0ef4-5e5a-46f1-a17c-6444b525b7ff)
   )
-  (wire (pts (xy 83.185 85.725) (xy 83.82 85.725))
+  (wire (pts (xy 97.79 104.14) (xy 98.425 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d564a6fc-1590-43c1-a17b-43ed3a4aeb5f)
   )
-  (wire (pts (xy 187.96 62.865) (xy 165.1 62.865))
+  (wire (pts (xy 184.15 81.28) (xy 161.29 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d6fc3cbb-4dc1-4b5d-b2d2-c9b38643dcff)
   )
-  (wire (pts (xy 119.38 78.105) (xy 120.015 78.105))
+  (wire (pts (xy 133.985 96.52) (xy 134.62 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d887d9b8-c0a4-4f8e-8f3e-a6d98435b53d)
   )
-  (wire (pts (xy 180.975 42.545) (xy 189.865 42.545))
+  (wire (pts (xy 177.165 60.96) (xy 186.055 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid da18d7db-bd0f-4cca-96b4-2cd1e76acf7e)
   )
-  (wire (pts (xy 60.96 46.355) (xy 93.98 46.355))
+  (wire (pts (xy 75.565 64.77) (xy 108.585 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc154574-36e3-4a6c-be51-35a30122ddf2)
   )
-  (wire (pts (xy 180.975 48.895) (xy 180.975 50.165))
+  (wire (pts (xy 177.165 67.31) (xy 177.165 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc200a8e-ad5f-4bc1-a985-da8a7d584993)
   )
-  (wire (pts (xy 203.2 56.515) (xy 203.2 63.5))
+  (wire (pts (xy 90.805 81.28) (xy 98.425 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dc559801-50a0-4358-b650-e83cb7c86edb)
+  )
+  (wire (pts (xy 199.39 74.93) (xy 199.39 81.915))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dcb9f0bf-3337-4663-821a-3d4ab3f12e29)
   )
-  (wire (pts (xy 104.14 103.505) (xy 104.14 104.14))
+  (wire (pts (xy 118.745 121.92) (xy 118.745 122.555))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dfbf1676-a268-471a-a798-88b83a68d3f9)
   )
-  (wire (pts (xy 119.38 65.405) (xy 151.765 65.405))
+  (bus (pts (xy 87.63 90.805) (xy 87.63 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e0893b4c-e61c-4649-85ea-b1dc45486780)
+  )
+
+  (wire (pts (xy 133.985 83.82) (xy 147.955 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e0cd4897-e941-4e17-bc30-8c03043eb7fa)
   )
-  (wire (pts (xy 99.06 103.505) (xy 99.06 104.14))
+  (wire (pts (xy 113.665 121.92) (xy 113.665 122.555))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e21e7c31-5f9f-4591-b34f-8ebd8de0b468)
   )
-  (wire (pts (xy 101.6 48.895) (xy 88.9 48.895))
+  (wire (pts (xy 116.205 67.31) (xy 103.505 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e38e353d-cc7b-45ba-9e9b-1399b00ebbc7)
   )
-  (wire (pts (xy 200.66 97.79) (xy 205.74 97.79))
+  (wire (pts (xy 196.85 116.205) (xy 201.93 116.205))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e3e42304-733c-4e72-aeca-de95b205d9cf)
   )
-  (wire (pts (xy 241.935 80.01) (xy 251.46 80.01))
+  (wire (pts (xy 238.125 98.425) (xy 247.65 98.425))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e43a830a-7c61-4eb5-b330-31a904ef1f9b)
   )
-  (wire (pts (xy 189.865 50.165) (xy 199.39 50.165))
+  (wire (pts (xy 186.055 68.58) (xy 195.58 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e6f690f8-c553-4b73-8c0b-f00b9c016239)
   )
-  (wire (pts (xy 83.185 65.405) (xy 83.82 65.405))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e9a62042-98cb-4ac5-8817-b8ff896133f4)
-  )
-  (wire (pts (xy 122.555 86.995) (xy 119.38 86.995))
+  (wire (pts (xy 137.16 105.41) (xy 133.985 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9c03eaf-2e22-4732-ac3b-bdc706aceb85)
   )
-  (wire (pts (xy 151.765 62.865) (xy 151.765 61.595))
+  (wire (pts (xy 147.955 81.28) (xy 147.955 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb54616e-2441-4716-84ac-12d0ce2fbb68)
   )
-  (wire (pts (xy 104.14 107.315) (xy 104.14 107.95))
+  (wire (pts (xy 118.745 125.73) (xy 118.745 126.365))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ef857744-9a18-45be-b65d-689eef3aaf77)
   )
-  (wire (pts (xy 69.215 165.735) (xy 69.215 177.8))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f041dccc-42f0-41d6-bd35-45d1e0a95ff5)
-  )
-  (wire (pts (xy 250.825 62.23) (xy 250.825 59.69))
+  (wire (pts (xy 247.015 80.645) (xy 247.015 78.105))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f09630a4-ada3-444f-937b-f5f4c27b9e63)
   )
-  (wire (pts (xy 37.465 39.37) (xy 37.465 41.275))
+  (wire (pts (xy 52.07 57.785) (xy 52.07 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f0c83569-0d9f-42d6-9878-eb4162efdf5b)
   )
-  (wire (pts (xy 127.635 175.895) (xy 150.495 175.895))
+  (bus (pts (xy 88.265 78.105) (xy 88.265 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f2b777ae-064b-4f1d-a0d1-857811260cb6)
+    (uuid f437884d-f3c3-4f2d-8c76-8b2f21180bc9)
   )
-  (wire (pts (xy 193.675 109.855) (xy 165.1 109.855))
+
+  (wire (pts (xy 189.865 128.27) (xy 161.29 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f98e23ed-3af4-44a0-bc1d-f0b7a11a4ad7)
   )
-  (wire (pts (xy 185.42 88.9) (xy 187.96 88.9))
+  (wire (pts (xy 181.61 107.315) (xy 184.15 107.315))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f9eafd9e-49f8-4257-bfdd-0d94240f1cfb)
   )
-  (wire (pts (xy 83.185 70.485) (xy 83.82 70.485))
+  (wire (pts (xy 90.805 88.9) (xy 98.425 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fa103e9e-3e74-46e7-b562-0a8efded9a1a)
   )
-  (wire (pts (xy 46.355 41.275) (xy 55.88 41.275))
+  (wire (pts (xy 60.96 59.69) (xy 70.485 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fbfaf77b-f6d2-47ef-9c2d-36050373d3f2)
   )
-  (wire (pts (xy 127.635 170.815) (xy 150.495 170.815))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fcfba233-9025-4226-ac82-2ada58c8b030)
-  )
-  (wire (pts (xy 27.94 48.895) (xy 36.195 48.895))
+  (wire (pts (xy 42.545 67.31) (xy 50.8 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fd3d463a-43de-4f5b-8ed8-1765c26a791f)
   )
-  (wire (pts (xy 45.085 76.2) (xy 55.88 76.2))
+  (wire (pts (xy 59.69 94.615) (xy 70.485 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffa8587b-8f57-48e7-86b4-f498fd8a30f0)
   )
 
-  (text "~20mA" (at 213.995 45.72 0)
+  (text "~20mA" (at 210.185 64.135 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 14125733-71cd-4e9b-b53b-1e69ed845353)
   )
   (text "always powered for click and pop reduction.\nshutdown current is low"
-    (at 169.545 33.02 0)
+    (at 165.735 51.435 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2a96a8f0-e3ff-4a42-a345-6876b34f2228)
   )
-  (text "Power Enable" (at 14.605 148.59 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 5b0e9917-1125-40ff-9716-2e2dfd2b05e5)
-  )
-  (text "~15mA digital\n~32mA analog" (at 110.49 52.07 0)
+  (text "~15mA digital\n~32mA analog" (at 125.095 70.485 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 6fe590a0-5943-4b60-b4d3-6c35f9c5202f)
   )
-  (text "TODO: more caps for high frequency noise" (at 111.125 32.385 0)
+  (text "TODO: more caps for high frequency noise" (at 90.805 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 81af26a5-09c6-445d-804f-93778140a989)
   )
-  (text "use low esr caps" (at 35.56 31.115 0)
+  (text "use low esr caps" (at 50.165 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 9aaca037-8bb0-4b20-857d-3e4b591d6bf5)
   )
-  (text "Off-state isolation" (at 93.98 148.59 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid b91bfa29-406c-4381-b55f-b704487b8abb)
-  )
-  (text "enables i2c mode" (at 80.645 90.805 180)
+  (text "enables i2c mode" (at 95.25 109.22 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e2d04cc3-d4ae-48bc-993b-e5149dd78aeb)
   )
-  (text "TODO: rare components(??)" (at 123.825 37.465 0)
+  (text "TODO: rare components(??)" (at 103.505 54.61 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f4534dbf-e43e-4ab3-a27a-31a8b0065523)
   )
 
-  (global_label "3V3_AUDIO_EN" (shape input) (at 185.42 88.9 180) (fields_autoplaced)
+  (label "DAC.BCK" (at 98.425 83.82 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 352354b9-f7f9-4c0d-b24f-3e6dd6829df2)
+  )
+  (label "DAC.LRCK" (at 98.425 86.36 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 9a38b436-6a33-49e0-88f8-f7d7563cbde0)
+  )
+  (label "DAC.DATA" (at 98.425 88.9 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 9e6f6922-6b20-4681-bfce-0606bb9d9dde)
+  )
+  (label "I2C.SCL" (at 90.17 93.98 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid ad040e74-a079-4bba-9ea0-c77b80c7288b)
+  )
+  (label "I2C.SDA" (at 90.17 96.52 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid c05da027-6eb8-4766-b05e-7eba34d491e1)
+  )
+  (label "DAC.SCK" (at 98.425 81.28 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid dcbf1353-f9af-4f76-bc73-1096cc7c90d3)
+  )
+
+  (global_label "3V3_AUDIO_EN" (shape input) (at 181.61 107.315 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 2b6cd750-1a54-448c-83a1-5fcc8d01481a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 169.4602 88.9794 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 165.6502 107.3944 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DAC_SDA" (shape input) (at 150.495 175.895 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 2ee9542f-b08e-461d-a9c2-6bd881aa95e4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 161.0724 175.8156 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "3V3_AUDIO" (shape input) (at 83.185 93.345 180) (fields_autoplaced)
+  (global_label "I2C{I2C}" (shape input) (at 86.36 90.805 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 47611515-8143-4275-805b-381e999dc774)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 70.6724 93.4244 0)
+    (uuid 4fe92945-e8de-45e8-9032-761f130357fe)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.085 90.7256 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DAC_SCL" (shape input) (at 83.185 75.565 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 4bcec32e-2028-4792-a96f-17a7b9616ff4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.6681 75.4856 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_SDA" (shape input) (at 127.635 175.895 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 507b4d1c-3893-41f0-b1bb-1a2d872cb0f5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 117.0576 175.8156 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "3V3_AUDIO" (shape input) (at 78.105 98.425 180) (fields_autoplaced)
+  (global_label "3V3_AUDIO" (shape input) (at 92.71 116.84 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7a88a0f8-1eb3-47eb-baef-0900de63e30a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 65.5924 98.5044 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 80.1974 116.9194 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DAC_DIN" (shape input) (at 83.185 70.485 180) (fields_autoplaced)
+  (global_label "DAC{I2S}" (shape input) (at 86.995 78.105 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 8058ea94-277d-42eb-96c1-5576bde2d482)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.9705 70.4056 0)
+    (uuid ed29e97e-83c2-46ec-b197-df065cb4d871)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.2362 78.0256 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DAC_BCK" (shape input) (at 83.185 65.405 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 8e6bf34e-01f6-4def-8f5b-dcb3c6590185)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.3657 65.3256 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "3V3_AUDIO" (shape input) (at 74.93 185.42 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 8e6c0e4c-fd41-433c-a5f9-c6326f0385f1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 87.4426 185.3406 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DAC_SDA" (shape input) (at 83.185 78.105 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a3c279e6-daf6-4a19-b9cf-e41eef400fcc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.6076 78.0256 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "3V3_AUDIO" (shape input) (at 27.94 31.75 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid aa1fd27e-b1fc-4398-837d-06b644aa4b54)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 15.4274 31.8294 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "DAC_SCL" (shape input) (at 150.495 170.815 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid b322b2c8-1894-4b41-b6fd-ef76d1729969)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 161.0119 170.7356 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DAC_LRCK" (shape input) (at 83.185 67.945 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid b613fede-3ad8-4f55-a3e1-ff8fd151ee7e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 71.3376 67.8656 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_SCL" (shape input) (at 127.635 170.815 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid bde20d1f-f906-43d2-80aa-f708815bfd36)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 117.1181 170.7356 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "DAC_SCK" (shape input) (at 83.185 62.865 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid c1317e88-add4-4f0c-aac9-1a5744b271b9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.4262 62.7856 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "3V3_AUDIO" (shape input) (at 27.305 48.895 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid c6cc46af-0283-4781-8530-9d240d18e095)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 14.7924 48.9744 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "3V3_AUDIO_EN" (shape input) (at 46.355 153.035 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid de4145ea-0a82-4ba6-8bea-7f7206e802be)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 30.3952 153.1144 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "~{3.5mm_DETECT}" (shape input) (at 250.19 64.77 180) (fields_autoplaced)
+  (global_label "~{3.5mm_DETECT}" (shape input) (at 246.38 83.185 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid f3c304b1-320b-46e4-bf3a-e2856e5b5da5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 233.6255 64.8494 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 229.8155 83.2644 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 74.295 185.42 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 01b6c433-a218-4614-b68c-2630e5a16cd4)
-    (property "Reference" "#FLG0105" (id 0) (at 74.295 183.515 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "PWR_FLAG" (id 1) (at 76.835 184.1499 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 74.295 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 74.295 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid db6c3f3f-ba4a-4a01-bec9-6426f572c74f))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 55.88 36.83 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 70.485 55.245 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 035d3e2a-8026-4b19-ad80-eee98fb467ff)
-    (property "Reference" "C302" (id 0) (at 50.8 36.195 0))
-    (property "Value" "10uF" (id 1) (at 50.8 38.1 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 55.88 36.83 0)
+    (property "Reference" "C302" (id 0) (at 65.405 54.61 0))
+    (property "Value" "10uF" (id 1) (at 65.405 56.515 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 70.485 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.88 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 70.485 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 55.88 36.83 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 70.485 55.245 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 75e0c0f8-c0ce-45e9-a958-6eef1139059a))
     (pin "2" (uuid b2d0cbaa-8eb3-4e51-af08-a4b0ed5cca08))
   )
 
-  (symbol (lib_id "power:GND") (at 104.14 107.95 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 118.745 126.365 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 05f81812-edf1-4acc-8415-c02f856e38d9)
-    (property "Reference" "#PWR0313" (id 0) (at 104.14 114.3 0)
+    (property "Reference" "#PWR0313" (id 0) (at 118.745 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 104.14 111.76 0))
-    (property "Footprint" "" (id 2) (at 104.14 107.95 0)
+    (property "Value" "GND" (id 1) (at 118.745 130.175 0))
+    (property "Footprint" "" (id 2) (at 118.745 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 104.14 107.95 0)
+    (property "Datasheet" "" (id 3) (at 118.745 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bfc709fb-68d6-4e5a-8d20-07aeb114a8c0))
   )
 
-  (symbol (lib_id "power:GND") (at 83.185 85.725 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 97.79 104.14 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 07477691-202a-41f9-92c5-0ca850248bff)
-    (property "Reference" "#PWR0310" (id 0) (at 83.185 92.075 0)
+    (property "Reference" "#PWR0310" (id 0) (at 97.79 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 79.375 86.995 0))
-    (property "Footprint" "" (id 2) (at 83.185 85.725 0)
+    (property "Value" "GND" (id 1) (at 93.98 105.41 0))
+    (property "Footprint" "" (id 2) (at 97.79 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 83.185 85.725 0)
+    (property "Datasheet" "" (id 3) (at 97.79 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cf3d52bc-ed4e-453e-b7ab-db9cb1151300))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 55.88 70.485 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 70.485 88.9 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0781d056-ff1c-4e9b-9679-a25845f5b915)
-    (property "Reference" "C310" (id 0) (at 50.8 69.85 0))
-    (property "Value" "10uF" (id 1) (at 50.8 71.755 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 55.88 70.485 0)
+    (property "Reference" "C310" (id 0) (at 65.405 88.265 0))
+    (property "Value" "10uF" (id 1) (at 65.405 90.17 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 70.485 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.88 70.485 0)
+    (property "Datasheet" "~" (id 3) (at 70.485 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 55.88 70.485 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 70.485 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d79325ae-f7eb-43a2-9902-2fc6e97d1b01))
     (pin "2" (uuid 5531f3ee-a1bb-4e2b-9880-35b4af852449))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 124.46 102.235 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 139.065 120.65 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0b5ffc00-b701-4b4b-a748-7eb7e3560f4c)
-    (property "Reference" "C315" (id 0) (at 129.54 101.6 0))
-    (property "Value" "0.1uF" (id 1) (at 129.54 103.505 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 124.46 102.235 0)
+    (property "Reference" "C315" (id 0) (at 144.145 120.015 0))
+    (property "Value" "0.1uF" (id 1) (at 144.145 121.92 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 139.065 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 124.46 102.235 0)
+    (property "Datasheet" "~" (id 3) (at 139.065 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 124.46 102.235 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 139.065 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d8dfc26b-14a8-4cfc-9ae0-c25f27b2e51a))
     (pin "2" (uuid 728f8bb0-8f94-457a-9f0e-a1266ea5da9d))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 122.555 89.535 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 137.16 107.95 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0b9f59be-21c6-4f60-876e-c961700e12b7)
-    (property "Reference" "C311" (id 0) (at 127 88.265 0))
-    (property "Value" "2.2uF" (id 1) (at 127 90.17 0))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 122.555 89.535 0)
+    (property "Reference" "C311" (id 0) (at 141.605 106.68 0))
+    (property "Value" "2.2uF" (id 1) (at 141.605 108.585 0))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 137.16 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 122.555 89.535 0)
+    (property "Datasheet" "~" (id 3) (at 137.16 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 122.555 89.535 90)
+    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 137.16 107.95 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c47499d4-5a70-4bfe-a2a9-b92aa5580cc0))
     (pin "2" (uuid c9767a69-dde7-4f20-94dc-985efce69c2f))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 196.215 109.855 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 192.405 128.27 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1fa42430-d415-4e6c-8066-34d3aaa6e4a4)
-    (property "Reference" "R310" (id 0) (at 196.215 106.045 90))
-    (property "Value" "20k" (id 1) (at 196.215 107.95 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 196.215 109.855 0)
+    (property "Reference" "R310" (id 0) (at 192.405 124.46 90))
+    (property "Value" "20k" (id 1) (at 192.405 126.365 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 192.405 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 196.215 109.855 0)
+    (property "Datasheet" "~" (id 3) (at 192.405 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-0720KL" (id 4) (at 196.215 109.855 0)
+    (property "PN" "AC0603FR-0720KL" (id 4) (at 192.405 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ac9aaad1-665b-4f46-8320-0fcc5855d767))
     (pin "2" (uuid b23f66b7-4471-4242-b05b-d98f60a62082))
   )
 
-  (symbol (lib_id "power:GND") (at 38.735 160.655 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 95.25 111.76 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 207729fd-413d-4873-b339-8087c96e9cb5)
-    (property "Reference" "#PWR0309" (id 0) (at 38.735 167.005 0)
+    (uuid 2ad8bb7b-4979-4ba1-8cc2-9a081431e0d5)
+    (property "Reference" "R?" (id 0) (at 95.25 113.665 90))
+    (property "Value" "100k" (id 1) (at 95.25 115.57 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 95.25 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 38.735 164.465 0))
-    (property "Footprint" "" (id 2) (at 38.735 160.655 0)
+    (property "Datasheet" "~" (id 3) (at 95.25 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 38.735 160.655 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 95.25 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid b0031deb-a0ec-4b7e-abb9-4f217e2aefba))
+    (pin "1" (uuid eb42b2e7-246c-457f-8c64-b657a9a30f0f))
+    (pin "2" (uuid 0b0a6dba-6ef5-4760-8aba-a2a7d5233ae1))
   )
 
-  (symbol (lib_id "power:+3V3") (at 58.42 165.735 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 297da44a-c5b9-4e48-817e-8a3510bb651e)
-    (property "Reference" "#PWR0314" (id 0) (at 62.23 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (id 1) (at 53.34 163.83 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 58.42 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 58.42 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d433f337-a2d9-482f-b776-415457c4321d))
-  )
-
-  (symbol (lib_id "Device:R_Small") (at 160.655 62.865 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 156.845 81.28 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2c08a073-38f5-43fa-acb6-5ed5b149db3f)
-    (property "Reference" "R304" (id 0) (at 160.655 59.055 90))
-    (property "Value" "20k" (id 1) (at 160.655 60.96 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 160.655 62.865 0)
+    (property "Reference" "R304" (id 0) (at 156.845 77.47 90))
+    (property "Value" "20k" (id 1) (at 156.845 79.375 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 156.845 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 160.655 62.865 0)
+    (property "Datasheet" "~" (id 3) (at 156.845 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-0720KL" (id 4) (at 160.655 62.865 0)
+    (property "PN" "AC0603FR-0720KL" (id 4) (at 156.845 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 494ea192-86ba-497f-a313-a2f61670903f))
     (pin "2" (uuid 1a66fce3-4741-40cf-aacd-4c9a6622b01b))
   )
 
-  (symbol (lib_id "power:GND") (at 36.195 76.835 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 50.8 95.25 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2d1ca593-8e7e-4180-a34a-2ec009abc4f4)
-    (property "Reference" "#PWR0306" (id 0) (at 36.195 83.185 0)
+    (property "Reference" "#PWR0306" (id 0) (at 50.8 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 36.195 80.645 0))
-    (property "Footprint" "" (id 2) (at 36.195 76.835 0)
+    (property "Value" "GND" (id 1) (at 50.8 99.06 0))
+    (property "Footprint" "" (id 2) (at 50.8 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.195 76.835 0)
+    (property "Datasheet" "" (id 3) (at 50.8 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8008c872-cabe-46a7-bfc0-b772b9fa7ee0))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 75.565 51.435 90) (unit 1)
+  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 90.17 69.85 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 32056aa0-68db-4c2b-aa40-7c5ed3a1eda3)
-    (property "Reference" "FB303" (id 0) (at 76.835 47.625 90)
+    (property "Reference" "FB303" (id 0) (at 91.44 66.04 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100@100MHz 3A" (id 1) (at 83.185 55.245 90)
+    (property "Value" "100@100MHz 3A" (id 1) (at 97.79 73.66 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 75.565 53.213 90)
+    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 90.17 71.628 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 75.565 51.435 0)
+    (property "Datasheet" "~" (id 3) (at 90.17 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "BLM18KG101TN1D" (id 5) (at 75.565 51.435 0)
+    (property "PN" "BLM18KG101TN1D" (id 5) (at 90.17 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9ae05ce6-ee86-478c-823c-f7e862e73405))
     (pin "2" (uuid 0c84ca3b-391c-4cf5-95b2-bd0a903653d2))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 120.015 102.235 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 134.62 120.65 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 36ac2886-9a40-49cb-ab3c-82aab031b8c1)
-    (property "Reference" "C314" (id 0) (at 114.935 102.235 0))
-    (property "Value" "2.2uF" (id 1) (at 114.935 104.14 0))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 120.015 102.235 0)
+    (property "Reference" "C314" (id 0) (at 129.54 120.65 0))
+    (property "Value" "2.2uF" (id 1) (at 129.54 122.555 0))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 134.62 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 120.015 102.235 0)
+    (property "Datasheet" "~" (id 3) (at 134.62 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 120.015 102.235 90)
+    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 134.62 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ba794153-bc51-4fec-874a-586d227c1a95))
     (pin "2" (uuid 8a62ee3d-eaa7-4858-9d88-ab1d86ec4df6))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 55.88 53.975 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 70.485 72.39 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 44dc66db-9763-4f98-841e-d8e67f01d27e)
-    (property "Reference" "C304" (id 0) (at 50.8 53.34 0))
-    (property "Value" "10uF" (id 1) (at 50.8 55.245 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 55.88 53.975 0)
+    (property "Reference" "C304" (id 0) (at 65.405 71.755 0))
+    (property "Value" "10uF" (id 1) (at 65.405 73.66 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 70.485 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.88 53.975 0)
+    (property "Datasheet" "~" (id 3) (at 70.485 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 55.88 53.975 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 70.485 72.39 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e1d84399-6dee-46a3-8218-a4e2cf4fcec1))
     (pin "2" (uuid c13a7aea-bf51-4461-bbbc-23d7a62ea26b))
   )
 
-  (symbol (lib_id "power:GND") (at 62.23 95.885 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 76.835 114.3 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 450c4c35-f21e-45d4-bc97-1ab736747ef7)
-    (property "Reference" "#PWR0311" (id 0) (at 62.23 102.235 0)
+    (property "Reference" "#PWR0311" (id 0) (at 76.835 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 62.23 100.33 0))
-    (property "Footprint" "" (id 2) (at 62.23 95.885 0)
+    (property "Value" "GND" (id 1) (at 76.835 118.745 0))
+    (property "Footprint" "" (id 2) (at 76.835 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 62.23 95.885 0)
+    (property "Datasheet" "" (id 3) (at 76.835 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f08f1c68-e7f4-46c9-b619-ed9b579a8c99))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 45.085 53.975 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 59.69 72.39 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4fff88f7-0a42-47d9-9ac0-3706c188bed7)
-    (property "Reference" "C318" (id 0) (at 40.64 53.34 0))
-    (property "Value" "1uF" (id 1) (at 40.64 55.245 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 45.085 53.975 0)
+    (property "Reference" "C318" (id 0) (at 55.245 71.755 0))
+    (property "Value" "1uF" (id 1) (at 55.245 73.66 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 59.69 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 45.085 53.975 0)
+    (property "Datasheet" "~" (id 3) (at 59.69 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 45.085 53.975 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 59.69 72.39 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d99ca801-cfa0-4ff7-ae97-88ed878c01dd))
     (pin "2" (uuid a2d8cef4-c5b9-47dc-bcef-823599be4f1b))
   )
 
-  (symbol (lib_id "power:GND") (at 248.92 83.82 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 245.11 102.235 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5bd7f2bd-b057-48b3-95a6-8ad0b91453fc)
-    (property "Reference" "#PWR0308" (id 0) (at 248.92 90.17 0)
+    (property "Reference" "#PWR0308" (id 0) (at 245.11 108.585 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 248.92 88.265 0))
-    (property "Footprint" "" (id 2) (at 248.92 83.82 0)
+    (property "Value" "GND" (id 1) (at 245.11 106.68 0))
+    (property "Footprint" "" (id 2) (at 245.11 102.235 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 248.92 83.82 0)
+    (property "Datasheet" "" (id 3) (at 245.11 102.235 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c68b8ff4-6db4-4ee6-8281-5a2657dad2df))
   )
 
-  (symbol (lib_id "power:+3V3") (at 175.895 42.545 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 172.085 60.96 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 611a6558-0307-4df6-8df9-47488c73b8a8)
-    (property "Reference" "#PWR0318" (id 0) (at 175.895 46.355 0)
+    (property "Reference" "#PWR0318" (id 0) (at 172.085 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 178.435 38.735 0)
+    (property "Value" "+3V3" (id 1) (at 174.625 57.15 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 175.895 42.545 0)
+    (property "Footprint" "" (id 2) (at 172.085 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 175.895 42.545 0)
+    (property "Datasheet" "" (id 3) (at 172.085 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 108f718b-5d45-4885-9581-961d70e9198d))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 46.355 36.83 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 60.96 55.245 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 64a077ca-a6ff-4fa8-b8fb-4e884d8524f7)
-    (property "Reference" "C316" (id 0) (at 41.91 36.195 0))
-    (property "Value" "1uF" (id 1) (at 41.91 38.1 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 46.355 36.83 0)
+    (property "Reference" "C316" (id 0) (at 56.515 54.61 0))
+    (property "Value" "1uF" (id 1) (at 56.515 56.515 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 60.96 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 46.355 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 60.96 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 46.355 36.83 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 60.96 55.245 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5cc2702b-a42c-4a31-ab54-b3264a614734))
     (pin "2" (uuid ba64df5a-6fb5-4209-b05e-93e12a2e49ee))
   )
 
-  (symbol (lib_id "power:GND") (at 37.465 41.91 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 52.07 60.325 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 64c7eb89-a593-4cb3-aaa4-1bf41081cd56)
-    (property "Reference" "#PWR0301" (id 0) (at 37.465 48.26 0)
+    (property "Reference" "#PWR0301" (id 0) (at 52.07 66.675 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 37.465 45.72 0))
-    (property "Footprint" "" (id 2) (at 37.465 41.91 0)
+    (property "Value" "GND" (id 1) (at 52.07 64.135 0))
+    (property "Footprint" "" (id 2) (at 52.07 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 37.465 41.91 0)
+    (property "Datasheet" "" (id 3) (at 52.07 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 284319fd-c5f9-4496-bc4d-5461e847905a))
   )
 
-  (symbol (lib_id "power:GND") (at 239.395 100.965 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 235.585 119.38 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 65709d86-7fea-4044-8577-af2ab91339fc)
-    (property "Reference" "#PWR0319" (id 0) (at 239.395 107.315 0)
+    (property "Reference" "#PWR0319" (id 0) (at 235.585 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 239.395 105.41 0))
-    (property "Footprint" "" (id 2) (at 239.395 100.965 0)
+    (property "Value" "GND" (id 1) (at 235.585 123.825 0))
+    (property "Footprint" "" (id 2) (at 235.585 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 239.395 100.965 0)
+    (property "Datasheet" "" (id 3) (at 235.585 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4ae710bf-d01b-48ff-94cc-b228ea9c295f))
   )
 
-  (symbol (lib_id "power:GND") (at 120.015 83.185 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 134.62 101.6 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 69b9be6e-0c10-41ac-88eb-a06818bf73a5)
-    (property "Reference" "#PWR0307" (id 0) (at 120.015 89.535 0)
+    (property "Reference" "#PWR0307" (id 0) (at 134.62 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 123.825 84.455 0))
-    (property "Footprint" "" (id 2) (at 120.015 83.185 0)
+    (property "Value" "GND" (id 1) (at 138.43 102.87 0))
+    (property "Footprint" "" (id 2) (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 120.015 83.185 0)
+    (property "Datasheet" "" (id 3) (at 134.62 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 79534841-2845-4c41-a2fc-4db987fd4960))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 199.39 46.355 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 195.58 64.77 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 70c0926a-7594-43f4-9215-79d83e6bda0c)
-    (property "Reference" "C307" (id 0) (at 194.945 45.72 0))
-    (property "Value" "4.7uF" (id 1) (at 194.945 47.625 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 199.39 46.355 0)
+    (property "Reference" "C307" (id 0) (at 191.135 64.135 0))
+    (property "Value" "4.7uF" (id 1) (at 191.135 66.04 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 195.58 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 199.39 46.355 0)
+    (property "Datasheet" "~" (id 3) (at 195.58 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ475KD-T" (id 4) (at 199.39 46.355 90)
+    (property "PN" "EMK212BJ475KD-T" (id 4) (at 195.58 64.77 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b2b02007-febf-49b3-bc44-34b365ef28c2))
     (pin "2" (uuid ccd80e2a-0cc8-4fdc-88b1-f47f14dcd349))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 180.975 46.355 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 177.165 64.77 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 719f09c4-ba22-44a2-b695-f0736355437e)
-    (property "Reference" "C305" (id 0) (at 175.895 45.72 0))
-    (property "Value" "0.1uF" (id 1) (at 175.895 47.625 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 180.975 46.355 0)
+    (property "Reference" "C305" (id 0) (at 172.085 64.135 0))
+    (property "Value" "0.1uF" (id 1) (at 172.085 66.04 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 177.165 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 180.975 46.355 0)
+    (property "Datasheet" "~" (id 3) (at 177.165 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 180.975 46.355 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 177.165 64.77 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 336dd2f5-bad2-4a8a-88f9-43591086beee))
     (pin "2" (uuid 8f7457d4-cc3a-43ad-b3a9-e37db8b0758b))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 215.9 62.23 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 212.09 80.645 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 74ce4f72-f13d-4627-b002-b3f8bb36d64a)
-    (property "Reference" "C312" (id 0) (at 215.9 57.15 90))
-    (property "Value" "2.2uF" (id 1) (at 215.9 59.055 90))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 215.9 62.23 0)
+    (property "Reference" "C312" (id 0) (at 212.09 75.565 90))
+    (property "Value" "2.2uF" (id 1) (at 212.09 77.47 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 212.09 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 215.9 62.23 0)
+    (property "Datasheet" "~" (id 3) (at 212.09 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 215.9 62.23 90)
+    (property "PN" "EMK107ABJ225KA8T" (id 4) (at 212.09 80.645 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 13b1dd24-c6cc-4b72-a3ac-1cd10e72cd29))
     (pin "2" (uuid 2d4d849a-da87-497a-a9a8-e2c28f1d0890))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 203.2 51.435 180) (unit 1)
+  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 199.39 69.85 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 77a92750-0683-4b27-9b94-1d7462d9f4df)
-    (property "Reference" "FB304" (id 0) (at 215.9 50.165 0)
+    (property "Reference" "FB304" (id 0) (at 212.09 68.58 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100@100MHz 3A" (id 1) (at 222.25 52.705 0)
+    (property "Value" "100@100MHz 3A" (id 1) (at 218.44 71.12 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 204.978 51.435 90)
+    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 201.168 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 203.2 51.435 0)
+    (property "Datasheet" "~" (id 3) (at 199.39 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "BLM18KG101TN1D" (id 5) (at 203.2 51.435 0)
+    (property "PN" "BLM18KG101TN1D" (id 5) (at 199.39 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 87a72b44-52bf-4dd7-8c3b-6fe2513b2b8e))
     (pin "2" (uuid c2318c76-5a8b-4857-accd-21ff43b80ab2))
   )
 
-  (symbol (lib_id "power:+3V3") (at 250.825 53.34 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 247.015 71.755 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7888b558-57e7-4f63-b1f8-b72043a5611f)
-    (property "Reference" "#PWR0302" (id 0) (at 250.825 57.15 0)
+    (property "Reference" "#PWR0302" (id 0) (at 247.015 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 252.73 48.26 90)
+    (property "Value" "+3V3" (id 1) (at 248.92 66.675 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 250.825 53.34 0)
+    (property "Footprint" "" (id 2) (at 247.015 71.755 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 250.825 53.34 0)
+    (property "Datasheet" "" (id 3) (at 247.015 71.755 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1d71bc39-8988-46da-ab89-f86f7979b02a))
   )
 
-  (symbol (lib_id "power:GND") (at 250.825 69.85 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 247.015 88.265 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8631f658-b510-43d7-ab8f-abbfe4caabb6)
-    (property "Reference" "#PWR0305" (id 0) (at 250.825 76.2 0)
+    (property "Reference" "#PWR0305" (id 0) (at 247.015 94.615 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 250.825 74.295 0))
-    (property "Footprint" "" (id 2) (at 250.825 69.85 0)
+    (property "Value" "GND" (id 1) (at 247.015 92.71 0))
+    (property "Footprint" "" (id 2) (at 247.015 88.265 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 250.825 69.85 0)
+    (property "Datasheet" "" (id 3) (at 247.015 88.265 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3dd005ec-3140-4948-ac13-2007b28fba73))
   )
 
-  (symbol (lib_id "Transistor_FET:DMC2053UVT") (at 69.215 185.42 270) (unit 2)
-    (in_bom yes) (on_board yes)
-    (uuid 8902f748-f949-4101-bafb-6416738b6f34)
-    (property "Reference" "Q302" (id 0) (at 64.77 188.595 90))
-    (property "Value" "DMC2053UVT" (id 1) (at 64.77 191.135 90))
-    (property "Footprint" "Package_TO_SOT_SMD:TSOT-23-6" (id 2) (at 57.15 184.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 69.215 182.88 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "DMC2053UVT" (id 4) (at 69.215 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0543bbaa-2c97-48e1-8f0d-e044d82dd48e))
-    (pin "5" (uuid f4226ebf-4b4f-48b3-9ad0-ab3b1344d60e))
-    (pin "6" (uuid ca69b5a3-0ee3-4f14-a31d-73e860965962))
-    (pin "2" (uuid 0082b679-1660-4b84-8df7-251abeed1481))
-    (pin "3" (uuid 413ebf22-5c2f-45f9-bc2f-b8b49250fff4))
-    (pin "4" (uuid 0f2579b0-6637-4465-a42a-6e5b5700c6d3))
-  )
-
-  (symbol (lib_id "Transistor_FET:DMC2053UVT") (at 46.355 160.655 270) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 8ab44bf3-eb3a-4b6e-ad57-a822bb0c879f)
-    (property "Reference" "Q302" (id 0) (at 40.64 154.94 90))
-    (property "Value" "DMC2053UVT" (id 1) (at 34.925 157.48 90))
-    (property "Footprint" "Package_TO_SOT_SMD:TSOT-23-6" (id 2) (at 34.29 159.385 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 46.355 158.115 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "DMC2053UVT" (id 4) (at 46.355 160.655 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e09e919e-2e5f-4d13-bb63-e553bb5dc6eb))
-    (pin "5" (uuid c76bec70-a7c4-4d00-ba23-f0053f949eb7))
-    (pin "6" (uuid 9d26dd29-d25f-47d1-898d-0603311a7a02))
-    (pin "2" (uuid 9477564f-0c8c-4b1a-8d25-e1d724a91242))
-    (pin "3" (uuid 6df47873-308e-4141-a032-433ed0f69be0))
-    (pin "4" (uuid 66f94ef0-2ef0-44f6-8d98-1f5bbaeceaf3))
-  )
-
-  (symbol (lib_id "power:GND") (at 205.74 103.505 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 201.93 121.92 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8f181515-24df-4b54-8011-69ebb1517674)
-    (property "Reference" "#PWR0122" (id 0) (at 205.74 109.855 0)
+    (property "Reference" "#PWR0122" (id 0) (at 201.93 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 205.74 107.95 0))
-    (property "Footprint" "" (id 2) (at 205.74 103.505 0)
+    (property "Value" "GND" (id 1) (at 201.93 126.365 0))
+    (property "Footprint" "" (id 2) (at 201.93 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 205.74 103.505 0)
+    (property "Datasheet" "" (id 3) (at 201.93 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 09166cd0-7392-4efa-a1ca-9662bac652c7))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 250.825 57.15 180) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 247.015 75.565 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8f26174a-21a2-47c0-a7e9-578f403bda86)
-    (property "Reference" "R301" (id 0) (at 247.015 56.515 0))
-    (property "Value" "10k" (id 1) (at 247.015 58.42 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 250.825 57.15 0)
+    (property "Reference" "R301" (id 0) (at 243.205 74.93 0))
+    (property "Value" "10k" (id 1) (at 243.205 76.835 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 247.015 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 250.825 57.15 0)
+    (property "Datasheet" "~" (id 3) (at 247.015 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603JR-0710KL" (id 4) (at 250.825 57.15 0)
+    (property "PN" "AC0603JR-0710KL" (id 4) (at 247.015 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f2a97c24-dafc-4b03-b8a8-8a78045f6782))
     (pin "2" (uuid b333704e-0f71-4832-a9b9-a2a683b0eefc))
   )
 
-  (symbol (lib_id "symbols:SJ-3566AN") (at 261.62 80.01 180) (unit 1)
+  (symbol (lib_id "symbols:SJ-3566AN") (at 257.81 98.425 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9971ae2e-7a0b-435e-bf91-d51768e490e2)
-    (property "Reference" "J301" (id 0) (at 261.62 86.36 0))
-    (property "Value" "PHONES" (id 1) (at 261.62 88.9 0))
-    (property "Footprint" "footprints:CUI_SJ-3566AN" (id 2) (at 261.62 80.01 0)
+    (property "Reference" "J301" (id 0) (at 257.81 104.775 0))
+    (property "Value" "PHONES" (id 1) (at 257.81 107.315 0))
+    (property "Footprint" "footprints:CUI_SJ-3566AN" (id 2) (at 257.81 98.425 0)
       (effects (font (size 1.27 1.27)) (justify left bottom) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 261.62 80.01 0)
+    (property "Datasheet" "~" (id 3) (at 257.81 98.425 0)
       (effects (font (size 1.27 1.27)) (justify left bottom) hide)
     )
-    (property "PN" "SJ-3566AN" (id 4) (at 261.62 80.01 0)
+    (property "PN" "SJ-3566AN" (id 4) (at 257.81 98.425 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 68cf1b90-8e4c-4b40-bfad-24bd313eaa74))
@@ -2867,180 +2474,180 @@
     (pin "6" (uuid 2664445f-9752-4a55-a1f9-11fe642384b5))
   )
 
-  (symbol (lib_id "power:GND") (at 180.975 50.8 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 177.165 69.215 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid aaf70cbd-bbc5-4bfa-ad81-69a73d8a7c00)
-    (property "Reference" "#PWR0123" (id 0) (at 180.975 57.15 0)
+    (property "Reference" "#PWR0123" (id 0) (at 177.165 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 180.975 55.245 0))
-    (property "Footprint" "" (id 2) (at 180.975 50.8 0)
+    (property "Value" "GND" (id 1) (at 177.165 73.66 0))
+    (property "Footprint" "" (id 2) (at 177.165 69.215 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 180.975 50.8 0)
+    (property "Datasheet" "" (id 3) (at 177.165 69.215 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9ba12d3b-ae68-4d21-b698-e9b75aa03403))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 154.305 66.675 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 150.495 85.09 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid abb44240-42fb-4a25-bc71-96a1c8e8e4f9)
-    (property "Reference" "C308" (id 0) (at 154.305 69.85 90))
-    (property "Value" "1uF" (id 1) (at 154.305 72.39 90))
-    (property "Footprint" "Diode_SMD:D_1206_3216Metric" (id 2) (at 154.305 66.675 0)
+    (property "Reference" "C308" (id 0) (at 150.495 88.265 90))
+    (property "Value" "1uF" (id 1) (at 150.495 90.805 90))
+    (property "Footprint" "Diode_SMD:D_1206_3216Metric" (id 2) (at 150.495 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 154.305 66.675 0)
+    (property "Datasheet" "~" (id 3) (at 150.495 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "T491A105M016AT" (id 4) (at 154.305 66.675 90)
+    (property "PN" "T491A105M016AT" (id 4) (at 150.495 85.09 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8582803c-edc6-433f-a69c-50514259ff64))
     (pin "2" (uuid bdc6965b-fb0a-4ee4-9aa6-80532034ee32))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 86.36 48.895 90) (unit 1)
+  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 100.965 67.31 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ae75238a-7867-4b63-ad68-a8d874f66ea8)
-    (property "Reference" "FB302" (id 0) (at 87.63 45.085 90)
+    (property "Reference" "FB302" (id 0) (at 102.235 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100@100MHz 3A" (id 1) (at 93.98 52.705 90)
+    (property "Value" "100@100MHz 3A" (id 1) (at 108.585 71.12 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 86.36 50.673 90)
+    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 100.965 69.088 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 48.895 0)
+    (property "Datasheet" "~" (id 3) (at 100.965 67.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "BLM18KG101TN1D" (id 5) (at 86.36 48.895 0)
+    (property "PN" "BLM18KG101TN1D" (id 5) (at 100.965 67.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1fb2fbca-d596-4cfd-bc5b-f8c969fce97d))
     (pin "2" (uuid 754d242a-c6cf-4e15-b178-91322afcc6c5))
   )
 
-  (symbol (lib_id "power:GND") (at 36.195 59.69 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 50.8 78.105 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid af820fba-de0b-4365-901f-5bd59f6e0a97)
-    (property "Reference" "#PWR0304" (id 0) (at 36.195 66.04 0)
+    (property "Reference" "#PWR0304" (id 0) (at 50.8 84.455 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 36.195 63.5 0))
-    (property "Footprint" "" (id 2) (at 36.195 59.69 0)
+    (property "Value" "GND" (id 1) (at 50.8 81.915 0))
+    (property "Footprint" "" (id 2) (at 50.8 78.105 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.195 59.69 0)
+    (property "Datasheet" "" (id 3) (at 50.8 78.105 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 38b7c80b-5985-416f-9fef-acdb79572bee))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 36.195 70.485 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 50.8 88.9 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c0ef417d-7110-4f13-843c-383b83968060)
-    (property "Reference" "C309" (id 0) (at 31.115 69.85 0))
-    (property "Value" "0.1uF" (id 1) (at 31.115 71.755 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 36.195 70.485 0)
+    (property "Reference" "C309" (id 0) (at 45.72 88.265 0))
+    (property "Value" "0.1uF" (id 1) (at 45.72 90.17 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 50.8 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 36.195 70.485 0)
+    (property "Datasheet" "~" (id 3) (at 50.8 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 36.195 70.485 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 50.8 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f1620cf5-c25e-4805-980c-0d7bf2397f36))
     (pin "2" (uuid 86de6891-5c6b-4cde-96ed-a4ab93bcb642))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 154.305 61.595 90) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 42.545 46.99 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c61899c9-e923-45fc-a61f-74441855ef66)
+    (property "Reference" "#PWR?" (id 0) (at 42.545 50.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 45.085 42.545 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 42.545 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 42.545 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 36a6a5bf-1010-4569-a87a-61b41440512f))
+  )
+
+  (symbol (lib_id "Device:C_Small") (at 150.495 80.01 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cad636cb-3dad-4ccc-b0fb-7133f655369f)
-    (property "Reference" "C306" (id 0) (at 154.305 55.88 90))
-    (property "Value" "1uF" (id 1) (at 154.305 58.42 90))
-    (property "Footprint" "Diode_SMD:D_1206_3216Metric" (id 2) (at 154.305 61.595 0)
+    (property "Reference" "C306" (id 0) (at 150.495 74.295 90))
+    (property "Value" "1uF" (id 1) (at 150.495 76.835 90))
+    (property "Footprint" "Diode_SMD:D_1206_3216Metric" (id 2) (at 150.495 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 154.305 61.595 0)
+    (property "Datasheet" "~" (id 3) (at 150.495 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "T491A105M016AT" (id 4) (at 154.305 61.595 90)
+    (property "PN" "T491A105M016AT" (id 4) (at 150.495 80.01 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 286fbd63-0692-44e2-90c9-535a5783f074))
     (pin "2" (uuid a06d7d34-df61-4750-ad09-bd0bc7fe524b))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 62.23 165.735 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid ced17a05-c246-40ff-841e-239f223abd5f)
-    (property "Reference" "R307" (id 0) (at 62.23 167.64 90))
-    (property "Value" "100k" (id 1) (at 62.23 169.545 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 62.23 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 62.23 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 62.23 165.735 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 7540a5b1-2c6e-461f-a84d-47ddcae1b625))
-    (pin "2" (uuid 329de361-9bd4-4c3d-a182-1badaf02536e))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 36.195 53.975 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 50.8 72.39 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cf0d61dd-9158-4a28-9af0-300249685b31)
-    (property "Reference" "C303" (id 0) (at 31.115 53.34 0))
-    (property "Value" "0.1uF" (id 1) (at 31.115 55.245 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 36.195 53.975 0)
+    (property "Reference" "C303" (id 0) (at 45.72 71.755 0))
+    (property "Value" "0.1uF" (id 1) (at 45.72 73.66 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 50.8 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 36.195 53.975 0)
+    (property "Datasheet" "~" (id 3) (at 50.8 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 36.195 53.975 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 50.8 72.39 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c4b935ab-3c0e-4989-9863-24d64400b6fb))
     (pin "2" (uuid ed005f7a-fdc9-4c9c-a36d-b8581c82979d))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 160.655 65.405 270) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 156.845 83.82 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d04da576-6e64-42c2-9c23-a166d7f8e23d)
-    (property "Reference" "R305" (id 0) (at 160.655 67.31 90))
-    (property "Value" "20k" (id 1) (at 160.655 69.215 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 160.655 65.405 0)
+    (property "Reference" "R305" (id 0) (at 156.845 85.725 90))
+    (property "Value" "20k" (id 1) (at 156.845 87.63 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 156.845 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 160.655 65.405 0)
+    (property "Datasheet" "~" (id 3) (at 156.845 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-0720KL" (id 4) (at 160.655 65.405 0)
+    (property "PN" "AC0603FR-0720KL" (id 4) (at 156.845 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a45e5ee2-713e-4447-81c6-64fa2a48ed9f))
     (pin "2" (uuid e998ead1-157b-46d3-8e0c-02aeec963ca6))
   )
 
-  (symbol (lib_id "symbols:LM4917") (at 207.01 80.01 0) (unit 1)
+  (symbol (lib_id "symbols:LM4917") (at 203.2 98.425 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d165362e-2d2f-48ba-9c70-e0964e991e34)
-    (property "Reference" "U301" (id 0) (at 227.33 70.8912 0))
-    (property "Value" "LM4917" (id 1) (at 227.33 73.4312 0))
-    (property "Footprint" "footprints:SOIC-14" (id 2) (at 207.01 80.01 0)
+    (property "Reference" "U301" (id 0) (at 223.52 89.3062 0))
+    (property "Value" "LM4917" (id 1) (at 223.52 91.8462 0))
+    (property "Footprint" "footprints:SOIC-14" (id 2) (at 203.2 98.425 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 207.01 80.01 0)
+    (property "Datasheet" "" (id 3) (at 203.2 98.425 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "LM4917SD" (id 4) (at 207.01 80.01 0)
+    (property "PN" "LM4917SD" (id 4) (at 203.2 98.425 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "13" (uuid 9a4085f1-d2c2-478b-9dfc-5ee592732d22))
@@ -3060,40 +2667,40 @@
     (pin "9" (uuid e39ebcce-5074-438a-8ca3-d877536f376c))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 197.485 38.1 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 193.675 55.245 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d5072631-d685-4c7d-8074-9da284b5ad02)
-    (property "Reference" "R302" (id 0) (at 197.485 34.29 90))
-    (property "Value" "20k" (id 1) (at 197.485 36.195 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 197.485 38.1 0)
+    (property "Reference" "R302" (id 0) (at 193.675 51.435 90))
+    (property "Value" "20k" (id 1) (at 193.675 53.34 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 193.675 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 197.485 38.1 0)
+    (property "Datasheet" "~" (id 3) (at 193.675 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-0720KL" (id 4) (at 197.485 38.1 0)
+    (property "PN" "AC0603FR-0720KL" (id 4) (at 193.675 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aa9e2904-4aea-48de-968f-21558dccef28))
     (pin "2" (uuid 72a52f66-b157-4e95-9d81-73f58a856179))
   )
 
-  (symbol (lib_id "Audio:PCM5121PW") (at 101.6 80.645 0) (unit 1)
+  (symbol (lib_id "Audio:PCM5121PW") (at 116.205 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d6a49f5f-d2dc-417d-b57d-85bc4e115a48)
-    (property "Reference" "U302" (id 0) (at 106.1594 54.61 0)
+    (property "Reference" "U302" (id 0) (at 120.7644 73.025 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "PCM512x" (id 1) (at 106.1594 57.15 0)
+    (property "Value" "PCM512x" (id 1) (at 120.7644 75.565 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_SO:TSSOP-28_4.4x9.7mm_P0.65mm" (id 2) (at 101.6 80.645 0)
+    (property "Footprint" "Package_SO:TSSOP-28_4.4x9.7mm_P0.65mm" (id 2) (at 116.205 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/pcm5121.pdf" (id 3) (at 101.6 53.975 0)
+    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/pcm5121.pdf" (id 3) (at 116.205 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PCM512x" (id 4) (at 101.6 80.645 0)
+    (property "PN" "PCM512x" (id 4) (at 116.205 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid babbf9cc-ce88-4365-95ef-91316fb86f3a))
@@ -3126,40 +2733,22 @@
     (pin "9" (uuid 6eba0888-2ae7-45ff-9c53-8185666ebbc4))
   )
 
-  (symbol (lib_id "power:+3V3") (at 60.325 185.42 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid dbc555a4-c960-4d73-9d77-9e4561fe1fb3)
-    (property "Reference" "#PWR0317" (id 0) (at 64.135 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (id 1) (at 55.245 183.515 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 60.325 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 60.325 185.42 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 41bde54a-229c-4aec-83be-4a82a271f945))
-  )
-
-  (symbol (lib_id "Device:D_Dual_CommonAnode_KKA_Parallel") (at 239.395 94.615 90) (unit 1)
+  (symbol (lib_id "Device:D_Dual_CommonAnode_KKA_Parallel") (at 235.585 113.03 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e2e88276-3709-4182-a8ec-1d0f6254b923)
-    (property "Reference" "D301" (id 0) (at 245.11 93.2814 90)
+    (property "Reference" "D301" (id 0) (at 241.3 111.6964 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "SP0502BAHTG " (id 1) (at 245.11 95.8214 90)
+    (property "Value" "SP0502BAHTG " (id 1) (at 241.3 114.2364 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-523" (id 2) (at 239.395 95.885 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-523" (id 2) (at 235.585 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 239.395 95.885 0)
+    (property "Datasheet" "~" (id 3) (at 235.585 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PESD2USB3UV-TR" (id 4) (at 239.395 94.615 90)
+    (property "PN" "PESD2USB3UV-TR" (id 4) (at 235.585 113.03 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 419d89b4-24d5-4fa4-9b0e-1311989ccd7e))
@@ -3167,112 +2756,130 @@
     (pin "3" (uuid b2cba1c8-53a1-4b2a-a41a-2c08456882f3))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 80.645 98.425 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 95.25 116.84 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e398854d-9124-42ad-b825-4603074189af)
-    (property "Reference" "R?" (id 0) (at 80.645 100.33 90))
-    (property "Value" "100k" (id 1) (at 80.645 102.235 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 80.645 98.425 0)
+    (property "Reference" "R?" (id 0) (at 95.25 118.745 90))
+    (property "Value" "100k" (id 1) (at 95.25 120.65 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 95.25 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 80.645 98.425 0)
+    (property "Datasheet" "~" (id 3) (at 95.25 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 80.645 98.425 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 95.25 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f7147556-17b7-40d2-8272-ebf2b88e110e))
     (pin "2" (uuid 1fddde55-6867-4a94-a3a9-6c85e0cced46))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 189.865 46.355 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 186.055 64.77 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e6d549d5-e0a5-42fb-a353-07ac194c5021)
-    (property "Reference" "C317" (id 0) (at 185.42 45.72 0))
-    (property "Value" "1uF" (id 1) (at 185.42 47.625 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 189.865 46.355 0)
+    (property "Reference" "C317" (id 0) (at 181.61 64.135 0))
+    (property "Value" "1uF" (id 1) (at 181.61 66.04 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 186.055 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 189.865 46.355 0)
+    (property "Datasheet" "~" (id 3) (at 186.055 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 189.865 46.355 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 186.055 64.77 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 605332b2-0350-45c9-9465-04663fd51bca))
     (pin "2" (uuid 71ee39f6-6a76-425a-84d8-6c764fd0487b))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 205.74 100.33 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 201.93 118.745 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ec41571d-e77b-404d-a1f8-79ec8a5796a3)
-    (property "Reference" "C313" (id 0) (at 200.66 99.695 0))
-    (property "Value" "2.2uF" (id 1) (at 200.66 101.6 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 205.74 100.33 0)
+    (property "Reference" "C313" (id 0) (at 196.85 118.11 0))
+    (property "Value" "2.2uF" (id 1) (at 196.85 120.015 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 201.93 118.745 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 205.74 100.33 0)
+    (property "Datasheet" "~" (id 3) (at 201.93 118.745 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ225KGHT" (id 4) (at 205.74 100.33 90)
+    (property "PN" "EMK212BJ225KGHT" (id 4) (at 201.93 118.745 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 56b6de8d-c912-490c-a668-f9c59a5546e4))
     (pin "2" (uuid 5ece62f4-cb4c-4fe7-bb14-760bb82a7d1c))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 37.465 36.83 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 52.07 55.245 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid eda49dc5-bde2-49b9-98d3-207ad729e674)
-    (property "Reference" "C301" (id 0) (at 32.385 36.195 0))
-    (property "Value" "0.1uF" (id 1) (at 32.385 38.1 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 37.465 36.83 0)
+    (property "Reference" "C301" (id 0) (at 46.99 54.61 0))
+    (property "Value" "0.1uF" (id 1) (at 46.99 56.515 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 52.07 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 37.465 36.83 0)
+    (property "Datasheet" "~" (id 3) (at 52.07 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 37.465 36.83 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 52.07 55.245 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2c2be6fd-f942-4497-9fe0-a7d01eebc825))
     (pin "2" (uuid 5e12ef61-a0e1-48ab-9edf-808a962582a7))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 45.085 70.485 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 59.69 88.9 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ef3e98c5-0612-49f0-b97a-e2ba58435a2d)
-    (property "Reference" "C319" (id 0) (at 40.64 69.85 0))
-    (property "Value" "1uF" (id 1) (at 40.64 71.755 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 45.085 70.485 0)
+    (property "Reference" "C319" (id 0) (at 55.245 88.265 0))
+    (property "Value" "1uF" (id 1) (at 55.245 90.17 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 59.69 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 45.085 70.485 0)
+    (property "Datasheet" "~" (id 3) (at 59.69 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 45.085 70.485 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 59.69 88.9 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f985a0af-acbd-43b5-a948-91a2b449ef1f))
     (pin "2" (uuid 59890977-545f-4abf-aa00-e4e191b24680))
   )
 
-  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 96.52 46.355 90) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 88.9 111.76 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid fb76fb06-e347-431f-8d8c-ce03b454eec4)
+    (property "Reference" "#PWR?" (id 0) (at 88.9 115.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 87.63 111.76 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 88.9 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 88.9 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 233c131c-5fb2-4174-a97a-0e4c4957c578))
+  )
+
+  (symbol (lib_id "Device:Ferrite_Bead_Small") (at 111.125 64.77 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid fdb46592-6e91-485d-a215-9338720dd56e)
-    (property "Reference" "FB301" (id 0) (at 97.79 42.545 90)
+    (property "Reference" "FB301" (id 0) (at 112.395 60.96 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100@100MHz 3A" (id 1) (at 104.14 50.165 90)
+    (property "Value" "100@100MHz 3A" (id 1) (at 118.745 68.58 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 96.52 48.133 90)
+    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 111.125 66.548 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 96.52 46.355 0)
+    (property "Datasheet" "~" (id 3) (at 111.125 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "BLM18KG101TN1D" (id 5) (at 96.52 46.355 0)
+    (property "PN" "BLM18KG101TN1D" (id 5) (at 111.125 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 50553035-48cb-4e3a-b595-53e3bcae233d))
diff --git a/mainboard/gay-ipod.kicad_sch b/mainboard/gay-ipod.kicad_sch
index 35292dc..469db3a 100644
--- a/mainboard/gay-ipod.kicad_sch
+++ b/mainboard/gay-ipod.kicad_sch
@@ -273,6 +273,190 @@
         )
       )
     )
+    (symbol "Device:NetTie_2" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "NT" (id 0) (at 0 1.27 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "NetTie_2" (id 1) (at 0 -1.27 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "net tie short" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Net tie, 2 pins" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Net*Tie*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "NetTie_2_0_1"
+        (polyline
+          (pts
+            (xy -1.27 0)
+            (xy 1.27 0)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "NetTie_2_1_1"
+        (pin passive line (at -2.54 0 0) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 0 180) (length 2.54)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Device:R_Network04" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "RN" (id 0) (at -7.62 0 90)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "R_Network04" (id 1) (at 5.08 0 90)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "Resistor_THT:R_Array_SIP5" (id 2) (at 6.985 0 90)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.vishay.com/docs/31509/csc.pdf" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "R network star-topology" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "4 resistor network, star topology, bussed resistors, small symbol" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "R?Array?SIP*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "R_Network04_0_1"
+        (rectangle (start -6.35 -3.175) (end 3.81 3.175)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (rectangle (start -5.842 1.524) (end -4.318 -2.54)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center -5.08 2.286) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -3.302 1.524) (end -1.778 -2.54)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center -2.54 2.286) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -0.762 1.524) (end 0.762 -2.54)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -5.08 -2.54)
+            (xy -5.08 -3.81)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 -2.54)
+            (xy -2.54 -3.81)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 -2.54)
+            (xy 0 -3.81)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 -2.54)
+            (xy 2.54 -3.81)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -5.08 1.524)
+            (xy -5.08 2.286)
+            (xy -2.54 2.286)
+            (xy -2.54 1.524)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 1.524)
+            (xy -2.54 2.286)
+            (xy 0 2.286)
+            (xy 0 1.524)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 1.524)
+            (xy 0 2.286)
+            (xy 2.54 2.286)
+            (xy 2.54 1.524)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 0 2.286) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start 1.778 1.524) (end 3.302 -2.54)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "R_Network04_1_1"
+        (pin passive line (at -5.08 5.08 270) (length 2.54)
+          (name "common" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -5.08 90) (length 1.27)
+          (name "R1" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -2.54 -5.08 90) (length 1.27)
+          (name "R2" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -5.08 90) (length 1.27)
+          (name "R3" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 -5.08 90) (length 1.27)
+          (name "R4" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:R_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
       (property "Reference" "R" (id 0) (at 0.762 0.508 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -659,7 +843,7 @@
       (property "Value" "ESP32-WROOM" (id 1) (at -3.81 34.29 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 0 -38.1 0)
+      (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 0 -58.42 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "Datasheet" "https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf" (id 3) (at 1.27 -50.8 0)
@@ -675,41 +859,41 @@
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "ESP32-WROOM_0_1"
-        (rectangle (start -17.78 33.02) (end 19.05 -33.02)
+        (rectangle (start -17.78 33.02) (end 19.05 -55.88)
           (stroke (width 0.254) (type default) (color 0 0 0 0))
           (fill (type background))
         )
       )
       (symbol "ESP32-WROOM_1_1"
-        (pin power_in line (at 0 -35.56 90) (length 2.54)
+        (pin power_in line (at 0 -58.42 90) (length 2.54)
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -20.32 2.54 0) (length 2.54)
+        (pin bidirectional line (at -20.32 -10.16 0) (length 2.54)
           (name "IO25" (effects (font (size 1.27 1.27))))
           (number "10" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -26.67 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -50.8 180) (length 2.54)
           (name "I2S.BCK" (effects (font (size 1.27 1.27))))
           (number "11" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -29.21 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -53.34 180) (length 2.54)
           (name "I2S.LRCK" (effects (font (size 1.27 1.27))))
           (number "12" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -20.32 -27.94 0) (length 2.54)
+        (pin bidirectional line (at -20.32 -50.8 0) (length 2.54)
           (name "JTAG.TMS" (effects (font (size 1.27 1.27))))
           (number "13" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -20.32 -22.86 0) (length 2.54)
+        (pin bidirectional line (at -20.32 -45.72 0) (length 2.54)
           (name "JTAG.TDI" (effects (font (size 1.27 1.27))))
           (number "14" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -35.56 90) (length 2.54) hide
+        (pin passive line (at 0 -58.42 90) (length 2.54) hide
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "15" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -20.32 -25.4 0) (length 2.54)
+        (pin bidirectional line (at -20.32 -48.26 0) (length 2.54)
           (name "JTAG.TCK" (effects (font (size 1.27 1.27))))
           (number "16" (effects (font (size 1.27 1.27))))
         )
@@ -741,19 +925,19 @@
           (name "SDI/SD1" (effects (font (size 1.27 1.27))))
           (number "22" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at -20.32 -30.48 0) (length 2.54)
+        (pin bidirectional line (at -20.32 -53.34 0) (length 2.54)
           (name "JTAG.TDO" (effects (font (size 1.27 1.27))))
           (number "23" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 11.43 180) (length 2.54)
+        (pin bidirectional line (at 21.59 5.08 180) (length 2.54)
           (name "I2C.SCL" (effects (font (size 1.27 1.27))))
           (number "24" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -21.59 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -45.72 180) (length 2.54)
           (name "BOOT/I2S.SCK" (effects (font (size 1.27 1.27))))
           (number "25" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 13.97 180) (length 2.54)
+        (pin bidirectional line (at 21.59 7.62 180) (length 2.54)
           (name "I2C.SDA" (effects (font (size 1.27 1.27))))
           (number "26" (effects (font (size 1.27 1.27))))
         )
@@ -765,7 +949,7 @@
           (name "IO17" (effects (font (size 1.27 1.27))))
           (number "28" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -24.13 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -48.26 180) (length 2.54)
           (name "I2S.DOUT" (effects (font (size 1.27 1.27))))
           (number "29" (effects (font (size 1.27 1.27))))
         )
@@ -773,11 +957,11 @@
           (name "EN" (effects (font (size 1.27 1.27))))
           (number "3" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 0 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -11.43 180) (length 2.54)
           (name "SPI.CLK" (effects (font (size 1.27 1.27))))
           (number "30" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -2.54 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -13.97 180) (length 2.54)
           (name "SPI.POCI" (effects (font (size 1.27 1.27))))
           (number "31" (effects (font (size 1.27 1.27))))
         )
@@ -785,7 +969,7 @@
           (name "NC" (effects (font (size 1.27 1.27))))
           (number "32" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -7.62 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -19.05 180) (length 2.54)
           (name "SPI.CS0" (effects (font (size 1.27 1.27))))
           (number "33" (effects (font (size 1.27 1.27))))
         )
@@ -797,35 +981,35 @@
           (name "UART.TX" (effects (font (size 1.27 1.27))))
           (number "35" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -10.16 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -21.59 180) (length 2.54)
           (name "SPI.CS1" (effects (font (size 1.27 1.27))))
           (number "36" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 21.59 -5.08 180) (length 2.54)
+        (pin bidirectional line (at 21.59 -16.51 180) (length 2.54)
           (name "SPI.PICO" (effects (font (size 1.27 1.27))))
           (number "37" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -35.56 90) (length 2.54) hide
+        (pin passive line (at 0 -58.42 90) (length 2.54) hide
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "38" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -35.56 90) (length 2.54) hide
+        (pin passive line (at 0 -58.42 90) (length 2.54) hide
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "39" (effects (font (size 1.27 1.27))))
         )
-        (pin input line (at -20.32 -10.16 0) (length 2.54)
+        (pin input line (at -20.32 -22.86 0) (length 2.54)
           (name "ADC1_CH0/NOINT" (effects (font (size 1.27 1.27))))
           (number "4" (effects (font (size 1.27 1.27))))
         )
-        (pin input line (at -20.32 -5.08 0) (length 2.54)
+        (pin input line (at -20.32 -17.78 0) (length 2.54)
           (name "I39/NOINT" (effects (font (size 1.27 1.27))))
           (number "5" (effects (font (size 1.27 1.27))))
         )
-        (pin input line (at -20.32 0 0) (length 2.54)
+        (pin input line (at -20.32 -12.7 0) (length 2.54)
           (name "I34" (effects (font (size 1.27 1.27))))
           (number "6" (effects (font (size 1.27 1.27))))
         )
-        (pin input line (at -20.32 -2.54 0) (length 2.54)
+        (pin input line (at -20.32 -15.24 0) (length 2.54)
           (name "I35" (effects (font (size 1.27 1.27))))
           (number "7" (effects (font (size 1.27 1.27))))
         )
@@ -841,74 +1025,66 @@
     )
   )
 
-  (bus_alias "I2C" (members ))
-  (junction (at 22.86 73.025) (diameter 0) (color 0 0 0 0)
+  (bus_alias "I2C" (members "SDA" "SCL"))
+  (bus_alias "ESP_SPI" (members "SCLK" "POCI" "PICO" "SD_CS" "DISPLAY_CS"))
+  (bus_alias "SAMD_SPI" (members "SCLK" "POCI" "PICO" "CS"))
+  (bus_alias "I2S" (members "SCK" "BCK" "LRCK" "DATA"))
+  (bus_alias "USB" (members "DN" "DP"))
+  (junction (at 117.475 93.98) (diameter 0) (color 0 0 0 0)
+    (uuid 0d18cb8c-bb6c-457a-9fc2-9cea8145cb95)
+  )
+  (junction (at 22.86 60.325) (diameter 0) (color 0 0 0 0)
     (uuid 18e13186-3c1f-4331-b579-e9ff70165427)
   )
-  (junction (at 88.265 46.355) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.265 33.655) (diameter 0) (color 0 0 0 0)
     (uuid 1a29f8f1-7dd5-4d82-906d-f8a5dd26ea94)
   )
-  (junction (at 241.3 62.23) (diameter 0) (color 0 0 0 0)
+  (junction (at 114.935 91.44) (diameter 0) (color 0 0 0 0)
+    (uuid 2581b760-4c65-491e-82f8-4cb3df302946)
+  )
+  (junction (at 236.22 62.23) (diameter 0) (color 0 0 0 0)
     (uuid 2756e9ab-d562-49f5-988f-576a258984c1)
   )
-  (junction (at 101.6 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 101.6 44.45) (diameter 0) (color 0 0 0 0)
     (uuid 275c7473-d158-48a5-8c38-7ffb2af84ce7)
   )
-  (junction (at 99.06 85.09) (diameter 0) (color 0 0 0 0)
-    (uuid 29b4bdd1-1e8d-479d-a24a-8cdbbbd95dd0)
-  )
-  (junction (at 248.92 83.82) (diameter 0) (color 0 0 0 0)
+  (junction (at 250.825 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 2d03c783-9e91-4813-afb3-d850a58c35a8)
   )
   (junction (at 233.68 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 2d0ff986-952d-4d27-b5dc-cba365a20fce)
   )
-  (junction (at 46.99 66.675) (diameter 0) (color 0 0 0 0)
+  (junction (at 46.99 53.975) (diameter 0) (color 0 0 0 0)
     (uuid 2d7f51de-eb58-41ca-aec6-4a1196b9a5ef)
   )
-  (junction (at 248.92 76.2) (diameter 0) (color 0 0 0 0)
+  (junction (at 250.825 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 36c896cd-527d-4708-9960-fe161a3e5431)
   )
-  (junction (at 31.75 66.675) (diameter 0) (color 0 0 0 0)
+  (junction (at 31.75 53.975) (diameter 0) (color 0 0 0 0)
     (uuid 4309b5ed-e9e0-49ca-ab09-e9b647de88f9)
   )
-  (junction (at 99.06 106.68) (diameter 0) (color 0 0 0 0)
+  (junction (at 100.33 118.11) (diameter 0) (color 0 0 0 0)
     (uuid 4995ba7c-9309-4040-b8f6-c08576a2a414)
   )
-  (junction (at 120.015 79.375) (diameter 0) (color 0 0 0 0)
-    (uuid 4e1d603c-8376-491d-8a94-1bc2392a1816)
-  )
-  (junction (at 113.03 90.17) (diameter 0) (color 0 0 0 0)
-    (uuid 513f405b-ff5b-4bba-bdd5-8e2c76648e5a)
-  )
-  (junction (at 248.285 52.705) (diameter 0) (color 0 0 0 0)
-    (uuid 58a4afae-3a09-4640-9968-3d05524fe18c)
-  )
-  (junction (at 126.365 106.68) (diameter 0) (color 0 0 0 0)
-    (uuid 61a0765c-b1bd-4749-b6a5-4486c4a75bba)
-  )
-  (junction (at 46.99 73.025) (diameter 0) (color 0 0 0 0)
+  (junction (at 46.99 60.325) (diameter 0) (color 0 0 0 0)
     (uuid 623c8439-ad87-4e72-9c52-92bfafeffa44)
   )
-  (junction (at 106.045 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid 675cdc07-47a9-48bd-a0ac-14c24de9f956)
-  )
   (junction (at 205.105 27.94) (diameter 0) (color 0 0 0 0)
     (uuid 6b1f464d-1e2f-43bd-ad0a-5c425190640b)
   )
   (junction (at 178.435 52.705) (diameter 0) (color 0 0 0 0)
     (uuid 70138f34-da7c-4278-b20c-0077edeaf151)
   )
+  (junction (at 112.395 86.36) (diameter 0) (color 0 0 0 0)
+    (uuid 72b1d769-ac40-4ec6-8481-425b4200fc6b)
+  )
   (junction (at 178.435 59.055) (diameter 0) (color 0 0 0 0)
     (uuid 7a4c66fd-cbd3-4d37-a42c-b19a133faa15)
   )
-  (junction (at 241.3 52.705) (diameter 0) (color 0 0 0 0)
-    (uuid 7b56c43f-9111-4aee-99d6-6fe35ed6bfff)
-  )
-  (junction (at 113.03 111.76) (diameter 0) (color 0 0 0 0)
+  (junction (at 105.41 123.19) (diameter 0) (color 0 0 0 0)
     (uuid 8116e7af-92ff-4f4d-87e0-b1a2dd5a4633)
   )
-  (junction (at 248.285 64.77) (diameter 0) (color 0 0 0 0)
+  (junction (at 238.76 64.77) (diameter 0) (color 0 0 0 0)
     (uuid 8427658c-b2ed-4242-9f5c-4c70f4c5d40e)
   )
   (junction (at 210.185 35.56) (diameter 0) (color 0 0 0 0)
@@ -920,88 +1096,76 @@
   (junction (at 224.155 42.545) (diameter 0) (color 0 0 0 0)
     (uuid 93b73054-76da-4422-8cd6-f870b2cf7aee)
   )
-  (junction (at 113.03 100.33) (diameter 0) (color 0 0 0 0)
-    (uuid 95bc15a6-9884-41e0-a1bf-7686926a8377)
-  )
-  (junction (at 120.015 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 107.95 125.73) (diameter 0) (color 0 0 0 0)
     (uuid 98c2a522-85b2-4665-a359-5411b2b227a3)
   )
-  (junction (at 177.165 109.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 114.935 118.11) (diameter 0) (color 0 0 0 0)
+    (uuid 98fef80f-b5c1-41ec-b204-e9d01a7d27f4)
+  )
+  (junction (at 52.07 95.25) (diameter 0) (color 0 0 0 0)
+    (uuid 9af98bef-ffe3-428a-835c-2c36b1c65c0b)
+  )
+  (junction (at 180.34 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 9f3b4152-0f5b-4fdb-ae83-d965ef4bcab5)
   )
-  (junction (at 126.365 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid a4e21d2c-930c-4d50-91e5-dd8a8132596b)
-  )
-  (junction (at 113.03 79.375) (diameter 0) (color 0 0 0 0)
-    (uuid a73ade9d-9333-4323-998c-1563ed0f4b21)
+  (junction (at 106.045 88.9) (diameter 0) (color 0 0 0 0)
+    (uuid a9f714e6-06f2-4ca8-890b-033bbebe28b0)
   )
   (junction (at 201.93 35.56) (diameter 0) (color 0 0 0 0)
     (uuid ab30afcc-67af-4e69-81fe-a6935e4501ea)
   )
-  (junction (at 101.6 71.12) (diameter 0) (color 0 0 0 0)
-    (uuid ab35664f-a158-416f-a491-a166cfaf7d5d)
-  )
-  (junction (at 255.27 67.31) (diameter 0) (color 0 0 0 0)
+  (junction (at 241.3 67.31) (diameter 0) (color 0 0 0 0)
     (uuid abe88f44-4717-47e8-a036-c027f4a96145)
   )
-  (junction (at 31.75 73.025) (diameter 0) (color 0 0 0 0)
+  (junction (at 31.75 60.325) (diameter 0) (color 0 0 0 0)
     (uuid ad8ef7ac-0b5f-402a-b2e9-3c62fe16db26)
   )
-  (junction (at 79.375 39.37) (diameter 0) (color 0 0 0 0)
+  (junction (at 79.375 26.67) (diameter 0) (color 0 0 0 0)
     (uuid afb5f0a8-7664-4641-859c-29e66babbaec)
   )
-  (junction (at 108.585 73.66) (diameter 0) (color 0 0 0 0)
-    (uuid b44eec5b-6dc6-4d6c-85ad-4f447aeee86c)
-  )
-  (junction (at 50.8 52.705) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 40.005) (diameter 0) (color 0 0 0 0)
     (uuid b725ef3d-d8e5-4e5b-b0b3-dbaf2735d92e)
   )
-  (junction (at 50.8 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 50.8 44.45) (diameter 0) (color 0 0 0 0)
     (uuid b7afe2c6-1470-46de-adbc-ca9922e4cf08)
   )
   (junction (at 213.995 35.56) (diameter 0) (color 0 0 0 0)
     (uuid be1eb8c8-a69e-4459-a071-80d30d369a6a)
   )
-  (junction (at 120.015 92.71) (diameter 0) (color 0 0 0 0)
-    (uuid be302528-a18a-4520-a692-a794c54dbbf7)
-  )
   (junction (at 205.105 35.56) (diameter 0) (color 0 0 0 0)
     (uuid bfbabcac-1e33-4a85-8f78-030e26ec3f24)
   )
-  (junction (at 99.06 100.33) (diameter 0) (color 0 0 0 0)
-    (uuid c0cab9de-6d85-4daa-933a-2cb55c65d279)
-  )
   (junction (at 168.91 55.88) (diameter 0) (color 0 0 0 0)
     (uuid c2231c82-7014-4e8f-9212-ad5ca68a9401)
   )
-  (junction (at 106.045 79.375) (diameter 0) (color 0 0 0 0)
-    (uuid c68a9642-534b-45a8-b915-16d93efddcc1)
+  (junction (at 98.425 64.77) (diameter 0) (color 0 0 0 0)
+    (uuid c26878cf-933b-4274-8aea-28fdc8c09cea)
   )
-  (junction (at 248.92 109.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 236.855 109.22) (diameter 0) (color 0 0 0 0)
     (uuid c816b5e1-f400-4557-aaab-bcc3b3cbd1da)
   )
-  (junction (at 233.68 52.705) (diameter 0) (color 0 0 0 0)
-    (uuid caeb1dae-5a30-4749-bc9d-2866f3e3428d)
-  )
-  (junction (at 106.045 109.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 102.87 120.65) (diameter 0) (color 0 0 0 0)
     (uuid cb3505f6-d728-4deb-8643-06ac1d62397f)
   )
-  (junction (at 106.045 100.33) (diameter 0) (color 0 0 0 0)
-    (uuid d18fcee2-8a67-47de-939e-d728662ecf9e)
+  (junction (at 117.475 71.12) (diameter 0) (color 0 0 0 0)
+    (uuid d0e6eeb1-9137-4dd9-8794-ee6cf452b6c5)
   )
-  (junction (at 101.6 65.405) (diameter 0) (color 0 0 0 0)
+  (junction (at 98.425 56.515) (diameter 0) (color 0 0 0 0)
     (uuid d5b20acd-89ab-4d22-917f-73193d4afdf6)
   )
+  (junction (at 105.41 67.31) (diameter 0) (color 0 0 0 0)
+    (uuid d696a411-f58d-4533-84d0-326da8a4a1e4)
+  )
   (junction (at 191.77 42.545) (diameter 0) (color 0 0 0 0)
     (uuid e2cfea78-ab75-4d4a-b7b2-28dc0784782e)
   )
-  (junction (at 99.06 79.375) (diameter 0) (color 0 0 0 0)
-    (uuid e71db14f-5390-42c8-a9d5-35cd80aea291)
-  )
-  (junction (at 75.565 39.37) (diameter 0) (color 0 0 0 0)
+  (junction (at 75.565 26.67) (diameter 0) (color 0 0 0 0)
     (uuid ef743de7-6f81-45c3-a0fe-bd39d038df41)
   )
-  (junction (at 255.905 86.36) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.855 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid f2b1fbfc-fc92-4e2f-9642-2ac2ebccfd70)
+  )
+  (junction (at 257.81 86.36) (diameter 0) (color 0 0 0 0)
     (uuid f2fbe792-c084-4a10-aded-6272b6f123b0)
   )
 
@@ -1013,15 +1177,177 @@
   (no_connect (at 139.065 167.005) (uuid b1be7cac-4a11-4f38-a0c6-84e4f84ed7da))
   (no_connect (at 139.065 174.625) (uuid bc432406-e2dc-48ce-998c-3dbda09bac4a))
 
-  (wire (pts (xy 97.155 73.66) (xy 108.585 73.66))
+  (bus_entry (at 134.62 115.57) (size -2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1fa66a44-a727-43fc-bcb7-1fe6560be0a4)
+  )
+  (bus_entry (at 164.465 106.68) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 23102947-b859-48e6-9dc6-a01664298fe0)
+  )
+  (bus_entry (at 164.465 109.22) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 23102947-b859-48e6-9dc6-a01664298fe1)
+  )
+  (bus_entry (at 164.465 111.76) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 23102947-b859-48e6-9dc6-a01664298fe2)
+  )
+  (bus_entry (at 43.815 123.19) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 3d98ea7f-0d1e-45b8-85de-0a5ca91aea4d)
+  )
+  (bus_entry (at 43.815 115.57) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 495344c0-b1c7-4ad5-855f-ca19b0b20cdc)
+  )
+  (bus_entry (at 43.815 118.11) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 495344c0-b1c7-4ad5-855f-ca19b0b20cdd)
+  )
+  (bus_entry (at 43.815 120.65) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 495344c0-b1c7-4ad5-855f-ca19b0b20cde)
+  )
+  (bus_entry (at 257.81 64.77) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4ffdc5d2-4b5a-4551-815f-7e64faff6e85)
+  )
+  (bus_entry (at 257.81 62.23) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5382ef88-536c-42f2-bdc0-6dd8a7fbcefa)
+  )
+  (bus_entry (at 257.81 59.69) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5b275e70-3598-43a3-8b9a-2d314ae454f4)
+  )
+  (bus_entry (at 161.925 161.925) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6a6cff7e-46bb-4e38-bbce-3ea9d9cec587)
+  )
+  (bus_entry (at 132.08 86.36) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bb1ec31-c00e-4fe2-aabc-46e87d29757f)
+  )
+  (bus_entry (at 132.08 83.82) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bb1ec31-c00e-4fe2-aabc-46e87d297580)
+  )
+  (bus_entry (at 132.08 88.9) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bb1ec31-c00e-4fe2-aabc-46e87d297581)
+  )
+  (bus_entry (at 132.08 93.98) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bb1ec31-c00e-4fe2-aabc-46e87d297582)
+  )
+  (bus_entry (at 132.08 91.44) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bb1ec31-c00e-4fe2-aabc-46e87d297583)
+  )
+  (bus_entry (at 120.015 46.99) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9afb33ab-72fc-4f00-b261-db216c0e9061)
+  )
+  (bus_entry (at 120.015 44.45) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9afb33ab-72fc-4f00-b261-db216c0e9061)
+  )
+  (bus_entry (at 47.625 164.465) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a0d4046b-8e47-46ab-ab88-8c45a733be8f)
+  )
+  (bus_entry (at 47.625 167.005) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a0d4046b-8e47-46ab-ab88-8c45a733be90)
+  )
+  (bus_entry (at 47.625 161.925) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a0d4046b-8e47-46ab-ab88-8c45a733be91)
+  )
+  (bus_entry (at 47.625 169.545) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a0d4046b-8e47-46ab-ab88-8c45a733be92)
+  )
+  (bus_entry (at 161.925 182.245) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a293f9ea-1a6d-43bd-9989-db0653e0566f)
+  )
+  (bus_entry (at 241.935 78.74) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a3ce2336-22e1-460d-aa22-ed27a4a44230)
+  )
+  (bus_entry (at 257.81 67.31) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid aef1bebf-bb82-4c81-8af8-8b8aab207391)
+  )
+  (bus_entry (at 132.08 120.65) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b4b4c2d3-e07c-4745-9d34-0e8375860461)
+  )
+  (bus_entry (at 132.08 125.73) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b4b4c2d3-e07c-4745-9d34-0e8375860462)
+  )
+  (bus_entry (at 132.08 123.19) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b4b4c2d3-e07c-4745-9d34-0e8375860463)
+  )
+  (bus_entry (at 241.935 81.28) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b8f1acd3-2daf-467b-8670-dbba6fa3c80f)
+  )
+  (bus_entry (at 114.935 64.77) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c8e5a79b-fa3f-42df-8964-28fbc8b3f713)
+  )
+  (bus_entry (at 114.935 67.31) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c8e5a79b-fa3f-42df-8964-28fbc8b3f714)
+  )
+  (bus_entry (at 256.54 109.22) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cded69ba-a3db-463e-89fa-f4e2522534a5)
+  )
+  (bus_entry (at 256.54 111.76) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dda81953-b2b9-41d3-ac1e-0a09ac451bd0)
+  )
+  (bus_entry (at 161.925 164.465) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e16ca2be-5194-4e62-8259-bdac47b4940f)
+  )
+  (bus_entry (at 167.64 95.25) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fe43dfc7-8a8c-4eda-8f7a-0beb601e22e3)
+  )
+  (bus_entry (at 167.64 92.71) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fe43dfc7-8a8c-4eda-8f7a-0beb601e22e4)
+  )
+
+  (wire (pts (xy 106.045 78.74) (xy 106.045 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 00af3537-a568-4c62-8ba8-efaa8112dd04)
+  )
+  (wire (pts (xy 117.475 70.485) (xy 117.475 71.12))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0254ade1-ae37-4cd6-876f-ca0b30bb5109)
+  )
+  (bus (pts (xy 43.815 115.57) (xy 43.815 118.11))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 04802d4e-53fd-4596-91f5-826566c504ac)
+  )
+
+  (wire (pts (xy 97.155 67.31) (xy 105.41 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 04ddae2a-037e-4ee1-9360-29d8295546fd)
   )
-  (wire (pts (xy 31.75 66.675) (xy 46.99 66.675))
+  (wire (pts (xy 31.75 53.975) (xy 46.99 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 05118c3e-b786-49c5-8a74-e7e9237fef1d)
   )
-  (wire (pts (xy 255.905 82.55) (xy 255.905 86.36))
+  (wire (pts (xy 257.81 82.55) (xy 257.81 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 058d21f4-9ed4-411c-933d-9c0a3adc4130)
   )
@@ -1033,11 +1359,20 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0741feca-a477-4b54-9e39-cb6bfac16cc4)
   )
-  (wire (pts (xy 83.185 158.75) (xy 88.265 158.75))
+  (wire (pts (xy 231.775 81.28) (xy 241.935 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 088f40b8-d3d7-4476-bc1b-8a185633f660)
+    (uuid 07c72be8-f957-4384-bb28-852bad6d178e)
   )
-  (wire (pts (xy 127 114.3) (xy 120.015 114.3))
+  (bus (pts (xy 260.35 62.23) (xy 260.35 64.77))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 08415a5e-eda4-4e35-86c9-7d21102b09b4)
+  )
+
+  (wire (pts (xy 105.41 123.19) (xy 132.08 123.19))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 08a871d6-cacd-464a-8e8e-01478fee0631)
+  )
+  (wire (pts (xy 107.95 125.73) (xy 132.08 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 08e1b57e-4f00-4d39-9b77-8e1754540bb3)
   )
@@ -1045,19 +1380,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09c07f4f-4d09-41f4-bec4-0707d9b0f58c)
   )
-  (wire (pts (xy 22.86 73.025) (xy 24.765 73.025))
+  (wire (pts (xy 22.86 60.325) (xy 24.765 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09da74e9-a9d1-4424-8cd3-557ac2fdced8)
   )
-  (wire (pts (xy 248.92 76.2) (xy 255.905 76.2))
+  (wire (pts (xy 250.825 76.2) (xy 257.81 76.2))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0adcc687-eb31-4b26-9af0-ac169cb50376)
   )
-  (wire (pts (xy 22.86 74.93) (xy 22.86 73.025))
+  (wire (pts (xy 22.86 62.23) (xy 22.86 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0c52f6b2-4a3b-44cc-8842-df4872d629d5)
   )
-  (wire (pts (xy 257.175 62.23) (xy 241.3 62.23))
+  (wire (pts (xy 114.935 91.44) (xy 132.08 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0cef2194-e703-4f8e-ba27-4806934ca691)
+  )
+  (wire (pts (xy 257.81 62.23) (xy 236.22 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0dc4bf31-976a-47cd-9735-db8b44aa1749)
   )
@@ -1065,15 +1404,24 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0e35f339-4ab5-4960-af8c-bb3aa127cf69)
   )
-  (wire (pts (xy 55.245 68.58) (xy 55.245 66.675))
+  (wire (pts (xy 114.935 109.22) (xy 114.935 111.125))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0e44286e-1bd2-40fc-a93f-fdc08508aa36)
+  )
+  (bus (pts (xy 134.62 115.57) (xy 134.62 118.11))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 109ed7e1-cda1-4df8-83b5-c05ab0a6e1a1)
+  )
+
+  (wire (pts (xy 55.245 55.88) (xy 55.245 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11b5ce25-3d23-47b5-9176-74ed0705c221)
   )
-  (wire (pts (xy 248.92 109.22) (xy 231.775 109.22))
+  (wire (pts (xy 236.855 109.22) (xy 231.775 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11df8008-0783-42bf-9ab4-a158f0768d86)
   )
-  (wire (pts (xy 50.165 57.15) (xy 50.8 57.15))
+  (wire (pts (xy 50.165 44.45) (xy 50.8 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1283c2ca-c4a0-4f01-9e29-9c7369aaeca0)
   )
@@ -1081,27 +1429,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 13abef76-0e4e-4b21-aa0c-16b3d3d63446)
   )
-  (wire (pts (xy 97.155 59.69) (xy 108.585 59.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 145095f3-9cad-48db-a73f-f5b22a8358ba)
-  )
-  (wire (pts (xy 127 106.68) (xy 126.365 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 14e1af72-cc0c-4f0a-a46b-d0a493197f91)
-  )
-  (wire (pts (xy 55.245 71.12) (xy 55.245 73.025))
+  (wire (pts (xy 55.245 58.42) (xy 55.245 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1538a55d-78ca-43b5-b590-6afee5ddda13)
   )
+  (wire (pts (xy 48.895 95.25) (xy 52.07 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 164e0314-fd03-4b14-b21a-720c7c61cd15)
+  )
   (wire (pts (xy 184.785 54.61) (xy 184.785 52.705))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18bff4f8-c75a-42b7-bc4e-0ca7ff82509d)
   )
-  (wire (pts (xy 97.155 90.17) (xy 113.03 90.17))
+  (wire (pts (xy 97.155 88.9) (xy 106.045 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1b9b6879-006a-4e18-a5c5-0c16bdb6c26e)
   )
-  (wire (pts (xy 177.165 109.22) (xy 184.785 109.22))
+  (wire (pts (xy 180.34 109.22) (xy 184.785 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1c0df955-78ed-4529-8903-c6045d483365)
   )
@@ -1114,39 +1458,53 @@
     (uuid 1ce2ea09-2820-46af-82dd-b93773147e56)
   )
 
-  (wire (pts (xy 83.185 161.29) (xy 88.265 161.29))
+  (bus (pts (xy 50.165 159.385) (xy 50.165 161.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1ebdd643-e07f-4560-88d7-0a9b72ad6ac0)
-  )
-  (wire (pts (xy 53.975 107.95) (xy 55.245 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1f5af32d-3849-4420-81e4-c52cb03030e4)
+    (uuid 22df9a72-c8e9-437d-9f9d-5d54a786a5ce)
   )
+
   (wire (pts (xy 224.155 35.56) (xy 224.155 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 239a45b4-a541-425a-a0d3-1a2e61af4dc0)
   )
+  (wire (pts (xy 139.065 164.465) (xy 161.925 164.465))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 246a3b9e-7910-46fa-8a0a-5fe8ace57d4e)
+  )
+  (wire (pts (xy 109.855 83.82) (xy 132.08 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 24d3a19c-b664-4c20-b99f-694ac12c763c)
+  )
   (wire (pts (xy 178.435 52.705) (xy 178.435 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 25ad46b9-b836-4269-b39e-20499d254a53)
   )
-  (wire (pts (xy 172.72 109.22) (xy 177.165 109.22))
+  (wire (pts (xy 112.395 86.36) (xy 132.08 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 26a9ed26-8ce5-4bfc-a36c-5e3cbc712f65)
+  )
+  (wire (pts (xy 167.005 109.22) (xy 180.34 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 26d9367d-7d0b-446e-8b54-994356efffa9)
   )
-  (wire (pts (xy 120.015 92.71) (xy 132.08 92.71))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 28798272-6754-4b80-a447-f79e62eccca6)
-  )
-  (wire (pts (xy 75.565 39.37) (xy 79.375 39.37))
+  (wire (pts (xy 75.565 26.67) (xy 79.375 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 28862379-1460-425d-b8a4-4e1fcfa2a4d4)
   )
-  (wire (pts (xy 50.8 45.085) (xy 50.8 44.45))
+  (wire (pts (xy 52.07 96.52) (xy 52.07 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 28e04df1-1008-4e74-aee9-d1a1f3ce51dc)
+  )
+  (bus (pts (xy 167.64 90.17) (xy 167.64 92.71))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 28ea2529-4aff-44e4-afe9-d15801b370ec)
+  )
+
+  (wire (pts (xy 50.8 32.385) (xy 50.8 31.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 299b818c-dfdf-4419-acf7-c1963c66959d)
   )
-  (wire (pts (xy 99.06 106.68) (xy 97.155 106.68))
+  (wire (pts (xy 100.33 118.11) (xy 97.155 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 29a3b47a-78e2-41f6-bea9-23775e10d2e9)
   )
@@ -1154,13 +1512,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2a2e0502-a850-4cc6-a8ce-d2511226db26)
   )
-  (wire (pts (xy 127 109.22) (xy 106.045 109.22))
+  (bus (pts (xy 134.62 118.11) (xy 134.62 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2a684930-3e8d-4681-a2d6-235ed5175fd3)
+    (uuid 2a700023-e048-4cc8-b75f-c7f1c08114da)
   )
-  (wire (pts (xy 53.975 113.03) (xy 55.245 113.03))
+  (bus (pts (xy 164.465 106.68) (xy 164.465 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2adcc7e7-2986-4c87-9df8-d808955798f1)
+    (uuid 2b108723-2bbe-4b73-9149-4428fe9ff020)
+  )
+  (bus (pts (xy 122.555 41.91) (xy 122.555 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2ca73061-0324-4a50-86f9-4cd523e7beac)
+  )
+
+  (wire (pts (xy 231.775 86.36) (xy 257.81 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2d499b55-8407-4788-a94f-ef17fed2cb8e)
   )
   (wire (pts (xy 201.93 35.56) (xy 191.77 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1170,11 +1537,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 300606f0-2773-4250-bfef-ca5da9791bd8)
   )
-  (wire (pts (xy 22.86 66.675) (xy 24.765 66.675))
+  (wire (pts (xy 22.86 53.975) (xy 24.765 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 301d19cf-b594-4ae8-82c2-ac9815c33bcf)
   )
-  (wire (pts (xy 97.155 85.09) (xy 99.06 85.09))
+  (wire (pts (xy 97.155 83.82) (xy 109.855 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30b41213-638d-4978-b5b6-fc4ea6d4be4d)
   )
@@ -1182,7 +1549,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30b4c32f-94d5-43b2-b6d7-b77728abf817)
   )
-  (wire (pts (xy 42.545 57.15) (xy 42.545 58.42))
+  (wire (pts (xy 42.545 44.45) (xy 42.545 45.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30d748cc-e15b-4727-a344-4d857eb3e08e)
   )
@@ -1190,32 +1557,36 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30f601a9-6080-4764-8fdf-5133905a2c2f)
   )
-  (wire (pts (xy 177.165 95.25) (xy 178.435 95.25))
+  (wire (pts (xy 109.855 81.28) (xy 109.855 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 31b45150-e0cb-4170-a525-c1cc4af54096)
+    (uuid 31e0d9f2-b9a0-4a77-8d27-824d1c20d8d2)
   )
-  (wire (pts (xy 97.155 87.63) (xy 106.045 87.63))
+  (wire (pts (xy 114.935 116.205) (xy 114.935 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3884d56f-eebf-46a0-88b8-76eb881f0f21)
+    (uuid 333127a5-11cf-4833-b376-b2e377618dee)
+  )
+  (wire (pts (xy 106.045 88.9) (xy 132.08 88.9))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 337ed3e8-6c99-45d3-b383-0670586e89b7)
   )
   (polyline (pts (xy 116.205 146.05) (xy 175.895 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3964afb8-50b1-49cb-a82b-88e9c1673b91)
   )
 
-  (wire (pts (xy 29.845 73.025) (xy 31.75 73.025))
+  (wire (pts (xy 29.845 60.325) (xy 31.75 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 39b428d7-3c0e-458e-a221-88b1a55cdc97)
   )
-  (wire (pts (xy 31.75 73.025) (xy 31.75 72.39))
+  (wire (pts (xy 31.75 60.325) (xy 31.75 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a237485-27ea-44b3-b007-d0c4c59223e0)
   )
-  (wire (pts (xy 48.26 52.705) (xy 50.8 52.705))
+  (wire (pts (xy 48.26 40.005) (xy 50.8 40.005))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3b625191-c0a1-448f-a884-8ec65d0225af)
   )
-  (wire (pts (xy 75.565 39.37) (xy 75.565 49.53))
+  (wire (pts (xy 75.565 26.67) (xy 75.565 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e585de6-e2ae-4ee4-acc1-f34df63e1841)
   )
@@ -1223,26 +1594,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3f284552-528e-4333-94b5-e60c004936be)
   )
-  (wire (pts (xy 99.06 105.41) (xy 99.06 106.68))
+  (wire (pts (xy 114.935 81.28) (xy 114.935 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 40478de5-45f6-455f-830a-e6ab5b93b307)
+  )
+  (wire (pts (xy 100.33 113.665) (xy 100.33 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 432a23f4-6d0e-485f-9898-880d14be4947)
   )
-  (wire (pts (xy 248.92 102.87) (xy 248.92 103.505))
+  (wire (pts (xy 236.855 102.87) (xy 236.855 103.505))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 43b9685a-fd5d-4f20-b10d-a7ea67c2a8ae)
   )
-  (wire (pts (xy 248.285 57.785) (xy 248.285 64.77))
+  (wire (pts (xy 238.76 57.785) (xy 238.76 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 448d6465-26dc-4016-8f96-4fa89e0bb22c)
   )
-  (wire (pts (xy 241.3 52.705) (xy 248.285 52.705))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 46c8c335-a254-4db4-a512-814d16191c06)
-  )
-  (wire (pts (xy 233.68 81.28) (xy 231.775 81.28))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4716ce68-6809-4171-b8fb-63fdf1477d35)
-  )
   (wire (pts (xy 183.515 77.47) (xy 184.785 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 474614c2-f0f1-4023-803a-ed5ba6fb2a86)
@@ -1251,10 +1618,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 477da0a3-dd5e-4061-8102-fbd263e8e25d)
   )
-  (wire (pts (xy 106.045 84.455) (xy 106.045 87.63))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 480e0f63-066e-47ec-b5bb-68b3dbccee3c)
-  )
   (wire (pts (xy 183.515 80.01) (xy 184.785 80.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4853a12a-9127-4c0f-a201-e896ebdaa41f)
@@ -1263,11 +1626,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4a6eaf90-9c39-48f1-aab5-e38c895cf63a)
   )
-  (wire (pts (xy 126.365 84.455) (xy 126.365 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4a8c1c08-b3db-4b4e-80a5-4e098f2d7067)
-  )
-  (wire (pts (xy 55.245 66.675) (xy 46.99 66.675))
+  (wire (pts (xy 55.245 53.975) (xy 46.99 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4bb301a3-47e0-4a57-9c1e-2f04b815484e)
   )
@@ -1275,15 +1634,24 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4bedbdd9-3fa7-4e1a-b070-7946f1491f9a)
   )
-  (wire (pts (xy 255.905 86.36) (xy 262.255 86.36))
+  (wire (pts (xy 257.81 86.36) (xy 264.16 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4cb9389c-8651-4d5d-b86f-e36f793741d3)
   )
-  (wire (pts (xy 99.06 106.68) (xy 126.365 106.68))
+  (wire (pts (xy 46.355 120.65) (xy 55.245 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 51d14449-8f67-42aa-873d-db020f23623e)
+    (uuid 4f8435e1-e70b-45e4-8be2-731ce0ab5053)
   )
-  (wire (pts (xy 231.775 111.76) (xy 254.635 111.76))
+  (wire (pts (xy 231.775 83.82) (xy 250.825 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 53835370-6dd5-44a2-8df1-6fbea10f9065)
+  )
+  (bus (pts (xy 244.475 76.2) (xy 244.475 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 53d14094-c989-43db-941b-03fe99c65d6f)
+  )
+
+  (wire (pts (xy 231.775 111.76) (xy 256.54 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 54a463b5-0758-4078-8176-5887e397aec6)
   )
@@ -1291,26 +1659,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 54bc4b15-c367-43e1-bdd6-81495d57f7ef)
   )
-  (wire (pts (xy 257.175 59.69) (xy 233.68 59.69))
+  (wire (pts (xy 231.775 78.74) (xy 241.935 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 54c9ab18-ddd7-4770-be86-db3770afc4be)
+  )
+  (wire (pts (xy 257.81 59.69) (xy 233.68 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5561d8ba-178a-4772-90e7-4ec890bafb89)
   )
-  (wire (pts (xy 97.155 92.71) (xy 120.015 92.71))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 55b5779b-230e-4ebb-a6e8-cfb4c33b76b9)
-  )
-  (wire (pts (xy 233.68 52.07) (xy 233.68 52.705))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 55dc7038-2262-45e4-9a24-70966a3193f2)
-  )
-  (wire (pts (xy 113.03 105.41) (xy 113.03 111.76))
+  (wire (pts (xy 105.41 113.665) (xy 105.41 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 561a4c3d-5130-49e1-85cc-0ef696cbc137)
   )
-  (wire (pts (xy 53.975 110.49) (xy 55.245 110.49))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 565184d3-3d18-4fea-b739-74750d74be63)
-  )
   (wire (pts (xy 210.185 127.635) (xy 210.185 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 570555c0-4a22-428c-a147-f43709db958d)
@@ -1319,31 +1679,41 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 58b7e761-eb95-4c95-9bec-2efafa13d0d8)
   )
-  (wire (pts (xy 79.375 39.37) (xy 88.265 39.37))
+  (wire (pts (xy 79.375 26.67) (xy 88.265 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 599f5623-c59a-4d26-b11d-e41b047b3ae3)
   )
-  (wire (pts (xy 113.03 90.17) (xy 132.08 90.17))
+  (wire (pts (xy 139.065 182.245) (xy 161.925 182.245))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5a2a83d4-8754-4f47-b5ef-5a5df1645e4a)
+    (uuid 5a5b9211-3b5f-45e5-8e0d-f97bad023e45)
   )
-  (wire (pts (xy 254.635 109.22) (xy 248.92 109.22))
+  (wire (pts (xy 256.54 109.22) (xy 236.855 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5a90c6fe-9a4e-4b02-8747-692f17757fc7)
   )
-  (wire (pts (xy 75.565 36.83) (xy 75.565 39.37))
+  (wire (pts (xy 75.565 24.13) (xy 75.565 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5b996ea6-7b1a-4aa7-856e-df49b0c26427)
   )
-  (wire (pts (xy 31.75 73.025) (xy 46.99 73.025))
+  (wire (pts (xy 31.75 60.325) (xy 46.99 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5bcaf919-9874-49b5-ab01-1080f175222e)
   )
+  (bus (pts (xy 164.465 109.22) (xy 164.465 111.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5c1ac2c9-1046-43d3-8be8-2b2813b8ffbc)
+  )
+
   (wire (pts (xy 233.68 96.52) (xy 231.775 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c2427b7-a957-4ccc-a1b8-de9eb2f94ec4)
   )
-  (wire (pts (xy 113.03 111.76) (xy 97.155 111.76))
+  (bus (pts (xy 164.465 161.925) (xy 164.465 179.705))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5c336858-652a-44d2-97a4-6be86cc42c16)
+  )
+
+  (wire (pts (xy 105.41 123.19) (xy 97.155 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c3757b8-163b-408b-8762-92e05c680fb3)
   )
@@ -1351,6 +1721,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5cc44c59-9286-4b02-970c-63948cf1e6fa)
   )
+  (wire (pts (xy 46.355 118.11) (xy 55.245 118.11))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5d2fa211-e458-4456-9197-d26a0e5f0b2a)
+  )
   (wire (pts (xy 46.355 177.165) (xy 44.4351 177.165))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5e34c949-e141-4501-9fc0-453d54c8db72)
@@ -1360,15 +1734,19 @@
     (uuid 5ec73d14-cc2d-45e8-b353-648b4fd10d9e)
   )
 
-  (wire (pts (xy 53.975 115.57) (xy 55.245 115.57))
+  (wire (pts (xy 170.18 97.79) (xy 178.435 97.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5f7fb2e3-64ee-4466-97ad-ad748f1a1eef)
+    (uuid 5fd8ae4a-2587-40cc-bf15-a383506a9bfa)
   )
-  (wire (pts (xy 29.845 66.675) (xy 31.75 66.675))
+  (wire (pts (xy 46.355 123.19) (xy 55.245 123.19))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 628e7ea7-2e08-4e39-981e-4d53dcb2a222)
+  )
+  (wire (pts (xy 29.845 53.975) (xy 31.75 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 62c0035b-4589-4993-8d2e-a82500fe426b)
   )
-  (wire (pts (xy 31.75 66.675) (xy 31.75 67.31))
+  (wire (pts (xy 31.75 53.975) (xy 31.75 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 63784934-6b9a-43b7-9367-6ac5a7109448)
   )
@@ -1376,11 +1754,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 639fdb1a-ddee-4eab-816a-2b113753582b)
   )
-  (wire (pts (xy 79.375 45.72) (xy 79.375 46.355))
+  (wire (pts (xy 79.375 33.02) (xy 79.375 33.655))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 63fa5e23-fab9-45d9-8cfd-2e819b2f1f2b)
   )
-  (wire (pts (xy 79.375 46.355) (xy 88.265 46.355))
+  (wire (pts (xy 79.375 33.655) (xy 88.265 33.655))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 66024abe-8722-4054-a18c-54770a215c51)
   )
@@ -1392,27 +1770,32 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 67d962fc-de5b-45ef-b0f7-e58625382cb7)
   )
-  (wire (pts (xy 88.265 39.37) (xy 88.265 40.64))
+  (wire (pts (xy 88.265 26.67) (xy 88.265 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 68b130f5-c487-49aa-bd82-42b4a7ddc4bc)
   )
-  (wire (pts (xy 233.68 52.705) (xy 241.3 52.705))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 69a4b251-5d63-4dde-afcd-f64ac2e0d922)
-  )
   (wire (pts (xy 191.77 35.56) (xy 191.77 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ae0b25a-252c-4367-8619-e773edbd0797)
   )
-  (wire (pts (xy 108.585 73.66) (xy 114.935 73.66))
+  (bus (pts (xy 134.62 88.9) (xy 134.62 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6c086678-c419-4f32-8daf-55b9a516669a)
+  )
+
+  (wire (pts (xy 105.41 67.31) (xy 114.935 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c474526-9938-40a4-bab5-af1329f844cf)
   )
+  (wire (pts (xy 114.935 118.11) (xy 132.08 118.11))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6e2017ca-066f-4554-b84b-bf31120e3035)
+  )
   (wire (pts (xy 224.155 42.545) (xy 224.155 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ed3713a-76e1-4e91-9a75-aff5144dc011)
   )
-  (wire (pts (xy 101.6 70.485) (xy 101.6 71.12))
+  (wire (pts (xy 98.425 61.595) (xy 98.425 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f5923b8-01fd-4d25-8f42-7fb1029815a6)
   )
@@ -1420,35 +1803,46 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f6eeadb-16f2-4f64-a9c2-accc64100e41)
   )
-  (wire (pts (xy 120.015 79.375) (xy 126.365 79.375))
+  (bus (pts (xy 134.62 120.65) (xy 134.62 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 71f87d27-00b7-4faa-8536-e062f7e0eded)
+    (uuid 70c8c593-d9f5-4ef1-811a-de2406f7fea6)
   )
-  (wire (pts (xy 248.285 52.705) (xy 255.27 52.705))
+
+  (wire (pts (xy 167.005 111.76) (xy 184.785 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 724e7c09-c45a-4f17-9afb-e68f6d6d1290)
+    (uuid 70f50345-fe54-4616-b08d-dc06ce598a5e)
   )
-  (wire (pts (xy 248.92 76.2) (xy 248.92 74.93))
+  (bus (pts (xy 164.465 111.76) (xy 164.465 159.385))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7106eb7c-3e46-4a30-84c6-d58164475c36)
+  )
+
+  (wire (pts (xy 250.825 76.2) (xy 250.825 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7437c64e-5edb-4d70-8937-f6476aed8e2e)
   )
-  (wire (pts (xy 50.8 52.705) (xy 50.8 50.165))
+  (wire (pts (xy 50.8 40.005) (xy 50.8 37.465))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 75a1971d-80be-40eb-b698-11cf69b1905e)
   )
-  (wire (pts (xy 183.515 72.39) (xy 184.785 72.39))
+  (wire (pts (xy 169.545 72.39) (xy 184.785 72.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 767b197c-9021-47bb-b04a-7db7f4ba6b6a)
   )
-  (wire (pts (xy 120.015 84.455) (xy 120.015 92.71))
+  (wire (pts (xy 38.1 164.465) (xy 47.625 164.465))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7a05f578-67b3-46f4-bfeb-2e17e6257d15)
+    (uuid 77feaff7-1531-46d5-a47b-8f5ce5967421)
   )
-  (wire (pts (xy 126.365 104.14) (xy 126.365 106.68))
+  (bus (pts (xy 43.815 120.65) (xy 43.815 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7e17c6c9-873e-421d-8b16-36ad17b101cf)
+    (uuid 782d4d82-8253-4d56-8b68-440deb17d446)
   )
-  (wire (pts (xy 101.6 50.8) (xy 101.6 51.435))
+
+  (wire (pts (xy 46.355 125.73) (xy 55.245 125.73))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7a0be4d2-c889-4b7f-9413-1ca0aa4c551e)
+  )
+  (wire (pts (xy 101.6 38.1) (xy 101.6 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7e4b7b9a-a29d-45f2-aac6-2bebe749d0e0)
   )
@@ -1456,15 +1850,19 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f2fd69d-db82-4074-8b03-b2e62145fab5)
   )
-  (wire (pts (xy 231.775 86.36) (xy 255.905 86.36))
+  (wire (pts (xy 117.475 81.28) (xy 117.475 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7f4e5997-ecae-4425-a0c1-f435503df706)
+    (uuid 7fac1b8a-49ad-4bdf-b2a0-5b20f42d182a)
   )
-  (wire (pts (xy 255.27 57.785) (xy 255.27 67.31))
+  (wire (pts (xy 241.3 57.785) (xy 241.3 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 80a8896f-76aa-42ff-b39c-6e4f19a0bee5)
   )
-  (wire (pts (xy 101.6 71.12) (xy 114.935 71.12))
+  (wire (pts (xy 170.18 95.25) (xy 178.435 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 81253f66-bda7-4963-ba01-3f96462bad72)
+  )
+  (wire (pts (xy 98.425 64.77) (xy 114.935 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81b63f87-74f1-439a-abe7-e29a9431b366)
   )
@@ -1472,7 +1870,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 823ac76a-8bed-48e6-8c2c-62f4cde5ebd8)
   )
-  (wire (pts (xy 106.045 109.22) (xy 97.155 109.22))
+  (bus (pts (xy 167.64 92.71) (xy 167.64 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 82dee8da-fd56-40cf-9e6a-f2adaa637f89)
+  )
+
+  (wire (pts (xy 102.87 120.65) (xy 97.155 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 83f915cd-0333-4988-a376-843b0114400d)
   )
@@ -1481,44 +1884,57 @@
     (uuid 84df5a91-c224-4d05-9fbb-52703eaaa35d)
   )
 
-  (wire (pts (xy 172.72 114.3) (xy 184.785 114.3))
+  (wire (pts (xy 167.005 114.3) (xy 184.785 114.3))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8516dd50-7dd1-4f92-b158-c72fa45970c2)
   )
+  (wire (pts (xy 38.1 167.005) (xy 47.625 167.005))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8683b4a8-be2c-4a72-a638-34f4a66d7e94)
+  )
+  (wire (pts (xy 100.33 118.11) (xy 114.935 118.11))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 86d7e426-aaf9-4cff-bd50-d5e9d517a579)
+  )
+  (wire (pts (xy 38.1 169.545) (xy 47.625 169.545))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8b55dbd0-710a-4c38-93cd-f75a1cf90304)
+  )
   (wire (pts (xy 233.68 59.69) (xy 231.775 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d07af05-4569-4bd3-959d-35fe8f62ff28)
   )
-  (wire (pts (xy 231.775 64.77) (xy 248.285 64.77))
+  (wire (pts (xy 231.775 64.77) (xy 238.76 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e475f82-9ed4-4f3e-9cd5-95cae3c645bf)
   )
-  (wire (pts (xy 120.015 114.3) (xy 97.155 114.3))
+  (wire (pts (xy 107.95 125.73) (xy 97.155 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9029a38d-1268-47bc-8982-ca03522685b8)
   )
-  (wire (pts (xy 177.165 108.585) (xy 177.165 109.22))
+  (bus (pts (xy 43.815 137.16) (xy 50.165 137.16))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 91cbe613-02d6-4d52-b1a2-6c10cf94138d)
+  )
+
+  (wire (pts (xy 180.34 108.585) (xy 180.34 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 92594057-07d3-43ac-a018-b88a99591c00)
   )
-  (wire (pts (xy 241.3 62.23) (xy 231.775 62.23))
+  (wire (pts (xy 236.22 62.23) (xy 231.775 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93943739-70be-4aa9-b4e5-f49a5b28d06f)
   )
-  (wire (pts (xy 99.06 79.375) (xy 106.045 79.375))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 949f7772-f483-4744-a3e2-be7caed2ff0f)
-  )
   (polyline (pts (xy 116.205 196.85) (xy 175.895 196.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 96582a4b-7fbe-4d4b-9530-07bb7516606b)
   )
 
-  (wire (pts (xy 127 111.76) (xy 113.03 111.76))
+  (wire (pts (xy 139.065 161.925) (xy 161.925 161.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 990d6731-1513-4858-ac68-afbd2d9bc849)
+    (uuid 9700dcef-c047-4804-8134-6052fbf48bc4)
   )
-  (wire (pts (xy 97.155 57.15) (xy 101.6 57.15))
+  (wire (pts (xy 97.155 44.45) (xy 101.6 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ba40237-1ead-46e6-99db-f2fa7bfd226e)
   )
@@ -1530,26 +1946,26 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9daa939a-f0d1-4887-b87d-ad7b035e69f0)
   )
-  (wire (pts (xy 101.6 57.15) (xy 108.585 57.15))
+  (wire (pts (xy 101.6 44.45) (xy 120.015 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9db6962d-a1d4-42ea-b976-89e369908ac9)
   )
-  (wire (pts (xy 248.92 76.2) (xy 248.92 77.47))
+  (wire (pts (xy 250.825 76.2) (xy 250.825 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9ebd7990-fd25-40ff-a993-fbe9a4627e9a)
   )
-  (wire (pts (xy 99.06 100.33) (xy 106.045 100.33))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9ee0c4d5-d5ed-4383-b591-2a32f89022dd)
-  )
-  (wire (pts (xy 46.99 66.675) (xy 46.99 67.31))
+  (wire (pts (xy 46.99 53.975) (xy 46.99 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f317da3-a792-445f-ae8a-45f817c10deb)
   )
-  (wire (pts (xy 241.3 57.785) (xy 241.3 62.23))
+  (wire (pts (xy 236.22 57.785) (xy 236.22 62.23))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2a6fb7d-97e3-438a-a800-450478a2c91c)
   )
+  (wire (pts (xy 75.565 131.445) (xy 75.565 130.81))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a33ea4f0-64ed-4784-8521-d7fa6b891609)
+  )
   (wire (pts (xy 205.105 26.035) (xy 205.105 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a392461d-1541-4b98-99f6-64476b79c089)
@@ -1562,14 +1978,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a41b945c-6157-4fe9-922a-15736e5439f4)
   )
-  (wire (pts (xy 177.165 97.79) (xy 178.435 97.79))
+  (wire (pts (xy 38.1 161.925) (xy 47.625 161.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a69b30f7-3e6b-4505-8df9-dff8836eb80a)
+    (uuid a50a0adb-b9a1-46a8-8b23-6026c7b755f4)
   )
-  (wire (pts (xy 113.03 84.455) (xy 113.03 90.17))
+  (wire (pts (xy 116.205 109.22) (xy 114.935 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a6e238df-8988-4a80-972c-bb7a6052e6f0)
+    (uuid a68d33e0-e5a0-47b7-9280-808e352c42b3)
   )
+  (wire (pts (xy 106.045 71.12) (xy 117.475 71.12))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a6d494e6-cb39-4a52-b0b0-06e2df4e8f47)
+  )
+  (bus (pts (xy 134.62 78.105) (xy 134.62 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a7e1d2b7-f9a5-40c0-8558-294794326f06)
+  )
+
   (wire (pts (xy 183.515 95.25) (xy 184.785 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a9247eff-5a68-4d80-8e5d-d63731318100)
@@ -1578,27 +2003,44 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ac514bbb-65b4-480c-8266-7cb6469fad3a)
   )
-  (wire (pts (xy 172.72 111.76) (xy 184.785 111.76))
+  (bus (pts (xy 134.62 91.44) (xy 134.62 88.9))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b2945476-2433-4fc3-8315-6fd602727f46)
+    (uuid ac5bb00d-aa2c-441b-8965-6cb0c9f8490d)
   )
-  (wire (pts (xy 248.92 83.82) (xy 262.255 83.82))
+  (bus (pts (xy 134.62 86.36) (xy 134.62 83.82))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b05cdd34-58c6-406a-b4d1-4ef7b7bfcbd8)
+  )
+  (bus (pts (xy 117.475 62.23) (xy 117.475 64.77))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b1da9f43-1c01-4f85-b2e0-bde075dd1880)
+  )
+  (bus (pts (xy 122.555 39.37) (xy 122.555 41.91))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b2b9c3d9-5de4-4bd2-a322-968faebdf1f6)
+  )
+
+  (wire (pts (xy 250.825 83.82) (xy 264.16 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b75f8184-c6dd-4ec2-be37-16d6f439df71)
   )
+  (wire (pts (xy 117.475 93.98) (xy 132.08 93.98))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b8c989f8-3fb8-4f72-841a-e144a878d632)
+  )
   (wire (pts (xy 191.77 42.545) (xy 191.77 43.18))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ba0bd363-8a7f-4869-9c20-d9bbcbc43e23)
   )
-  (wire (pts (xy 45.085 57.15) (xy 42.545 57.15))
+  (wire (pts (xy 45.085 44.45) (xy 42.545 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ba704b79-ef69-4df8-bc11-a91604ab7b05)
   )
-  (wire (pts (xy 46.99 73.025) (xy 55.245 73.025))
+  (wire (pts (xy 46.99 60.325) (xy 55.245 60.325))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bba9eb13-e92c-4ba6-86d2-3504629e4f5e)
   )
-  (wire (pts (xy 183.515 74.93) (xy 184.785 74.93))
+  (wire (pts (xy 169.545 74.93) (xy 184.785 74.93))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bcc41310-cc27-43ca-8aa5-9671046aa6fc)
   )
@@ -1606,6 +2048,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be346cc0-7cee-4f1b-b2f8-b8b1b7122066)
   )
+  (bus (pts (xy 164.465 106.045) (xy 164.465 106.68))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid beb895b5-cbfe-4a92-954a-c7e461d3677f)
+  )
+
   (polyline (pts (xy 13.335 146.05) (xy 114.935 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bfc3a83e-9bbd-4286-be63-41093c72319b)
@@ -1619,11 +2066,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c1375967-a296-4fb0-96f3-927382ae31b1)
   )
-  (wire (pts (xy 126.365 95.25) (xy 132.08 95.25))
+  (bus (pts (xy 134.62 83.82) (xy 134.62 81.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c1b8d0c5-79fa-4208-b32d-f44c1707aaec)
+    (uuid c1db9a25-9663-409b-8f8f-382f7b648f46)
   )
-  (wire (pts (xy 108.585 70.485) (xy 108.585 73.66))
+
+  (wire (pts (xy 105.41 61.595) (xy 105.41 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c2ea3cc6-f79e-4ea6-a79a-00ec65e1e592)
   )
@@ -1635,71 +2083,73 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c4df4607-175f-4b45-a698-ebb811a17986)
   )
-  (wire (pts (xy 231.775 83.82) (xy 248.92 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c564e5f8-88c1-4e57-8da3-4eeff10f4eeb)
-  )
   (wire (pts (xy 210.185 35.56) (xy 213.995 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c5d22905-47fc-4be7-a5d1-d39d92c87e00)
   )
-  (wire (pts (xy 248.92 108.585) (xy 248.92 109.22))
+  (wire (pts (xy 236.855 108.585) (xy 236.855 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c75a3a50-e38a-40cd-9d5a-5ca26fbdf9da)
   )
-  (wire (pts (xy 99.06 99.06) (xy 99.06 100.33))
+  (wire (pts (xy 112.395 81.28) (xy 112.395 86.36))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ca677502-1d87-48f4-8f91-e42362da3fc4)
+    (uuid c818087e-7aa5-4487-a88f-397d9b3ac073)
   )
+  (bus (pts (xy 259.08 106.68) (xy 259.08 109.22))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c9ac3835-64ac-411e-8c9d-4c5b45cc8340)
+  )
+  (bus (pts (xy 50.165 137.16) (xy 50.165 159.385))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ca252c28-3d40-4744-bdfa-8952f74bbdd0)
+  )
+  (bus (pts (xy 50.165 161.925) (xy 50.165 164.465))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid caf76c91-9f38-413e-8e44-0445975cc028)
+  )
+
   (wire (pts (xy 168.91 55.88) (xy 165.735 55.88))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb1c960f-76d7-4042-b275-44dd3111df60)
   )
-  (wire (pts (xy 233.68 78.74) (xy 231.775 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cb5c98b8-0d6d-46e8-bff1-d12873661870)
-  )
-  (wire (pts (xy 127 104.14) (xy 126.365 104.14))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cc61a515-378e-4a33-b77d-61ca372dfafa)
-  )
-  (wire (pts (xy 106.045 105.41) (xy 106.045 109.22))
+  (wire (pts (xy 102.87 113.665) (xy 102.87 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc6d25cf-75e9-4c95-9f40-21836f8997e0)
   )
-  (wire (pts (xy 106.045 100.33) (xy 113.03 100.33))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ccdbc547-4626-4f39-b5e7-eeafdedbf5e9)
-  )
-  (wire (pts (xy 99.06 85.09) (xy 132.08 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cd00c3a8-d75c-414a-afa9-582884a10619)
-  )
-  (wire (pts (xy 101.6 64.77) (xy 101.6 65.405))
+  (wire (pts (xy 98.425 54.61) (xy 98.425 56.515))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd0b705d-b1bf-4c6a-91ad-9be8c9b03c4b)
   )
-  (wire (pts (xy 53.975 95.25) (xy 55.245 95.25))
+  (wire (pts (xy 102.87 120.65) (xy 132.08 120.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cd29b6f1-052a-403b-91ae-e2568f9d8da4)
+    (uuid cd2afbfd-048d-4ed8-9714-0444b89e3095)
   )
   (wire (pts (xy 213.995 35.56) (xy 224.155 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd5bdcdb-39b0-46f2-966d-46fd01943dc3)
   )
-  (wire (pts (xy 255.905 76.2) (xy 255.905 77.47))
+  (wire (pts (xy 257.81 76.2) (xy 257.81 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd686b6b-dfbc-452b-978e-d0ffde9edce4)
   )
-  (wire (pts (xy 101.6 65.405) (xy 108.585 65.405))
+  (wire (pts (xy 98.425 56.515) (xy 105.41 56.515))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cea66869-b759-4e30-96a3-8541fc6b962a)
   )
+  (wire (pts (xy 52.07 95.25) (xy 55.245 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cf67a068-0001-4588-844d-1eedf5fb19ec)
+  )
+  (bus (pts (xy 117.475 60.325) (xy 117.475 62.23))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cfa71cba-d20f-47c5-a9d0-8d3ec3c99d03)
+  )
+
   (wire (pts (xy 46.355 174.625) (xy 44.45 174.625))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d0b99028-a9fd-4f58-88d6-76c40b9b91c3)
   )
-  (wire (pts (xy 120.015 105.41) (xy 120.015 114.3))
+  (wire (pts (xy 107.95 113.665) (xy 107.95 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d1198554-21ef-4b45-aeb3-1d13d1a99c81)
   )
@@ -1707,34 +2157,54 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d2345104-09f1-41fc-94ce-8dacff922785)
   )
+  (bus (pts (xy 260.35 57.15) (xy 260.35 59.69))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d27ffca6-b95c-4856-ad47-3beca64bfd9c)
+  )
+
   (wire (pts (xy 201.93 42.545) (xy 201.93 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d31b84f4-aee1-4a96-9e43-37ef1d5e58cc)
   )
+  (bus (pts (xy 43.815 118.11) (xy 43.815 120.65))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d3298126-bc88-4ff9-a8e1-fe58fa378f2a)
+  )
+
   (wire (pts (xy 70.485 173.99) (xy 69.85 173.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3544862-27f0-4dd4-b95d-082d8e405f69)
   )
-  (wire (pts (xy 97.155 95.25) (xy 126.365 95.25))
+  (wire (pts (xy 97.155 93.98) (xy 117.475 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d36bed4a-2d38-4d94-8a74-f18e2f39ff81)
   )
-  (wire (pts (xy 79.375 39.37) (xy 79.375 40.64))
+  (wire (pts (xy 79.375 26.67) (xy 79.375 27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d59207d5-e6eb-4316-be05-cfc8aad75d7e)
   )
-  (wire (pts (xy 113.03 100.33) (xy 120.015 100.33))
+  (bus (pts (xy 134.62 113.03) (xy 134.62 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid d62fc329-158d-4837-bc90-1697329036f5)
+    (uuid d5d8c2c7-ce0a-4c95-8dbd-12a3d22e808f)
   )
-  (wire (pts (xy 50.8 57.15) (xy 55.245 57.15))
+
+  (wire (pts (xy 50.8 44.45) (xy 55.245 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d78ecae1-c111-471b-804e-7c30e86c3452)
   )
-  (wire (pts (xy 97.155 71.12) (xy 101.6 71.12))
+  (wire (pts (xy 97.155 64.77) (xy 98.425 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d8235b82-512f-4634-bf47-0c5e06c4670f)
   )
+  (bus (pts (xy 260.35 59.69) (xy 260.35 62.23))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d8246e51-31d6-4d0c-bf05-11dc4e77d8b6)
+  )
+  (bus (pts (xy 43.815 123.19) (xy 43.815 137.16))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d8c2f3a9-6911-460a-a717-e1c400254a2b)
+  )
+
   (wire (pts (xy 178.435 52.705) (xy 184.785 52.705))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d9aafdb6-1885-46fe-ab57-a030f37feb66)
@@ -1747,48 +2217,54 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc46187b-3b47-4ec9-a1b0-f5cc4fad846b)
   )
-  (wire (pts (xy 88.265 46.355) (xy 88.265 45.72))
+  (wire (pts (xy 88.265 33.655) (xy 88.265 33.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc7f9129-223d-47cd-9d30-9befe3c4a350)
   )
-  (wire (pts (xy 248.92 82.55) (xy 248.92 83.82))
+  (wire (pts (xy 250.825 82.55) (xy 250.825 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dd36fef9-faa2-43ce-8071-e9424db31a74)
   )
+  (wire (pts (xy 97.155 46.99) (xy 120.015 46.99))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e14c6b8b-7099-4939-9f70-460b627946af)
+  )
   (wire (pts (xy 213.995 35.56) (xy 213.995 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e355fc55-817d-41f4-bf0d-b8df7569a27b)
   )
-  (wire (pts (xy 22.86 73.025) (xy 22.86 66.675))
+  (bus (pts (xy 244.475 74.295) (xy 244.475 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e4946eec-6480-4e0a-a79d-bf6359b28199)
+  )
+
+  (wire (pts (xy 22.86 60.325) (xy 22.86 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e65e8f62-df44-4c13-a44d-1f147b2b39f5)
   )
-  (wire (pts (xy 101.6 56.515) (xy 101.6 57.15))
+  (wire (pts (xy 101.6 43.815) (xy 101.6 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8059b05-01eb-44fa-9315-64b996c772c3)
   )
-  (wire (pts (xy 106.045 79.375) (xy 113.03 79.375))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e86299b4-3202-471f-a1bc-5d34465090b2)
-  )
-  (wire (pts (xy 113.03 79.375) (xy 120.015 79.375))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e940954e-1a94-41ac-9d84-c850b5969486)
-  )
   (polyline (pts (xy 13.335 196.85) (xy 114.935 196.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e96e51df-d689-4ab3-8a9b-6b14c5ee920c)
   )
 
+  (wire (pts (xy 97.155 91.44) (xy 114.935 91.44))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ea69697d-4b94-4fe7-8d30-b4da8dc88969)
+  )
+  (bus (pts (xy 134.62 123.19) (xy 134.62 125.73))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ec5c00aa-8ea4-465a-9f43-831f6a6375ed)
+  )
+
   (wire (pts (xy 22.86 187.325) (xy 22.86 187.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee327f20-347c-4096-aa75-2d24c866a967)
   )
-  (wire (pts (xy 99.06 84.455) (xy 99.06 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ee3f4f8f-998a-4170-b713-39a4bb3a846c)
-  )
-  (wire (pts (xy 257.175 67.31) (xy 255.27 67.31))
+  (wire (pts (xy 257.81 67.31) (xy 241.3 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ee8f199e-8862-4446-b31b-b80d3a9d478b)
   )
@@ -1804,7 +2280,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f2b7a641-a17f-4514-b509-ada59a89f3c2)
   )
-  (wire (pts (xy 248.285 64.77) (xy 257.175 64.77))
+  (wire (pts (xy 52.07 102.235) (xy 52.07 101.6))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f3a1aef5-b1e4-4bb9-a8f9-86d0126e03ec)
+  )
+  (wire (pts (xy 238.76 64.77) (xy 257.81 64.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f3a85301-cf8d-475c-8585-012a0274005a)
   )
@@ -1813,7 +2293,16 @@
     (uuid f433ed0a-8985-411d-a45a-a50fdbd074e2)
   )
 
-  (wire (pts (xy 53.975 87.63) (xy 55.245 87.63))
+  (wire (pts (xy 97.155 86.36) (xy 112.395 86.36))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f4616693-b791-4c00-ab66-ad40ff079e80)
+  )
+  (bus (pts (xy 164.465 159.385) (xy 164.465 161.925))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f5c1e7cd-25e1-4a9e-b3c4-8d8118b97e9a)
+  )
+
+  (wire (pts (xy 41.91 87.63) (xy 55.245 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6bd28b9-f391-40cd-8dbd-e35378aac068)
   )
@@ -1825,15 +2314,16 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f7cf267d-25de-4e8e-b379-60ae3569fb5c)
   )
-  (wire (pts (xy 106.045 87.63) (xy 132.08 87.63))
+  (bus (pts (xy 260.35 46.355) (xy 260.35 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f9b176df-c354-4f0e-8592-89e79d2ef0b9)
+    (uuid f85622e6-a923-4208-a314-24da28cf1b8a)
   )
-  (wire (pts (xy 99.06 78.74) (xy 99.06 79.375))
+
+  (wire (pts (xy 106.045 71.12) (xy 106.045 73.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f9c058a7-92bd-4637-8f96-8d81b676f56a)
   )
-  (wire (pts (xy 46.99 73.025) (xy 46.99 72.39))
+  (wire (pts (xy 46.99 60.325) (xy 46.99 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fa238796-bd04-4fa6-a151-6833ddd89468)
   )
@@ -1841,11 +2331,16 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fcfab668-6945-49ee-8c67-9f9cb32e5fbb)
   )
-  (wire (pts (xy 255.27 67.31) (xy 231.775 67.31))
+  (wire (pts (xy 241.3 67.31) (xy 231.775 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fdf68fea-964e-484c-a5be-d2448943da36)
   )
-  (wire (pts (xy 50.8 57.15) (xy 50.8 52.705))
+  (bus (pts (xy 50.165 164.465) (xy 50.165 167.005))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ff7f0fc6-4cbc-4e7b-a721-eadf1d8c49b8)
+  )
+
+  (wire (pts (xy 50.8 44.45) (xy 50.8 40.005))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffb4a90a-8697-48f7-97d6-160d93f6d63d)
   )
@@ -1853,12 +2348,16 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffd1097b-12ec-4c5e-a429-8e1bcef82866)
   )
+  (bus (pts (xy 259.08 104.14) (xy 259.08 106.68))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fff781e7-77ce-4bba-b498-184cc3a04ab8)
+  )
 
   (text "<10mA" (at 221.615 118.745 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0d28dd13-9117-4c9b-b3a6-38b549280d65)
   )
-  (text "~240mA peak" (at 81.28 117.475 0)
+  (text "~240mA peak" (at 81.915 130.81 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 20c9af77-5ee0-489b-8489-c64e51c4112d)
   )
@@ -1866,7 +2365,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 2b5880d4-43ea-4e4d-b658-491beb3fe4bb)
   )
-  (text "RESET has internal pullup" (at 186.69 118.11 180)
+  (text "RESET has\ninternal pullup" (at 186.69 118.745 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 47bf248b-da7d-4a6f-b6ed-7c3caac0339f)
   )
@@ -1887,27 +2386,211 @@
     (uuid d7248d81-2d52-4ed0-8113-c4372c7c29d3)
   )
 
-  (global_label "ATSAMD_UART_RX" (shape input) (at 83.185 161.29 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 00124904-566b-4590-9dbd-dac138d840b7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 64.6248 161.2106 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
+  (label "ESP_TX" (at 46.355 177.165 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 03a3bec7-39ee-4c18-9a84-7f16958feaaa)
   )
-  (global_label "ATSAMD_SWCLK" (shape input) (at 139.065 164.465 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 06748e1d-1dff-4be9-b502-dcfd2ccfd204)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.7505 164.5444 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
+  (label "~{SAMD_INT}" (at 264.16 83.82 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 03dd53bb-e8ff-4bf9-bc21-acac0a5bb4d4)
   )
-  (global_label "ATSAMD_SWCLK" (shape input) (at 172.72 109.22 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 0841203c-ed13-49d6-be77-697129eb0065)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 156.0345 109.1406 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
+  (label "UART.ESP.TX" (at 120.015 44.45 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 0c24d28c-a739-421a-8491-708bebbc6fe2)
   )
+  (label "DAC.BCK" (at 125.73 123.19 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 1154b266-05c1-4e3b-8c92-325438643437)
+  )
+  (label "JTAG.TCK" (at 47.625 164.465 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 14ec4f99-3365-477c-bcac-85cbec8c8f78)
+  )
+  (label "UART{ESP.TX,ESP.RX}" (at 259.08 104.14 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 1c0ffea5-5804-4cc5-94b9-b6861eb8b497)
+  )
+  (label "ESP_BOOT" (at 169.545 74.93 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 1cbd614f-ac95-426b-9e08-87ecf31ff7df)
+  )
+  (label "ESP_SPI.DISPLAY_CS" (at 131.9565 93.98 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 23af8056-dc95-4b37-969d-b4536f287db2)
+  )
+  (label "SAMD_SPI.SCLK" (at 257.81 67.31 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 29a4bace-f337-4068-8793-75594341e5cb)
+  )
+  (label "I2C.SCL" (at 241.3 81.28 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 29d8a665-b151-4f65-8d9a-8da24726ecf4)
+  )
+  (label "DAC.SCK" (at 125.73 118.11 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 2a8880c7-e76e-4b6b-aaea-22be894a45f1)
+  )
+  (label "I2C.SDA" (at 114.935 64.77 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 2d6b6f31-1993-4c8b-af1c-a11651e6e546)
+  )
+  (label "SWD.SWCLK" (at 176.53 109.22 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 2d935a27-461d-4ae7-ad86-57c081c53808)
+  )
+  (label "ESP_SPI.SCLK" (at 132.08 83.82 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 31c5091f-8ad0-4953-b087-2af117a64019)
+  )
+  (label "JTAG.TDO" (at 47.625 167.005 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 34095258-0b4c-438c-b26c-dd765c93f3a1)
+  )
+  (label "JTAG.TCK" (at 46.355 120.65 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 35930673-c8ed-43db-b62a-0f0b31f16def)
+  )
+  (label "SAMD_SPI.PICO" (at 257.81 64.77 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3ab56eb8-29c5-4d5b-b96b-55c76eba6b3d)
+  )
+  (label "SWD.RESET" (at 176.53 114.3 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3f2eb22a-c357-4661-b6ae-373e39582e24)
+  )
+  (label "SWD{SWCLK,SWDIO,RESET}" (at 164.465 106.045 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 4133e7a8-9c69-4772-8260-5bf57f4438d9)
+  )
+  (label "SWD.SWDIO" (at 176.53 111.76 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 4acfe348-46a2-4e30-9e09-80cd27689538)
+  )
+  (label "SWD.RESET" (at 161.925 182.245 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 50303974-b529-420b-8703-0b8db48e89f3)
+  )
+  (label "JTAG.TDO" (at 46.355 125.73 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 50d134e9-fc9f-4e1e-9fa7-7ba3ea936fcf)
+  )
+  (label "I2C.SCL" (at 114.935 67.31 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 54aaf0e1-675f-4716-995f-b1f971688001)
+  )
+  (label "ESP_SPI.POCI" (at 132.08 86.36 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 60b16b63-e2c8-4da1-9b83-1ea3d7391d93)
+  )
+  (label "SAMD_SPI.CS" (at 257.6328 62.23 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 785ac481-571d-40f0-b366-ea74085d837e)
+  )
+  (label "UART{ESP.TX,ESP.RX}" (at 122.555 39.37 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 7942cba8-9455-4a7b-8e0b-98c54a3bd1ef)
+  )
+  (label "ESP_RX" (at 69.85 176.53 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 7c9efc51-e667-4889-9f9f-5f5547bc8633)
+  )
+  (label "ESP_EN" (at 169.545 72.39 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 7f98205c-1c1c-427a-9510-71a28d709c36)
+  )
+  (label "~{SAMD_INT}" (at 41.91 87.63 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 843b9d31-d23d-4500-a378-77525e3149bd)
+  )
+  (label "JTAG{TDI,TCK,TMS,TDO}" (at 43.815 115.57 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 89d09384-0824-47a8-aefe-0085c3efef8d)
+  )
+  (label "ESP_SPI.PICO" (at 132.08 88.9 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 91fe7a45-a15d-4dc1-83dc-089d5fba07fa)
+  )
+  (label "DAC.DATA" (at 125.73 120.65 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 94e24fde-fc66-4c89-b7a7-6d0f98cd687e)
+  )
+  (label "ESP_RX" (at 46.355 174.625 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 96f7dc92-aa93-4243-931d-a5d45607a0e3)
+  )
+  (label "UART.ESP.RX" (at 120.015 46.99 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 9e0b75fd-70b5-450e-b95b-7b699f2a2e0b)
+  )
+  (label "JTAG.TDI" (at 47.625 169.545 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid a03765ef-eac9-4c02-878f-9b2cabc27d6c)
+  )
+  (label "UART.ESP.TX" (at 256.54 111.76 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid ad44dc86-0fc3-4ecd-ba89-bc32cf8528a1)
+  )
+  (label "SWD.SWCLK" (at 161.925 164.465 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid aefdcb35-e144-4263-b944-8e02674160c6)
+  )
+  (label "SWD.SWDIO" (at 161.925 161.925 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid ba7cff0b-441a-49b9-b2b4-7bb3d7a74997)
+  )
+  (label "UART.ESP.RX" (at 256.54 109.22 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid be9bf093-df2d-4d44-b947-877e19ba2e6c)
+  )
+  (label "SAMD_SPI.POCI" (at 257.81 59.69 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid c0fa0e0f-05cd-4117-b16c-b195ef0f9cd8)
+  )
+  (label "USB.DN" (at 170.18 95.25 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid c2d56668-6e9e-405e-881f-1cdcf0eedd5e)
+  )
+  (label "USB.DP" (at 170.18 97.79 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid c8131753-342e-4e01-a61f-2cd1ea0f5175)
+  )
+  (label "ESP_EN" (at 48.26 40.005 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid cc28edf5-0eff-468b-b472-6d9d1638d4f8)
+  )
+  (label "JTAG.TDI" (at 46.355 118.11 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid cd8afb81-a02a-4c98-b7e6-16b6742892d7)
+  )
+  (label "JTAG.TMS" (at 47.625 161.925 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid ce2219fa-81f4-4d3e-8fd9-2a18ac54d45b)
+  )
+  (label "I2C.SDA" (at 241.3 78.74 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid d63a2e68-16af-4318-b093-ca71101dba41)
+  )
+  (label "ESP_BOOT" (at 116.205 109.22 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid d8306835-acf8-4ae4-8bdc-89e48fad83ce)
+  )
+  (label "ESP_TX" (at 69.85 179.07 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid dbf4648c-bd50-4c2e-8259-1e47527d953f)
+  )
+  (label "JTAG.TMS" (at 46.355 123.19 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid e65ffd8e-50fe-45ef-8034-11683fabf9d4)
+  )
+  (label "DAC.LRCK" (at 125.73 125.73 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f597be80-005c-498a-ad53-afb018f5b584)
+  )
+  (label "ESP_SPI.SD_CS" (at 131.9028 91.44 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid f633bb29-dc78-477a-8da4-573f60f7df9e)
+  )
+
   (global_label "~{GPIO_INT}" (shape input) (at 53.975 85.09 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0a7fc18a-d5ad-499f-be88-8787927646eb)
@@ -1915,46 +2598,25 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SDA" (shape input) (at 114.935 71.12 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 14106b86-0246-432e-91aa-067419f7f3c1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 125.5124 71.0406 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DAC_DIN" (shape input) (at 127 109.22 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 14bc06a2-5f8b-497f-b58a-4d7e3cb7f5a2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 137.2145 109.1406 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "JTAG_TDI" (shape input) (at 38.1 169.545 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 1cd40edd-8317-4349-918c-e0f4c796a451)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 48.6169 169.4656 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "JTAG_TCK" (shape input) (at 38.1 164.465 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 26140703-e758-4b8e-b62e-2fa567f34036)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 49.2821 164.3856 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "BAT_LEVEL" (shape input) (at 53.975 95.25 180) (fields_autoplaced)
+  (global_label "BAT_LEVEL" (shape input) (at 48.895 95.25 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 267abeed-757a-48a8-8e9b-e7577932129c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 41.8252 95.1706 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 36.7452 95.1706 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "JTAG_TDO" (shape input) (at 38.1 167.005 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 269c7283-d1e5-4bc2-bd11-2796b47c1d41)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 49.3426 166.9256 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
+  (global_label "SAMD_SPI{SAMD_SPI}" (shape input) (at 260.35 46.355 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 283f2fbc-4b90-4383-aa3d-c36f356bdd68)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 238.1007 46.2756 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
+  (global_label "USB{USB}" (shape input) (at 167.64 90.17 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 308298a8-8756-415a-8175-77e487941fc2)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.9136 90.0906 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "SD_WP" (shape input) (at 183.515 85.09 180) (fields_autoplaced)
@@ -1964,13 +2626,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "JTAG_TDO" (shape input) (at 53.975 115.57 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 3498b0c6-211d-4468-b0a7-94b530b2d70a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 42.7324 115.4906 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "~{SD_VDD_EN}" (shape input) (at 183.515 77.47 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 375fb491-4107-4bee-b9ad-0e1ffd3cb0ba)
@@ -1978,41 +2633,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "UART_RXD" (shape input) (at 69.85 176.53 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 3f024ac0-65e3-4043-8fab-6dc880702e6d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 81.6369 176.4506 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "~{ATSAMD_INT}" (shape input) (at 53.975 87.63 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 42f56731-fd83-4d96-a9e2-2e6bec1bd01c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 40.6157 87.7094 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "JTAG_TMS" (shape input) (at 53.975 113.03 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 44da9a08-7d98-4bb9-adf4-8054f109afc2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 42.6719 112.9506 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_SCL" (shape input) (at 114.935 73.66 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 4976e0b9-d8d2-4fae-b1b1-a5235cf3f3ab)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 125.4519 73.5806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DAC_SCK" (shape input) (at 127 106.68 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 5898808b-a2e2-4a0b-bf14-5ae1cec1fd8e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 137.7588 106.6006 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "USB_TCC1" (shape input) (at 183.515 69.85 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 5c0f05a9-fba1-46f4-abde-4a0911efee12)
@@ -2020,13 +2640,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "JTAG_TDI" (shape input) (at 53.975 107.95 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 5cace3bf-7c10-47aa-8ab0-490f8e41b572)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 43.4581 107.8706 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "ESP_SCL" (shape input) (at 96.52 176.53 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 6447ce5d-a305-462c-be14-c6799cd8e8a1)
@@ -2034,6 +2647,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "I2C{I2C}" (shape input) (at 117.475 60.325 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 64ace419-c3a0-4c3e-b070-950bf59b53cf)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 127.75 60.2456 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "DISPLAY_DR" (shape input) (at 53.975 82.55 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 67e1cd34-ef64-4929-913e-295cb38c6745)
@@ -2041,83 +2661,20 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ATSAMD_SD_CS" (shape input) (at 257.175 62.23 0) (fields_autoplaced)
+  (global_label "DAC{I2S}" (shape input) (at 134.62 113.03 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 6892487d-ffbe-4b0c-b790-5130810d38ee)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 273.5581 62.3094 0)
+    (uuid 6962c563-79c6-43c1-af2e-61731a47d0b0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.3788 113.1094 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "ATSAMD_POCI" (shape input) (at 257.175 59.69 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 69b5f287-d10c-42f0-8636-ac95672cd9fb)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.1067 59.6106 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_RX" (shape input) (at 88.265 158.75 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 6cd23a8f-f5a8-42ad-b246-67e3b768e750)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 97.7538 158.6706 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_TX" (shape input) (at 108.585 57.15 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 72b72104-d404-491c-8f5a-c7ea06468747)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 117.7714 57.0706 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ATSAMD_SCLK" (shape input) (at 257.175 67.31 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 7402ef01-3b7d-468a-9080-3d750c5dcc77)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.4091 67.3894 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_RX" (shape input) (at 46.355 174.625 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 78b691ae-f735-41a7-bdd5-e9fb52d0f282)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 55.8438 174.5456 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_PICO" (shape input) (at 132.08 90.17 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 7f855849-dcb3-4845-be47-72a0694bcdbd)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 143.5645 90.0906 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "UART_TXD" (shape input) (at 69.85 179.07 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 7ff6559f-9ca1-4bbb-853a-40ea9bc554e9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 81.3345 178.9906 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ATSAMD_UART_TX" (shape input) (at 83.185 158.75 180) (fields_autoplaced)
+  (global_label "I2C{I2C}" (shape input) (at 244.475 74.295 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 8060d803-a1b1-4bb5-984c-adefd527309b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 64.9271 158.6706 0)
+    (uuid 818c81c0-b1f3-45c9-91f2-6893cb0868a5)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 234.2 74.3744 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SCL" (shape input) (at 233.68 81.28 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 88d5daac-ec77-4bf6-a50d-6eefab64e064)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 244.1969 81.2006 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_SDA" (shape input) (at 233.68 78.74 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 8a06be3d-be9a-4299-9ff7-4a874099017f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 244.2574 78.6606 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "SD_CD" (shape input) (at 183.515 82.55 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 8b80b0fc-ac2e-41c2-a19d-bfb762746c82)
@@ -2125,104 +2682,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ATSAMD_UART_RX" (shape input) (at 254.635 111.76 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 8c8f2b08-73bd-449d-90c0-e57595af64b4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 273.1952 111.6806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "USB_DP" (shape input) (at 177.165 97.79 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 8ffe905e-50a3-4569-9aa1-1ef348a60fce)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 167.4343 97.7106 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ATSAMD_PICO" (shape input) (at 257.175 64.77 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 947718ea-be5c-4fea-9e0c-0778500ccbe3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.1067 64.6906 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_TX" (shape input) (at 88.265 161.29 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 96b713ea-8eee-4f13-8ac3-110a778f3ebf)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 97.4514 161.2106 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "JTAG_TCK" (shape input) (at 53.975 110.49 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 9df22243-bd4c-46b8-9c52-0ef46c1e08c5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 42.7929 110.4106 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ATSAMD_SWDIO" (shape input) (at 139.065 161.925 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 9ef409d0-5daf-496a-a9d7-a124d381a18f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.3876 162.0044 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_RX" (shape input) (at 108.585 59.69 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a31bcc4e-afdc-4969-a334-efea958e5864)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 118.0738 59.6106 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "USB_DN" (shape input) (at 177.165 95.25 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a451c5c4-7473-409f-a82b-56474c41dca1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 167.3738 95.1706 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "DISPLAY_CS" (shape input) (at 132.08 95.25 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a719142d-6d38-42d8-bd18-f391921aa9fa)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.4998 95.1706 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DAC_LRCK" (shape input) (at 127 114.3 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a7c31066-b83b-440f-94b5-af5c3dd142b3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 138.8474 114.2206 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ATSAMD_SWDIO" (shape input) (at 172.72 111.76 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a99288d9-ac22-45e9-9c92-536ae709aee0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 156.3974 111.6806 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_SD_CS" (shape input) (at 132.08 92.71 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid a9a2611f-f8c1-4cf9-ac82-13e9df2b9e6b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 145.016 92.6306 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "~{ATSAMD_INT}" (shape input) (at 262.255 83.82 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid ad24eb31-4a1f-44a7-adc2-989e179d7366)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 275.6143 83.7406 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ATSAMD_UART_TX" (shape input) (at 254.635 109.22 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid b45198fc-e63f-4592-8618-2222e9e18eee)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.8929 109.1406 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "USB_TCC0" (shape input) (at 183.515 67.31 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid bc775f4b-1422-4fbf-add7-4b1fb601718c)
@@ -2230,13 +2689,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_BOOT" (shape input) (at 183.515 74.93 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid bcd3cb33-055c-4e2b-9fe8-8ed14653215f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 171.6071 74.8506 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
   (global_label "KEY_LOCK" (shape input) (at 183.515 80.01 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid bdec782b-3f54-4af0-8c99-16cd4ee7a39a)
@@ -2244,34 +2696,6 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DAC_BCK" (shape input) (at 127 111.76 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid d1e73de5-370b-4d95-aa03-d1face305290)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 137.8193 111.6806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_SCLK" (shape input) (at 132.08 85.09 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid d52cb228-3e59-4f5f-afa2-17b97ae54357)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 143.8669 85.0106 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "~{ATSAMD_RESET}" (shape input) (at 172.72 114.3 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid d5742a4a-c307-4077-92b2-e1f653f6602b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 156.5183 114.2206 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_BOOT" (shape input) (at 127 104.14 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid d6551534-8dc4-4ad9-b7c7-f8b2de8d5034)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 138.9079 104.0606 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
   (global_label "ESP_SDA" (shape input) (at 96.52 179.07 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d7f7a65a-4627-44c8-8b42-c09de9e12da4)
@@ -2279,129 +2703,37 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "ESP_POCI" (shape input) (at 132.08 87.63 0) (fields_autoplaced)
+  (global_label "ESP_SPI{ESP_SPI}" (shape input) (at 134.62 78.105 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid dda0dfd2-61f7-4e52-ad79-d5f6a5fa1b97)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 143.5645 87.5506 0)
+    (uuid d9997f40-79a4-4682-b54c-4022767b4765)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 154.0874 78.0256 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "CHG_SEL" (shape input) (at 262.255 86.36 0) (fields_autoplaced)
+  (global_label "CHG_SEL" (shape input) (at 264.16 86.36 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid dfdbf849-6e08-4fae-b895-747fb6b2b579)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.8929 86.4394 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_EN" (shape input) (at 48.26 52.705 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid ea4c5689-24b2-468f-b40c-6135c25fb4cc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 38.7712 52.7844 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_EN" (shape input) (at 183.515 72.39 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid ecb3bf27-112c-44c8-b6ca-4663b60fe9f0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 174.0262 72.4694 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "~{ATSAMD_RESET}" (shape input) (at 139.065 182.245 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid f00005b5-b25d-4d6b-9e60-496d3ae003e3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.2667 182.1656 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_TX" (shape input) (at 46.355 177.165 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid fd94964b-669d-4c40-8cfc-c48e9d9487c9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 55.5414 177.0856 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "JTAG_TMS" (shape input) (at 38.1 161.925 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid ffe95f8a-b568-42d7-9832-511e57477e5a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 49.4031 161.8456 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 274.7979 86.4394 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 120.015 102.87 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 0256db05-bcb6-4312-bb7c-67c2ab7542d2)
-    (property "Reference" "R?" (id 0) (at 121.92 101.6 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 121.92 104.14 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 120.015 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 120.015 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1ef9dec4-69f2-4273-a833-1248d85f14f5))
-    (pin "2" (uuid 6bcc962f-ceea-4229-99a2-b4799b408035))
-  )
-
-  (symbol (lib_id "Device:R_Small") (at 99.06 102.87 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 0496faba-6421-43ed-8394-c335bc257843)
-    (property "Reference" "R?" (id 0) (at 100.965 101.6 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 100.965 104.14 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 99.06 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 99.06 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 5488165b-a28c-4571-b3b4-6903b01fd358))
-    (pin "2" (uuid 4a3cac3c-f64e-4b74-8c5d-991a6c1d36b5))
-  )
-
-  (symbol (lib_id "Device:R_Small") (at 113.03 81.915 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 053d000a-9244-4fa5-a6bb-484762de92d0)
-    (property "Reference" "R?" (id 0) (at 114.935 80.645 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 114.935 83.185 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 113.03 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 113.03 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b41fa674-30f4-4a90-89b9-bddfaf66f875))
-    (pin "2" (uuid 8e9792d1-6ec5-43ec-9eec-d60b4e5f57f1))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 27.305 66.675 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 27.305 53.975 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0b3ecc07-a26c-44e3-a278-8d5935aa9d8e)
-    (property "Reference" "C?" (id 0) (at 28.575 61.595 90)
+    (property "Reference" "C?" (id 0) (at 28.575 48.895 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "8pF" (id 1) (at 28.575 63.5 90)
+    (property "Value" "8pF" (id 1) (at 28.575 50.8 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 27.305 66.675 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 27.305 53.975 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 27.305 66.675 0)
+    (property "Datasheet" "~" (id 3) (at 27.305 53.975 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "GQM1875C2E8R0CB12D" (id 4) (at 27.305 66.675 90)
+    (property "PN" "GQM1875C2E8R0CB12D" (id 4) (at 27.305 53.975 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eea3fec0-e563-4460-89fb-efe424be936b))
@@ -2424,20 +2756,23 @@
     (pin "1" (uuid 7c436b32-7fdf-49dc-aaaf-aa367a79898f))
   )
 
-  (symbol (lib_id "power:+3V3") (at 99.06 99.06 0) (unit 1)
+  (symbol (lib_id "Device:NetTie_2") (at 114.935 113.665 90) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 11c778fe-2f91-46af-ac38-0677db4954d7)
-    (property "Reference" "#PWR?" (id 0) (at 99.06 102.87 0)
+    (uuid 0daeeefb-2245-41b6-b7c2-ad36b44421db)
+    (property "Reference" "NT?" (id 0) (at 115.57 113.665 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "NetTie_2" (id 1) (at 116.205 114.9349 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 114.935 113.665 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 102.87 97.79 0))
-    (property "Footprint" "" (id 2) (at 99.06 99.06 0)
+    (property "Datasheet" "~" (id 3) (at 114.935 113.665 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 99.06 99.06 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0a518746-276b-45d0-b546-82854f79adef))
+    (pin "1" (uuid a0fffbd5-a8e2-4f02-b163-2bb8121c4d5b))
+    (pin "2" (uuid 694f4080-d757-4f12-8534-5bad9936f7ff))
   )
 
   (symbol (lib_id "power:+3V3") (at 22.86 157.48 0) (unit 1)
@@ -2456,19 +2791,19 @@
     (pin "1" (uuid f1d3dbfc-655e-407a-bb19-9d6968f97152))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 101.6 67.945 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 98.425 59.055 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1979e2ac-dd85-48b4-8c79-5a3ef8a0ea49)
-    (property "Reference" "R?" (id 0) (at 103.505 66.675 0)
+    (property "Reference" "R?" (id 0) (at 100.33 57.785 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 103.505 69.215 0)
+    (property "Value" "10k" (id 1) (at 100.33 60.325 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 101.6 67.945 0)
+    (property "Footprint" "" (id 2) (at 98.425 59.055 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 67.945 0)
+    (property "Datasheet" "~" (id 3) (at 98.425 59.055 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4b67e02d-8146-42cb-b9f3-146dba9db197))
@@ -2524,57 +2859,22 @@
     (pin "1" (uuid 94c38319-9081-4846-83be-20619f49dbb0))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 248.285 55.245 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 20ecef7d-88ca-4d6b-89a6-dc3324007f55)
-    (property "Reference" "R?" (id 0) (at 250.19 53.975 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 250.19 56.515 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 248.285 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 248.285 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid df8a5a72-0fff-48c5-977d-cc8b3ca7258d))
-    (pin "2" (uuid 1856df5a-8cdc-472f-942f-31f2ea2b532f))
-  )
-
-  (symbol (lib_id "power:+3V3") (at 99.06 78.74 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 22ceace2-d5b1-4abc-9b02-594b186c1704)
-    (property "Reference" "#PWR?" (id 0) (at 99.06 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3V3" (id 1) (at 102.87 77.47 0))
-    (property "Footprint" "" (id 2) (at 99.06 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 99.06 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 8cf6e2d2-2ea1-4e62-b214-6ec7d8f55670))
-  )
-
-  (symbol (lib_id "symbols:ESP32-WROOM") (at 75.565 85.09 0) (unit 1)
+  (symbol (lib_id "symbols:ESP32-WROOM") (at 75.565 72.39 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 264554ad-6581-4559-abca-f9e8dadfd1b5)
-    (property "Reference" "U101" (id 0) (at 73.025 80.645 0)
+    (property "Reference" "U101" (id 0) (at 73.025 67.945 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "ESP32-WROVER" (id 1) (at 67.945 83.185 0)
+    (property "Value" "ESP32-WROVER" (id 1) (at 67.945 70.485 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 75.565 123.19 0)
+    (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 75.565 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf" (id 3) (at 76.835 135.89 0)
+    (property "Datasheet" "https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf" (id 3) (at 76.835 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "ESP32-WROVER-IE-N16R8" (id 4) (at 75.565 85.09 0)
+    (property "PN" "ESP32-WROVER-IE-N16R8" (id 4) (at 75.565 72.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aee9af8b-a593-4f37-a8e0-83ec248a0465))
@@ -2618,54 +2918,57 @@
     (pin "9" (uuid c479115d-59f6-4948-bc8f-8672d7a25017))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 113.03 102.87 0) (unit 1)
+  (symbol (lib_id "Device:R_Network04") (at 105.41 108.585 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 2b6800f7-6147-46da-ae97-d3818591f6ed)
-    (property "Reference" "R?" (id 0) (at 114.935 101.6 0)
+    (uuid 2b4f2221-e20b-49fd-9653-9a36a8528477)
+    (property "Reference" "RN?" (id 0) (at 109.855 107.315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 114.935 104.14 0)
+    (property "Value" "10k" (id 1) (at 109.855 109.855 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 113.03 102.87 0)
+    (property "Footprint" "" (id 2) (at 112.395 108.585 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 113.03 102.87 0)
+    (property "Datasheet" "" (id 3) (at 105.41 108.585 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f62d3ee6-b15e-4d22-8f79-195eb524a13f))
-    (pin "2" (uuid acc3f2c2-6b7d-4237-a76d-713e5d542dcf))
+    (pin "1" (uuid aa011522-07cf-4aca-b2fe-8cc574a5fb9d))
+    (pin "2" (uuid 76c8d45d-e381-48cd-8677-cc750720d1d7))
+    (pin "3" (uuid 6224822c-4a83-4ee6-8179-71b3c48314d7))
+    (pin "4" (uuid c8c59eaf-69cf-4e7f-a1f4-7a511157b3cd))
+    (pin "5" (uuid 88f07623-f1ba-4499-9a52-2f350d91a08b))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 88.265 43.18 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 88.265 30.48 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2d6c4616-e054-4b86-b3c8-1eff3bc02a66)
-    (property "Reference" "C?" (id 0) (at 92.71 42.545 0))
-    (property "Value" "22uF" (id 1) (at 92.71 44.45 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 88.265 43.18 0)
+    (property "Reference" "C?" (id 0) (at 92.71 29.845 0))
+    (property "Value" "22uF" (id 1) (at 92.71 31.75 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 88.265 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 88.265 43.18 0)
+    (property "Datasheet" "~" (id 3) (at 88.265 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BBJ226MG-T " (id 4) (at 88.265 43.18 90)
+    (property "PN" "EMK212BBJ226MG-T " (id 4) (at 88.265 30.48 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2f71bb28-bcca-4e5d-8f0b-44407bb49658))
     (pin "2" (uuid 41d33870-811d-44c5-92c6-6d1e8b7e4e0c))
   )
 
-  (symbol (lib_id "power:+3V3") (at 75.565 36.83 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 75.565 24.13 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2de1a90a-a285-41cd-b30d-3afb2b4aee07)
-    (property "Reference" "#PWR?" (id 0) (at 75.565 40.64 0)
+    (property "Reference" "#PWR?" (id 0) (at 75.565 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 75.565 31.115 0))
-    (property "Footprint" "" (id 2) (at 75.565 36.83 0)
+    (property "Value" "+3V3" (id 1) (at 75.565 18.415 0))
+    (property "Footprint" "" (id 2) (at 75.565 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 75.565 36.83 0)
+    (property "Datasheet" "" (id 3) (at 75.565 24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6170e324-c67a-45e7-a866-e39a03866f6c))
@@ -2687,37 +2990,18 @@
     (pin "1" (uuid f31a2612-01a9-439c-be66-2b48521a95e8))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 126.365 81.915 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 369789ca-01d6-40f1-ae09-b1a071ee42c7)
-    (property "Reference" "R?" (id 0) (at 128.27 80.645 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 128.27 83.185 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 126.365 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 126.365 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 08fe3298-21c9-4a90-9fb4-c079b8eea35f))
-    (pin "2" (uuid cb2ca144-d7aa-4362-808d-c16ac8f2e61b))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 47.625 57.15 270) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 47.625 44.45 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3bec55ae-c4df-43c9-bba4-0e6234bd611c)
-    (property "Reference" "C?" (id 0) (at 47.625 60.96 90))
-    (property "Value" "1uF" (id 1) (at 47.625 62.865 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 47.625 57.15 0)
+    (property "Reference" "C?" (id 0) (at 47.625 48.26 90))
+    (property "Value" "1uF" (id 1) (at 47.625 50.165 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 47.625 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 47.625 57.15 0)
+    (property "Datasheet" "~" (id 3) (at 47.625 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 47.625 57.15 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 47.625 44.45 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8b29159f-81a4-4baf-a46d-2863ce880fa0))
@@ -2771,6 +3055,22 @@
     (pin "2" (uuid 76c2ab1c-09cc-4a36-970f-91ca97c851ce))
   )
 
+  (symbol (lib_id "power:GND") (at 75.565 131.445 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 48587dcc-c363-4771-a61c-39c17c1c9235)
+    (property "Reference" "#PWR?" (id 0) (at 75.565 137.795 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 75.565 135.255 0))
+    (property "Footprint" "" (id 2) (at 75.565 131.445 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 75.565 131.445 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cba4d614-9eaa-42d4-8d6d-b48b320d237f))
+  )
+
   (symbol (lib_id "Device:R_Small") (at 41.8951 177.165 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 48889a93-56c6-40d9-aad9-15b1951bd7e8)
@@ -2786,17 +3086,17 @@
     (pin "2" (uuid 20813da3-34f9-4bca-9253-58f5cc41f27f))
   )
 
-  (symbol (lib_id "power:+3V3") (at 248.92 102.87 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 236.855 102.87 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4b7840a5-8487-49ae-8c68-4724e383b503)
-    (property "Reference" "#PWR?" (id 0) (at 248.92 106.68 0)
+    (property "Reference" "#PWR?" (id 0) (at 236.855 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 252.73 101.6 0))
-    (property "Footprint" "" (id 2) (at 248.92 102.87 0)
+    (property "Value" "+3V3" (id 1) (at 240.665 101.6 0))
+    (property "Footprint" "" (id 2) (at 236.855 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 248.92 102.87 0)
+    (property "Datasheet" "" (id 3) (at 236.855 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4cca794c-a74e-43df-8f80-1098765ebeaf))
@@ -2840,19 +3140,19 @@
     (pin "2" (uuid d496e22d-1990-41d8-a342-e69717ab688a))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 248.92 106.045 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 236.855 106.045 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 56384953-bd81-4b05-940f-e5828c09a5ce)
-    (property "Reference" "R?" (id 0) (at 250.825 104.775 0)
+    (property "Reference" "R?" (id 0) (at 238.76 104.775 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 250.825 107.315 0)
+    (property "Value" "10k" (id 1) (at 238.76 107.315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 248.92 106.045 0)
+    (property "Footprint" "" (id 2) (at 236.855 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 248.92 106.045 0)
+    (property "Datasheet" "~" (id 3) (at 236.855 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5609f4f9-11fe-400b-9154-25a4f3ba7615))
@@ -2875,18 +3175,18 @@
     (pin "1" (uuid 20984586-4017-4d4a-924f-56137b2d9b09))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 46.99 69.85 180) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 46.99 57.15 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 58588653-6c2b-4ca0-b0ea-527b5ec5058a)
-    (property "Reference" "R?" (id 0) (at 50.8 68.58 0))
-    (property "Value" "7.5M" (id 1) (at 50.8 70.485 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 46.99 69.85 0)
+    (property "Reference" "R?" (id 0) (at 50.8 55.88 0))
+    (property "Value" "7.5M" (id 1) (at 50.8 57.785 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 46.99 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 46.99 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 46.99 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603FR-077M5L" (id 4) (at 46.99 69.85 0)
+    (property "PN" "RC0603FR-077M5L" (id 4) (at 46.99 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1c5f7994-2777-454b-932d-7de90d0c4ff4))
@@ -2908,40 +3208,56 @@
     (pin "2" (uuid e4dd1c31-c3ad-4622-aa3c-94521959b74e))
   )
 
-  (symbol (lib_id "power:+3V3") (at 233.68 52.07 0) (mirror y) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 233.68 47.625 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 620152ae-6507-4348-b467-17dd5834a74c)
-    (property "Reference" "#PWR?" (id 0) (at 233.68 55.88 0)
+    (property "Reference" "#PWR?" (id 0) (at 233.68 51.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 233.045 48.26 0))
-    (property "Footprint" "" (id 2) (at 233.68 52.07 0)
+    (property "Value" "+3V3" (id 1) (at 233.045 43.815 0))
+    (property "Footprint" "" (id 2) (at 233.68 47.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 233.68 52.07 0)
+    (property "Datasheet" "" (id 3) (at 233.68 47.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0886e0a2-d954-428c-97ab-71ffd68100f4))
   )
 
-  (symbol (lib_id "Device:Crystal_Small") (at 31.75 69.85 90) (unit 1)
+  (symbol (lib_id "Device:Crystal_Small") (at 31.75 57.15 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6361818e-0334-48bb-9617-927580d73db9)
-    (property "Reference" "Y?" (id 0) (at 40.005 68.58 90))
-    (property "Value" "32.768 kHz" (id 1) (at 40.005 71.12 90))
-    (property "Footprint" "Crystal:Crystal_SMD_3215-2Pin_3.2x1.5mm" (id 2) (at 31.75 69.85 0)
+    (property "Reference" "Y?" (id 0) (at 40.005 55.88 90))
+    (property "Value" "32.768 kHz" (id 1) (at 40.005 58.42 90))
+    (property "Footprint" "Crystal:Crystal_SMD_3215-2Pin_3.2x1.5mm" (id 2) (at 31.75 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 31.75 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 31.75 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "FC-135 32.7680KA-AG0" (id 4) (at 31.75 69.85 0)
+    (property "PN" "FC-135 32.7680KA-AG0" (id 4) (at 31.75 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 26104bb0-a934-44e8-8dbb-48a5b5cd6f91))
     (pin "2" (uuid d174d36f-5405-4c55-8e58-5ad4b183a757))
   )
 
+  (symbol (lib_id "power:GND") (at 52.07 102.235 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6cdb4b9b-14ca-4ee6-8f88-23500e862469)
+    (property "Reference" "#PWR?" (id 0) (at 52.07 108.585 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 52.07 106.045 0))
+    (property "Footprint" "" (id 2) (at 52.07 102.235 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 52.07 102.235 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b321fde7-1c68-46a6-bfbe-c96d6c0d4ccc))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 191.77 39.37 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 71ad3e4d-0a4a-4154-b758-d49020ae0c22)
@@ -2961,17 +3277,17 @@
     (pin "2" (uuid 9cd12778-f445-4a7d-a4b2-d206ff33f276))
   )
 
-  (symbol (lib_id "power:+3V3") (at 248.92 74.93 0) (mirror y) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 250.825 74.93 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 71d4778d-59ce-40d0-82be-fa191495a594)
-    (property "Reference" "#PWR?" (id 0) (at 248.92 78.74 0)
+    (property "Reference" "#PWR?" (id 0) (at 250.825 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 248.92 71.12 0))
-    (property "Footprint" "" (id 2) (at 248.92 74.93 0)
+    (property "Value" "+3V3" (id 1) (at 250.825 71.12 0))
+    (property "Footprint" "" (id 2) (at 250.825 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 248.92 74.93 0)
+    (property "Datasheet" "" (id 3) (at 250.825 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 36d3d1e4-d873-45f1-a655-7b7f7ac16f67))
@@ -2993,18 +3309,34 @@
     (pin "1" (uuid 963dd0b0-2b47-40f0-a07f-11bdddef8c11))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 79.375 43.18 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 117.475 70.485 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 7651b8c8-cbb4-4644-b172-a3bb8160e11e)
+    (property "Reference" "#PWR?" (id 0) (at 117.475 74.295 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3V3" (id 1) (at 121.285 69.215 0))
+    (property "Footprint" "" (id 2) (at 117.475 70.485 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 117.475 70.485 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bee45eb2-68b2-4518-8875-e9ab0914af7e))
+  )
+
+  (symbol (lib_id "Device:C_Small") (at 79.375 30.48 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 778d7962-4906-4a9a-974a-d4bc3f300a15)
-    (property "Reference" "C?" (id 0) (at 83.82 42.545 0))
-    (property "Value" "0.1uF" (id 1) (at 83.82 44.45 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 79.375 43.18 0)
+    (property "Reference" "C?" (id 0) (at 83.82 29.845 0))
+    (property "Value" "0.1uF" (id 1) (at 83.82 31.75 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 79.375 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 79.375 43.18 0)
+    (property "Datasheet" "~" (id 3) (at 79.375 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 79.375 43.18 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 79.375 30.48 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bdc2ea56-94a3-49e2-b9ff-9622a4350c9b))
@@ -3030,51 +3362,51 @@
     (pin "2" (uuid f02d310c-4de7-4fe3-a4fc-b4849204e598))
   )
 
-  (symbol (lib_id "power:GND") (at 22.86 74.93 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 22.86 62.23 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7b28eb21-a179-4b72-b49d-b389890341e2)
-    (property "Reference" "#PWR?" (id 0) (at 22.86 81.28 0)
+    (property "Reference" "#PWR?" (id 0) (at 22.86 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 19.05 76.2 0))
-    (property "Footprint" "" (id 2) (at 22.86 74.93 0)
+    (property "Value" "GND" (id 1) (at 19.05 63.5 0))
+    (property "Footprint" "" (id 2) (at 22.86 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 22.86 74.93 0)
+    (property "Datasheet" "" (id 3) (at 22.86 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 20376f75-276c-44cf-be2e-172aa119ac33))
   )
 
-  (symbol (lib_id "power:+3V3") (at 101.6 64.77 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 98.425 54.61 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 86b19021-38b5-43ea-96d6-9e50ba3ab13e)
-    (property "Reference" "#PWR?" (id 0) (at 101.6 68.58 0)
+    (property "Reference" "#PWR?" (id 0) (at 98.425 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 105.41 63.5 0))
-    (property "Footprint" "" (id 2) (at 101.6 64.77 0)
+    (property "Value" "+3V3" (id 1) (at 102.235 53.34 0))
+    (property "Footprint" "" (id 2) (at 98.425 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 101.6 64.77 0)
+    (property "Datasheet" "" (id 3) (at 98.425 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fbe0be5f-eecd-425a-8bf0-e3f3f39ba9c6))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 101.6 53.975 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 101.6 41.275 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8b6bd773-042d-416d-8234-eb6bb3cd00bc)
-    (property "Reference" "R?" (id 0) (at 103.505 52.705 0)
+    (property "Reference" "R?" (id 0) (at 103.505 40.005 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 103.505 55.245 0)
+    (property "Value" "10k" (id 1) (at 103.505 42.545 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 101.6 53.975 0)
+    (property "Footprint" "" (id 2) (at 101.6 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 53.975 0)
+    (property "Datasheet" "~" (id 3) (at 101.6 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5677c930-11c9-4334-96a8-ed71c86fca08))
@@ -3101,25 +3433,6 @@
     (pin "4" (uuid e2be6150-fa6b-446e-bd7e-76a808ac8d0c))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 233.68 55.245 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 906cc305-a5e9-418b-82e9-f60f17b82190)
-    (property "Reference" "R?" (id 0) (at 235.585 53.975 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 235.585 56.515 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 233.68 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 233.68 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid d2f6a273-8470-49d4-8353-135fe774ee1b))
-    (pin "2" (uuid 0988a8e2-fb6f-4510-a8b7-88d284cd8254))
-  )
-
   (symbol (lib_id "power:GND") (at 224.155 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 93dce975-0ace-434e-9ae7-74e9514065f6)
@@ -3155,37 +3468,37 @@
     (pin "2" (uuid 63975687-6c33-472f-a5f3-d836a305d2fb))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 255.905 80.01 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 257.81 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9b2b897d-9027-435e-a8c4-380c4518a639)
-    (property "Reference" "R?" (id 0) (at 257.81 78.74 0)
+    (property "Reference" "R?" (id 0) (at 259.715 78.74 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 257.81 81.28 0)
+    (property "Value" "10k" (id 1) (at 259.715 81.28 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 255.905 80.01 0)
+    (property "Footprint" "" (id 2) (at 257.81 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 255.905 80.01 0)
+    (property "Datasheet" "~" (id 3) (at 257.81 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 212ccbec-b948-408d-9525-ffeaf450b2ef))
     (pin "2" (uuid 583c89e4-9bcb-4303-8bc4-248ac1af57d6))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 50.8 47.625 180) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 50.8 34.925 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a7153b69-1e3d-440a-856f-a46e9700a0e8)
-    (property "Reference" "R?" (id 0) (at 47.3075 46.6725 0))
-    (property "Value" "100k" (id 1) (at 47.3075 48.5775 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 50.8 47.625 0)
+    (property "Reference" "R?" (id 0) (at 47.3075 33.9725 0))
+    (property "Value" "100k" (id 1) (at 47.3075 35.8775 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 50.8 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 50.8 47.625 0)
+    (property "Datasheet" "~" (id 3) (at 50.8 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 50.8 47.625 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 50.8 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d64358ff-17ed-4bc6-a030-0b83198f2648))
@@ -3209,23 +3522,20 @@
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 241.3 55.245 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 100.33 103.505 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid ab7be7a3-19d0-4228-a7a1-cd7977c2e574)
-    (property "Reference" "R?" (id 0) (at 243.205 53.975 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 243.205 56.515 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 241.3 55.245 0)
+    (uuid ab6f3897-8a40-4437-a1e1-40aac0a07172)
+    (property "Reference" "#PWR?" (id 0) (at 100.33 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 241.3 55.245 0)
+    (property "Value" "+3V3" (id 1) (at 104.14 102.235 0))
+    (property "Footprint" "" (id 2) (at 100.33 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8ce45718-06e0-428f-893b-51b892448cd0))
-    (pin "2" (uuid 1212933d-a81a-4cca-b9bf-ca5aad3a67e4))
+    (property "Datasheet" "" (id 3) (at 100.33 103.505 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 68aeaf90-b4be-4129-88f9-644b0e91854d))
   )
 
   (symbol (lib_id "symbols:BMDU") (at 128.905 178.435 0) (unit 1)
@@ -3298,25 +3608,6 @@
     (pin "2" (uuid b151dbfb-1492-465b-b2c9-3aa13eed2367))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 255.27 55.245 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid b47be63d-59b9-42b9-9e8f-4aff7cb167a8)
-    (property "Reference" "R?" (id 0) (at 257.175 53.975 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 257.175 56.515 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 255.27 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 255.27 55.245 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c61b2ee7-e9fc-4e8f-8ecc-f7b051a61aff))
-    (pin "2" (uuid 425943f1-8157-4aa1-bb69-dc19db8d1a0c))
-  )
-
   (symbol (lib_id "Device:C_Small") (at 171.45 52.705 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid bb45498d-213a-4b87-8274-4031b25a16a1)
@@ -3339,33 +3630,73 @@
     (pin "2" (uuid 7ade301f-b5d0-409f-8cf3-ea010f3e769c))
   )
 
-  (symbol (lib_id "power:GND") (at 88.265 46.355 0) (unit 1)
+  (symbol (lib_id "Device:R_Network04") (at 238.76 52.705 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid bcf59f24-cc1c-4b6f-86c6-c6d8ed3fe3ad)
+    (property "Reference" "RN?" (id 0) (at 243.205 51.435 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 243.205 53.975 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 245.745 52.705 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 238.76 52.705 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b99fc47e-eca1-479a-8a44-897e8570e2f2))
+    (pin "2" (uuid c65a75a8-32bd-4bce-8d6a-013551f60611))
+    (pin "3" (uuid 757d7da7-407a-4e6b-8ea1-eca042695cdd))
+    (pin "4" (uuid 8aefe333-ad0d-40a2-8388-ce6b7735b805))
+    (pin "5" (uuid 82bb09d4-3b2e-41c5-9337-3a70dcb86697))
+  )
+
+  (symbol (lib_id "power:GND") (at 88.265 33.655 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid bf0be606-1f9e-4b2e-9f8c-7ffca9775a78)
-    (property "Reference" "#PWR?" (id 0) (at 88.265 52.705 0)
+    (property "Reference" "#PWR?" (id 0) (at 88.265 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 88.265 50.165 0))
-    (property "Footprint" "" (id 2) (at 88.265 46.355 0)
+    (property "Value" "GND" (id 1) (at 88.265 37.465 0))
+    (property "Footprint" "" (id 2) (at 88.265 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 88.265 46.355 0)
+    (property "Datasheet" "" (id 3) (at 88.265 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 51a69b11-fee8-46d4-b913-40392d683ae7))
   )
 
-  (symbol (lib_id "power:GND") (at 42.545 58.42 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 52.07 99.06 180) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid d10d82e2-ee6b-4988-b6f0-ba3e8d349f10)
+    (property "Reference" "C?" (id 0) (at 46.355 98.425 0))
+    (property "Value" "1000pF" (id 1) (at 46.355 100.965 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 52.07 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 52.07 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PN" "0805YD102KAT2A" (id 4) (at 52.07 99.06 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 275bb7d3-3e16-4469-85d5-8e72de88b49d))
+    (pin "2" (uuid 0e777fc1-9dd4-42c8-b477-1b2f38e027aa))
+  )
+
+  (symbol (lib_id "power:GND") (at 42.545 45.72 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d3839275-2c73-472c-9825-5ae3d754fced)
-    (property "Reference" "#PWR?" (id 0) (at 42.545 64.77 0)
+    (property "Reference" "#PWR?" (id 0) (at 42.545 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 42.545 62.23 0))
-    (property "Footprint" "" (id 2) (at 42.545 58.42 0)
+    (property "Value" "GND" (id 1) (at 42.545 49.53 0))
+    (property "Footprint" "" (id 2) (at 42.545 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 42.545 58.42 0)
+    (property "Datasheet" "" (id 3) (at 42.545 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5668ae03-15ae-46d4-b79f-dac60d70bdfc))
@@ -3441,131 +3772,115 @@
     (pin "2" (uuid 70d99cfc-0fa8-44e0-a67d-3836bd32ace3))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 177.165 106.045 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 180.34 106.045 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid dbddcea6-fc6c-47fc-9ac8-b5fda94bffca)
-    (property "Reference" "R?" (id 0) (at 173.355 105.41 0)
+    (property "Reference" "R?" (id 0) (at 176.53 105.41 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1k" (id 1) (at 173.355 107.315 0)
+    (property "Value" "1k" (id 1) (at 176.53 107.315 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 177.165 106.045 0)
+    (property "Footprint" "" (id 2) (at 180.34 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 177.165 106.045 0)
+    (property "Datasheet" "~" (id 3) (at 180.34 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2352672a-f11f-4038-bab0-e0dfb6c39f86))
     (pin "2" (uuid cbfd4584-4c18-4938-8671-4f7b21fa4144))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 27.305 73.025 90) (unit 1)
+  (symbol (lib_id "Device:R_Network04") (at 112.395 76.2 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid ddac9828-5a1f-42d3-8692-f72043fc4eb2)
+    (property "Reference" "RN?" (id 0) (at 123.825 74.93 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 123.825 77.47 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 105.41 76.2 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 112.395 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b842cc82-6229-43e4-9a12-f17ba41c6afe))
+    (pin "2" (uuid 420eb797-7a38-42b2-9206-78a13e934beb))
+    (pin "3" (uuid 66d1a5bd-fb60-4d85-ac6d-64e26dfdb1bf))
+    (pin "4" (uuid f8510e44-92bc-471e-8f1d-aba5280d73f1))
+    (pin "5" (uuid 9d3e4874-d840-4945-a960-53473c186ba3))
+  )
+
+  (symbol (lib_id "Device:C_Small") (at 27.305 60.325 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e26e588b-e22e-49a6-a86d-a83576992948)
-    (property "Reference" "C?" (id 0) (at 28.575 76.2 90)
+    (property "Reference" "C?" (id 0) (at 28.575 63.5 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "8pF" (id 1) (at 29.21 78.105 90)
+    (property "Value" "8pF" (id 1) (at 29.21 65.405 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 27.305 73.025 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 27.305 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 27.305 73.025 0)
+    (property "Datasheet" "~" (id 3) (at 27.305 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "GQM1875C2E8R0CB12D" (id 4) (at 27.305 73.025 90)
+    (property "PN" "GQM1875C2E8R0CB12D" (id 4) (at 27.305 60.325 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 42cae827-831d-41bc-b93f-7070c17d5adf))
     (pin "2" (uuid 47a069a0-f7c7-4c20-9870-69cbab75e885))
   )
 
-  (symbol (lib_id "power:+3V3") (at 177.165 103.505 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 180.34 103.505 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e4f074a5-ecf8-4ea2-a184-e852658ff836)
-    (property "Reference" "#PWR?" (id 0) (at 177.165 107.315 0)
+    (property "Reference" "#PWR?" (id 0) (at 180.34 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 173.355 102.235 0))
-    (property "Footprint" "" (id 2) (at 177.165 103.505 0)
+    (property "Value" "+3V3" (id 1) (at 176.53 102.235 0))
+    (property "Footprint" "" (id 2) (at 180.34 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 177.165 103.505 0)
+    (property "Datasheet" "" (id 3) (at 180.34 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 32b785bd-5515-4252-8863-8b20dfc24930))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 106.045 81.915 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e5f49f5d-25d4-47ac-88c5-6dd61d4c93f0)
-    (property "Reference" "R?" (id 0) (at 107.95 80.645 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 107.95 83.185 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 106.045 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 106.045 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6d816f92-0da6-4bb7-8586-1d36387ce685))
-    (pin "2" (uuid 446c4ebd-e444-47cd-851c-f3ac0673b5ca))
-  )
-
-  (symbol (lib_id "Device:R_Small") (at 99.06 81.915 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 106.045 76.2 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e97b2c73-cb83-4784-9367-f765f526d0e9)
-    (property "Reference" "R?" (id 0) (at 100.965 80.645 0)
+    (property "Reference" "R?" (id 0) (at 104.14 74.93 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 100.965 83.185 0)
+    (property "Value" "10k" (id 1) (at 104.14 77.47 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 99.06 81.915 0)
+    (property "Footprint" "" (id 2) (at 106.045 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 99.06 81.915 0)
+    (property "Datasheet" "~" (id 3) (at 106.045 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b5cea0cd-989b-46a6-944c-31c9592cdf2f))
     (pin "2" (uuid aeb7ec47-dee4-490c-a333-d9864c626b3e))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 106.045 102.87 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e9d22759-b751-4d74-ba8f-ac95ac97ef50)
-    (property "Reference" "R?" (id 0) (at 107.95 101.6 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 107.95 104.14 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 106.045 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 106.045 102.87 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c3fa8651-a2e2-4f02-8b21-3f1fd10f835f))
-    (pin "2" (uuid d06726d9-68b5-42f6-a64a-517fd74a443d))
-  )
-
-  (symbol (lib_id "power:+3V3") (at 50.8 44.45 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 50.8 31.75 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e9fa2117-6be2-4d6d-a980-b92052b015e9)
-    (property "Reference" "#PWR?" (id 0) (at 50.8 48.26 0)
+    (property "Reference" "#PWR?" (id 0) (at 50.8 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 50.8 40.005 0))
-    (property "Footprint" "" (id 2) (at 50.8 44.45 0)
+    (property "Value" "+3V3" (id 1) (at 50.8 27.305 0))
+    (property "Footprint" "" (id 2) (at 50.8 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 50.8 44.45 0)
+    (property "Datasheet" "" (id 3) (at 50.8 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e160ea28-b1d5-4d80-ac6f-004248d8a48d))
@@ -3587,25 +3902,6 @@
     (pin "1" (uuid 7871c103-b299-4a2e-95b9-5b8ae807cc7a))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 120.015 81.915 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid f0289449-a831-4131-b63e-5a90f9caa2a1)
-    (property "Reference" "R?" (id 0) (at 121.92 80.645 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10k" (id 1) (at 121.92 83.185 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 120.015 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 120.015 81.915 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f4313d34-a880-4681-bb29-c7c355557b7f))
-    (pin "2" (uuid c55a574c-5147-4f9d-bd1b-d0a0126508ae))
-  )
-
   (symbol (lib_id "symbols:ATSAMD21E15A-A") (at 207.645 95.25 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f07801c9-1ad2-4b77-b09e-878267921424)
@@ -3655,19 +3951,19 @@
     (pin "9" (uuid e0490e14-c7b7-48e6-80e4-10798d7ccdce))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 108.585 67.945 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 105.41 59.055 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f2fca849-3dcf-4a26-a67e-c123cd000b64)
-    (property "Reference" "R?" (id 0) (at 110.49 66.675 0)
+    (property "Reference" "R?" (id 0) (at 107.315 57.785 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 110.49 69.215 0)
+    (property "Value" "10k" (id 1) (at 107.315 60.325 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 108.585 67.945 0)
+    (property "Footprint" "" (id 2) (at 105.41 59.055 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 108.585 67.945 0)
+    (property "Datasheet" "~" (id 3) (at 105.41 59.055 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a596c9d8-2ace-4685-be89-23f6b2bffc8b))
@@ -3725,35 +4021,35 @@
     (pin "2" (uuid a0a9dee0-3d58-4162-a052-f19857eec0e4))
   )
 
-  (symbol (lib_id "power:+3V3") (at 101.6 50.8 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 101.6 38.1 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid fece3739-2493-402e-9f40-e5e24971addb)
-    (property "Reference" "#PWR?" (id 0) (at 101.6 54.61 0)
+    (property "Reference" "#PWR?" (id 0) (at 101.6 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 105.41 49.53 0))
-    (property "Footprint" "" (id 2) (at 101.6 50.8 0)
+    (property "Value" "+3V3" (id 1) (at 105.41 36.83 0))
+    (property "Footprint" "" (id 2) (at 101.6 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 101.6 50.8 0)
+    (property "Datasheet" "" (id 3) (at 101.6 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 538700a3-06f3-4814-b8cc-cfa38a74a6fc))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 248.92 80.01 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 250.825 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ff00b626-392e-4635-b57e-c8a328c1b9dd)
-    (property "Reference" "R?" (id 0) (at 250.825 78.74 0)
+    (property "Reference" "R?" (id 0) (at 252.73 78.74 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 250.825 81.28 0)
+    (property "Value" "10k" (id 1) (at 252.73 81.28 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 248.92 80.01 0)
+    (property "Footprint" "" (id 2) (at 250.825 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 248.92 80.01 0)
+    (property "Datasheet" "~" (id 3) (at 250.825 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7785fef2-104a-46f4-9ba8-f2130c65ec08))
@@ -3807,18 +4103,12 @@
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/29593bfe-4637-4c17-a201-318ce1ce2c76"
       (reference "#FLG0102") (unit 1) (value "PWR_FLAG") (footprint "")
     )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/01b6c433-a218-4614-b68c-2630e5a16cd4"
-      (reference "#FLG0105") (unit 1) (value "PWR_FLAG") (footprint "")
-    )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/cac6def1-cbc5-44be-aa02-229177cffa9f"
       (reference "#FLG0201") (unit 1) (value "PWR_FLAG") (footprint "")
     )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/b231a614-25c7-4ed6-b14a-9ab324ba4856"
       (reference "#FLG0202") (unit 1) (value "PWR_FLAG") (footprint "")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/52e1e0da-5e1d-4f0d-9e3b-c1416cb1dc44"
-      (reference "#FLG?") (unit 1) (value "PWR_FLAG") (footprint "")
-    )
     (path "/1b56d9c7-758a-43f2-9743-a9269aa51ff4"
       (reference "#PWR0103") (unit 1) (value "GND") (footprint "")
     )
@@ -3909,9 +4199,6 @@
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/5bd7f2bd-b057-48b3-95a6-8ad0b91453fc"
       (reference "#PWR0308") (unit 1) (value "GND") (footprint "")
     )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/207729fd-413d-4873-b339-8087c96e9cb5"
-      (reference "#PWR0309") (unit 1) (value "GND") (footprint "")
-    )
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/07477691-202a-41f9-92c5-0ca850248bff"
       (reference "#PWR0310") (unit 1) (value "GND") (footprint "")
     )
@@ -3921,27 +4208,15 @@
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/05f81812-edf1-4acc-8415-c02f856e38d9"
       (reference "#PWR0313") (unit 1) (value "GND") (footprint "")
     )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/297da44a-c5b9-4e48-817e-8a3510bb651e"
-      (reference "#PWR0314") (unit 1) (value "+3V3") (footprint "")
-    )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/dbc555a4-c960-4d73-9d77-9e4561fe1fb3"
-      (reference "#PWR0317") (unit 1) (value "+3V3") (footprint "")
-    )
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/611a6558-0307-4df6-8df9-47488c73b8a8"
       (reference "#PWR0318") (unit 1) (value "+3V3") (footprint "")
     )
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/65709d86-7fea-4044-8577-af2ab91339fc"
       (reference "#PWR0319") (unit 1) (value "GND") (footprint "")
     )
-    (path "/11c778fe-2f91-46af-ac38-0677db4954d7"
-      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
-    )
     (path "/1f271f4f-7875-4c88-977c-62138f8ddc70"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
-    (path "/22ceace2-d5b1-4abc-9b02-594b186c1704"
-      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
-    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/28e17218-ae99-4735-aea4-d858e8439921"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
@@ -3960,6 +4235,9 @@
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/3f72fb84-a749-4794-b68d-9c2c926aa134"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
+    (path "/48587dcc-c363-4771-a61c-39c17c1c9235"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/48a31796-81b2-4e52-af27-c8488db17306"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
@@ -3975,18 +4253,21 @@
     (path "/620152ae-6507-4348-b467-17dd5834a74c"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/6cdb4b9b-14ca-4ee6-8f88-23500e862469"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/71d4778d-59ce-40d0-82be-fa191495a594"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/72cf4984-3cb0-49a1-8498-2bc45dabd6dc"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/7545cf1c-613f-4592-a7bd-2028af397639"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/76069edb-b58d-4ca9-ab6a-a9d28dc7f917"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/7651b8c8-cbb4-4644-b172-a3bb8160e11e"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/7b28eb21-a179-4b72-b49d-b389890341e2"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
@@ -4011,12 +4292,18 @@
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/9864b0b9-b7c9-4ac8-8f42-0e917242fc18"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
+    (path "/ab6f3897-8a40-4437-a1e1-40aac0a07172"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/bf0be606-1f9e-4b2e-9f8c-7ffca9775a78"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/c091a8a9-022e-4af1-b544-ee40c839c6aa"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/c61899c9-e923-45fc-a61f-74441855ef66"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/c7eed6f1-6311-4b60-9c42-e6226aaad3d4"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
@@ -4026,6 +4313,9 @@
     (path "/d6ceea76-e8d2-411a-b727-0381e6463e2d"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/e250d895-b66a-4c05-8f7b-07fd6ddb3bcc"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/e2ec6f77-eb19-4113-b71b-77b216968cc6"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
@@ -4035,9 +4325,6 @@
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/e56f8d21-b250-48f3-a0c9-22cba66c41fe"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/e8def35b-8935-4968-a1bb-65f8c9906061"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/e9fa2117-6be2-4d6d-a980-b92052b015e9"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
@@ -4047,6 +4334,9 @@
     (path "/ed95b895-4dd9-4577-ae7b-597b52c7ef98"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
+    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/fb76fb06-e347-431f-8d8c-ce03b454eec4"
+      (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/fece3739-2493-402e-9f40-e5e24971addb"
       (reference "#PWR?") (unit 1) (value "+3V3") (footprint "")
     )
@@ -4056,9 +4346,6 @@
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/3495d530-c21f-4aed-b202-9135c5520827"
       (reference "C202") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
-    (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/60c26122-0410-482b-8e1b-5611031f0bdf"
-      (reference "C203") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/4dd05ecf-a9dc-49b2-9c81-f3995b481125"
       (reference "C204") (unit 1) (value "22pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
@@ -4074,9 +4361,6 @@
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/e8f13ce8-10a0-4687-9a3c-1730fef6142c"
       (reference "C208") (unit 1) (value "150pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
-    (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/4850b59b-7705-4d9a-bf7b-0257046331af"
-      (reference "C209") (unit 1) (value "1000pF") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/cb801278-213a-413d-84c4-caee9269f63b"
       (reference "C216") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -4179,18 +4463,21 @@
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/c97914d7-f29c-4420-9a71-072743c6c460"
       (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
+    (path "/d10d82e2-ee6b-4988-b6f0-ba3e8d349f10"
+      (reference "C?") (unit 1) (value "1000pF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
     (path "/d6d654bd-d754-4dd5-866a-d3efab8d48a4"
       (reference "C?") (unit 1) (value "8pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
     (path "/e26e588b-e22e-49a6-a86d-a83576992948"
       (reference "C?") (unit 1) (value "8pF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
+    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/ee566ee9-dbe4-45e3-aff5-49d3d41ecb18"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
     (path "/f87ab89b-e069-4d14-8139-7fe6bfdc297a"
       (reference "C?") (unit 1) (value "1uF") (footprint "")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/fcde54c0-8bdd-4524-941a-65c08f68f590"
-      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
-    )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/351287d1-77cd-41de-aaaa-3c6a40fe6e4f"
       (reference "D201") (unit 1) (value "PESD2USB3UV-TR") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
@@ -4239,9 +4526,6 @@
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/9971ae2e-7a0b-435e-bf91-d51768e490e2"
       (reference "J301") (unit 1) (value "PHONES") (footprint "footprints:CUI_SJ-3566AN")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/a81e2e97-4627-469a-84de-bceb04164c37"
-      (reference "J402") (unit 1) (value "Storage") (footprint "Connector_Card:microSD_HC_Hirose_DM3AT-SF-PEJM5")
-    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/38a74021-a761-42a5-8b3e-90af2c57637c"
       (reference "J?") (unit 1) (value "FACEPLATE") (footprint "Connector_FFC-FPC:Molex_200528-0150_1x15-1MP_P1.00mm_Horizontal")
     )
@@ -4254,15 +4538,12 @@
     (path "/95ebd080-f1a4-4b69-a48e-212b411b4fc8"
       (reference "L?") (unit 1) (value "10uH") (footprint "")
     )
+    (path "/0daeeefb-2245-41b6-b7c2-ad36b44421db"
+      (reference "NT?") (unit 1) (value "NetTie_2") (footprint "")
+    )
     (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/9f890897-0f82-45a8-8346-61a2ec80004a"
       (reference "Q201") (unit 1) (value "PMV48XPA2R") (footprint "Package_TO_SOT_SMD:TSOT-23")
     )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/8ab44bf3-eb3a-4b6e-ad57-a822bb0c879f"
-      (reference "Q302") (unit 1) (value "DMC2053UVT") (footprint "Package_TO_SOT_SMD:TSOT-23-6")
-    )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/8902f748-f949-4101-bafb-6416738b6f34"
-      (reference "Q302") (unit 2) (value "DMC2053UVT") (footprint "Package_TO_SOT_SMD:TSOT-23-6")
-    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/701f6a8b-177d-4144-9fb0-3f9fdcead618"
       (reference "Q401") (unit 1) (value "PMV48XPA2R") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
@@ -4323,15 +4604,9 @@
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/d04da576-6e64-42c2-9c23-a166d7f8e23d"
       (reference "R305") (unit 1) (value "20k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/ced17a05-c246-40ff-841e-239f223abd5f"
-      (reference "R307") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
-    )
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/1fa42430-d415-4e6c-8066-34d3aaa6e4a4"
       (reference "R310") (unit 1) (value "20k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/6eef54bc-2e0a-419f-bc35-1ed87e11f343"
-      (reference "R403") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
-    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/982d0f0a-f2fa-4d12-81ce-3ad1cbf66cef"
       (reference "R412") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
@@ -4341,29 +4616,17 @@
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/1af9895a-cfb9-46e3-9e0f-6159b6c64dba"
       (reference "R414") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/0256db05-bcb6-4312-bb7c-67c2ab7542d2"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/0496faba-6421-43ed-8394-c335bc257843"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/053d000a-9244-4fa5-a6bb-484762de92d0"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/13698209-70f7-47db-afa3-e97d8a0398b9"
+    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/01c6ceb4-199c-4d82-a189-dbf1eda2a73a"
       (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/1979e2ac-dd85-48b4-8c79-5a3ef8a0ea49"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
-    (path "/20ecef7d-88ca-4d6b-89a6-dc3324007f55"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
+    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/2508ede4-9915-4302-a20d-1df71873819d"
+      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/2b6800f7-6147-46da-ae97-d3818591f6ed"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/369789ca-01d6-40f1-ae09-b1a071ee42c7"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
+    (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/2ad8bb7b-4979-4ba1-8cc2-9a081431e0d5"
+      (reference "R?") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
     (path "/4561b50a-f368-4def-a9f2-05227ed6a1b2"
       (reference "R?") (unit 1) (value "22") (footprint "")
@@ -4380,9 +4643,6 @@
     (path "/8b6bd773-042d-416d-8234-eb6bb3cd00bc"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
-    (path "/906cc305-a5e9-418b-82e9-f60f17b82190"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
     (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/9147aad8-e172-446a-9523-00e0c38bc534"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
@@ -4392,33 +4652,15 @@
     (path "/a7153b69-1e3d-440a-856f-a46e9700a0e8"
       (reference "R?") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/ab7be7a3-19d0-4228-a7a1-cd7977c2e574"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/b47be63d-59b9-42b9-9e8f-4aff7cb167a8"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
     (path "/dbddcea6-fc6c-47fc-9ac8-b5fda94bffca"
       (reference "R?") (unit 1) (value "1k") (footprint "")
     )
-    (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/dcc9cb2d-1dfb-4171-af6c-f287f06e1436"
-      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric")
-    )
     (path "/aa634b70-9cb7-4291-a4a8-f65abc12d546/e398854d-9124-42ad-b825-4603074189af"
       (reference "R?") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
     )
-    (path "/e5f49f5d-25d4-47ac-88c5-6dd61d4c93f0"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
     (path "/e97b2c73-cb83-4784-9367-f765f526d0e9"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
-    (path "/e9d22759-b751-4d74-ba8f-ac95ac97ef50"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
-    (path "/f0289449-a831-4131-b63e-5a90f9caa2a1"
-      (reference "R?") (unit 1) (value "10k") (footprint "")
-    )
     (path "/f2fca849-3dcf-4a26-a67e-c123cd000b64"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
@@ -4428,6 +4670,15 @@
     (path "/ff00b626-392e-4635-b57e-c8a328c1b9dd"
       (reference "R?") (unit 1) (value "10k") (footprint "")
     )
+    (path "/2b4f2221-e20b-49fd-9653-9a36a8528477"
+      (reference "RN?") (unit 1) (value "10k") (footprint "")
+    )
+    (path "/bcf59f24-cc1c-4b6f-86c6-c6d8ed3fe3ad"
+      (reference "RN?") (unit 1) (value "10k") (footprint "")
+    )
+    (path "/ddac9828-5a1f-42d3-8692-f72043fc4eb2"
+      (reference "RN?") (unit 1) (value "10k") (footprint "")
+    )
     (path "/264554ad-6581-4559-abca-f9e8dadfd1b5"
       (reference "U101") (unit 1) (value "ESP32-WROVER") (footprint "RF_Module:ESP32-WROOM-32U")
     )
diff --git a/mainboard/peripherals.kicad_sch b/mainboard/peripherals.kicad_sch
index 8c80ce3..66dd985 100644
--- a/mainboard/peripherals.kicad_sch
+++ b/mainboard/peripherals.kicad_sch
@@ -138,277 +138,6 @@
         )
       )
     )
-    (symbol "Connector:Micro_SD_Card_Det_Hirose_DM3AT" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at -16.51 17.78 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Micro_SD_Card_Det_Hirose_DM3AT" (id 1) (at 16.51 17.78 0)
-        (effects (font (size 1.27 1.27)) (justify right))
-      )
-      (property "Footprint" "" (id 2) (at 52.07 17.78 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "https://www.hirose.com/product/en/download_file/key_name/DM3/category/Catalog/doc_file_id/49662/?file_category_id=4&item_id=195&is_series=1" (id 3) (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "connector SD microsd" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Micro SD Card Socket with card detection pins" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "microSD*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Micro_SD_Card_Det_Hirose_DM3AT_0_1"
-        (rectangle (start -7.62 -6.985) (end -5.08 -8.255)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 -4.445) (end -5.08 -5.715)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 -1.905) (end -5.08 -3.175)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 0.635) (end -5.08 -0.635)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 3.175) (end -5.08 1.905)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 5.715) (end -5.08 4.445)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 8.255) (end -5.08 6.985)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 10.795) (end -5.08 9.525)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy 16.51 15.24)
-            (xy 16.51 16.51)
-            (xy -19.05 16.51)
-            (xy -19.05 -16.51)
-            (xy 16.51 -16.51)
-            (xy 16.51 -8.89)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -8.89 -8.89)
-            (xy -8.89 11.43)
-            (xy -1.27 11.43)
-            (xy 2.54 15.24)
-            (xy 3.81 15.24)
-            (xy 3.81 13.97)
-            (xy 6.35 13.97)
-            (xy 7.62 15.24)
-            (xy 20.32 15.24)
-            (xy 20.32 -8.89)
-            (xy -8.89 -8.89)
-          )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "Micro_SD_Card_Det_Hirose_DM3AT_1_1"
-        (pin bidirectional line (at -22.86 10.16 0) (length 3.81)
-          (name "DAT2" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 -10.16 0) (length 3.81)
-          (name "DET_A" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 20.32 -12.7 180) (length 3.81)
-          (name "SHIELD" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -22.86 7.62 0) (length 3.81)
-          (name "DAT3/CD" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 5.08 0) (length 3.81)
-          (name "CMD" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -22.86 2.54 0) (length 3.81)
-          (name "VDD" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 0 0) (length 3.81)
-          (name "CLK" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -22.86 -2.54 0) (length 3.81)
-          (name "VSS" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -22.86 -5.08 0) (length 3.81)
-          (name "DAT0" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at -22.86 -7.62 0) (length 3.81)
-          (name "DAT1" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -22.86 -12.7 0) (length 3.81)
-          (name "DET_B" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "Connector:SD_Card" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at -16.51 13.97 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "SD_Card" (id 1) (at 15.24 -13.97 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "connector SD" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "SD Card Reader" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SD*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "SD_Card_0_1"
-        (rectangle (start -8.89 -9.525) (end -6.35 -10.795)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 -6.985) (end -6.35 -8.255)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 -4.445) (end -6.35 -5.715)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 -1.905) (end -6.35 -3.175)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 0.635) (end -6.35 -0.635)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 3.175) (end -6.35 1.905)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 5.715) (end -6.35 4.445)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -8.89 8.255) (end -6.35 6.985)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (rectangle (start -7.62 10.795) (end -5.08 9.525)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (polyline
-          (pts
-            (xy -10.16 8.89)
-            (xy -7.62 11.43)
-            (xy 20.32 11.43)
-            (xy 20.32 -11.43)
-            (xy -10.16 -11.43)
-            (xy -10.16 8.89)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (polyline
-          (pts
-            (xy 16.51 11.43)
-            (xy 16.51 12.7)
-            (xy -20.32 12.7)
-            (xy -20.32 -12.7)
-            (xy 16.51 -12.7)
-            (xy 16.51 -11.43)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "SD_Card_1_1"
-        (pin input line (at -22.86 7.62 0) (length 2.54)
-          (name "CD/DAT3" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 22.86 5.08 180) (length 2.54)
-          (name "CARD_DETECT" (effects (font (size 1.27 1.27))))
-          (number "10" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 22.86 2.54 180) (length 2.54)
-          (name "WRITE_PROTECT" (effects (font (size 1.27 1.27))))
-          (number "11" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 22.86 -2.54 180) (length 2.54)
-          (name "SHELL1" (effects (font (size 1.27 1.27))))
-          (number "12" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at 22.86 -5.08 180) (length 2.54)
-          (name "SHELL2" (effects (font (size 1.27 1.27))))
-          (number "13" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 5.08 0) (length 2.54)
-          (name "CMD" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -22.86 2.54 0) (length 2.54)
-          (name "VSS" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -22.86 0 0) (length 2.54)
-          (name "VDD" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 -2.54 0) (length 2.54)
-          (name "CLK" (effects (font (size 1.27 1.27))))
-          (number "5" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -22.86 -5.08 0) (length 2.54)
-          (name "VSS" (effects (font (size 1.27 1.27))))
-          (number "6" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 -7.62 0) (length 2.54)
-          (name "DAT0" (effects (font (size 1.27 1.27))))
-          (number "7" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 -10.16 0) (length 2.54)
-          (name "DAT1" (effects (font (size 1.27 1.27))))
-          (number "8" (effects (font (size 1.27 1.27))))
-        )
-        (pin input line (at -22.86 10.16 0) (length 2.54)
-          (name "DAT2" (effects (font (size 1.27 1.27))))
-          (number "9" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector_Generic:Conn_01x15" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at 0 20.32 0)
         (effects (font (size 1.27 1.27)))
@@ -1012,1047 +741,1173 @@
         )
       )
     )
-    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
-        (effects (font (size 1.27 1.27)) hide)
+    (symbol "symbols:SD_Card" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at -16.51 13.97 0)
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+      (property "Value" "SD_Card" (id 1) (at 15.24 -13.97 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector SD" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+      (property "ki_description" "SD Card Reader" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "PWR_FLAG_0_0"
-        (pin power_out line (at 0 0 90) (length 0)
-          (name "pwr" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
+      (property "ki_fp_filters" "SD*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SD_Card_0_1"
+        (rectangle (start -8.89 -9.525) (end -6.35 -10.795)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 -6.985) (end -6.35 -8.255)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 -4.445) (end -6.35 -5.715)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 -1.905) (end -6.35 -3.175)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 0.635) (end -6.35 -0.635)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 3.175) (end -6.35 1.905)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 5.715) (end -6.35 4.445)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -8.89 8.255) (end -6.35 6.985)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -7.62 10.795) (end -5.08 9.525)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
         )
-      )
-      (symbol "PWR_FLAG_0_1"
         (polyline
           (pts
-            (xy 0 0)
-            (xy 0 1.27)
-            (xy -1.016 1.905)
-            (xy 0 2.54)
-            (xy 1.016 1.905)
-            (xy 0 1.27)
+            (xy -10.16 8.89)
+            (xy -7.62 11.43)
+            (xy 20.32 11.43)
+            (xy 20.32 -11.43)
+            (xy -10.16 -11.43)
+            (xy -10.16 8.89)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+        (polyline
+          (pts
+            (xy 16.51 11.43)
+            (xy 16.51 12.7)
+            (xy -20.32 12.7)
+            (xy -20.32 -12.7)
+            (xy 16.51 -12.7)
+            (xy 16.51 -11.43)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
+      (symbol "SD_Card_1_1"
+        (pin input line (at -22.86 3.81 0) (length 2.54)
+          (name "CD/DAT3" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 22.86 5.08 180) (length 2.54)
+          (name "CARD_DETECT" (effects (font (size 1.27 1.27))))
+          (number "10" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 22.86 2.54 180) (length 2.54)
+          (name "WRITE_PROTECT" (effects (font (size 1.27 1.27))))
+          (number "11" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 22.86 -2.54 180) (length 2.54)
+          (name "SHELL1" (effects (font (size 1.27 1.27))))
+          (number "12" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at 22.86 -5.08 180) (length 2.54)
+          (name "SHELL2" (effects (font (size 1.27 1.27))))
+          (number "13" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -22.86 1.27 0) (length 2.54)
+          (name "CMD" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 1.27 15.24 270) (length 2.54) hide
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 1.27 -15.24 90) (length 2.54)
+          (name "VDD" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -22.86 -1.27 0) (length 2.54)
+          (name "CLK" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at 1.27 15.24 270) (length 2.54)
+          (name "VSS" (effects (font (size 1.27 1.27))))
+          (number "6" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -22.86 -3.81 0) (length 2.54)
+          (name "DAT0" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -22.86 -6.35 0) (length 2.54)
+          (name "DAT1" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -22.86 6.35 0) (length 2.54)
+          (name "DAT2" (effects (font (size 1.27 1.27))))
+          (number "9" (effects (font (size 1.27 1.27))))
+        )
+      )
     )
   )
 
-  (junction (at 187.96 145.415) (diameter 0) (color 0 0 0 0)
+  (junction (at 77.47 95.25) (diameter 0) (color 0 0 0 0)
     (uuid 119404a8-aad8-4103-8628-d86c6d8c0e92)
   )
-  (junction (at 51.435 106.045) (diameter 0) (color 0 0 0 0)
+  (junction (at 101.6 71.755) (diameter 0) (color 0 0 0 0)
+    (uuid 126e8cc0-6a83-4316-99a2-baf3d86e3265)
+  )
+  (junction (at 209.55 94.615) (diameter 0) (color 0 0 0 0)
     (uuid 151aa390-3c28-4210-93a7-a8eab31f17f7)
   )
-  (junction (at 36.195 73.025) (diameter 0) (color 0 0 0 0)
-    (uuid 28ac56e2-88a3-4684-aca1-2cfdd163579c)
-  )
-  (junction (at 85.725 139.7) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.695 143.51) (diameter 0) (color 0 0 0 0)
     (uuid 2a780239-ea8d-4fbd-9298-40786559ffb9)
   )
-  (junction (at 214.63 145.415) (diameter 0) (color 0 0 0 0)
+  (junction (at 104.14 95.25) (diameter 0) (color 0 0 0 0)
     (uuid 2f3dd57e-8a03-491d-84af-ffe601258820)
   )
-  (junction (at 198.755 137.795) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.265 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 4a429b09-bdbc-46ef-906c-a06695ba72a4)
   )
-  (junction (at 81.915 130.175) (diameter 0) (color 0 0 0 0)
+  (junction (at 95.885 133.985) (diameter 0) (color 0 0 0 0)
     (uuid 4a6fc16f-ce7e-47e1-92a3-eb68596685fa)
   )
-  (junction (at 235.585 109.22) (diameter 0) (color 0 0 0 0)
+  (junction (at 125.095 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 5add7697-758a-41fa-b0ed-4da5542a34ab)
   )
-  (junction (at 85.725 170.18) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.695 173.99) (diameter 0) (color 0 0 0 0)
     (uuid 5bfe4551-3040-4f09-9990-ba072af8494c)
   )
-  (junction (at 220.98 62.23) (diameter 0) (color 0 0 0 0)
-    (uuid 67108c10-80f7-42ab-be5a-4d6c7d90aadd)
+  (junction (at 104.14 84.455) (diameter 0) (color 0 0 0 0)
+    (uuid 7268d7c5-0e93-4b79-a8a1-12fef5c8d08b)
   )
-  (junction (at 85.725 172.72) (diameter 0) (color 0 0 0 0)
+  (junction (at 67.31 26.035) (diameter 0) (color 0 0 0 0)
+    (uuid 7a88b12b-1570-4a66-b523-72019097d7e7)
+  )
+  (junction (at 99.695 176.53) (diameter 0) (color 0 0 0 0)
     (uuid 7d12fed9-e852-42c1-93dd-8c76484908d3)
   )
-  (junction (at 85.725 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.695 140.97) (diameter 0) (color 0 0 0 0)
     (uuid 9c1108c1-54ba-4c03-89c6-5e5883a44618)
   )
-  (junction (at 166.37 26.67) (diameter 0) (color 0 0 0 0)
-    (uuid 9f97ba82-346a-4f20-8206-f6cd9de31ce8)
-  )
-  (junction (at 66.04 53.34) (diameter 0) (color 0 0 0 0)
+  (junction (at 224.155 41.91) (diameter 0) (color 0 0 0 0)
     (uuid adb3b2bb-7f3d-4a1b-967d-d7dfb9506da4)
   )
-  (junction (at 51.435 103.505) (diameter 0) (color 0 0 0 0)
+  (junction (at 209.55 92.075) (diameter 0) (color 0 0 0 0)
     (uuid b463f42d-759c-428e-b1ca-2f3373875126)
   )
-  (junction (at 186.055 35.56) (diameter 0) (color 0 0 0 0)
-    (uuid bdc5ee94-5c91-4e56-bbbb-530cc4bc462a)
+  (junction (at 67.31 44.45) (diameter 0) (color 0 0 0 0)
+    (uuid bb162a52-2cea-4b72-bf02-9a8f11bf2a27)
   )
-  (junction (at 205.105 120.015) (diameter 0) (color 0 0 0 0)
-    (uuid c64fc6e0-a274-4a02-ab59-96f150cf5173)
+  (junction (at 94.615 44.45) (diameter 0) (color 0 0 0 0)
+    (uuid c0269a05-53d9-47b4-adf1-3075e029787f)
   )
-  (junction (at 176.53 26.67) (diameter 0) (color 0 0 0 0)
+  (junction (at 76.2 34.925) (diameter 0) (color 0 0 0 0)
     (uuid de629d15-4f57-4b77-8a16-d607a06eed1a)
   )
-  (junction (at 73.66 136.525) (diameter 0) (color 0 0 0 0)
+  (junction (at 87.63 140.335) (diameter 0) (color 0 0 0 0)
     (uuid e5d09f44-924d-42f9-b759-c7d767121f9c)
   )
-  (junction (at 85.725 130.175) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.695 133.985) (diameter 0) (color 0 0 0 0)
     (uuid eecfffb1-8ca8-42ea-aad9-6bad466f59fe)
   )
-  (junction (at 238.76 74.93) (diameter 0) (color 0 0 0 0)
-    (uuid f77e4d62-f539-46cd-8285-4b9832811526)
+  (junction (at 200.025 61.595) (diameter 0) (color 0 0 0 0)
+    (uuid f2fb8110-e7a5-446d-a329-39fff879a133)
+  )
+  (junction (at 94.615 59.055) (diameter 0) (color 0 0 0 0)
+    (uuid f7194f1f-71e9-44b5-857d-11a552863b50)
   )
 
-  (no_connect (at 253.365 150.495) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b58))
-  (no_connect (at 253.365 132.715) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b58))
-  (no_connect (at 253.365 137.795) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b58))
-  (no_connect (at 253.365 120.015) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b58))
+  (no_connect (at 142.875 89.535) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b58))
+  (no_connect (at 142.875 71.755) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b59))
+  (no_connect (at 142.875 76.835) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b5a))
+  (no_connect (at 142.875 59.055) (uuid 3a671245-3d75-4f9b-8418-0377dd3b5b5b))
 
-  (wire (pts (xy 51.435 103.505) (xy 51.435 106.045))
+  (bus_entry (at 67.31 156.21) (size -2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 36ac41e3-c2e4-4301-ae82-5e7f32e2a605)
+  )
+  (bus_entry (at 201.93 51.435) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 42892a9c-982d-4fa4-9d93-e8567bf85e76)
+  )
+  (bus_entry (at 166.37 66.675) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 51412e4b-adb8-4b95-8971-1bef5d4a0ea7)
+  )
+  (bus_entry (at 166.37 69.215) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 51412e4b-adb8-4b95-8971-1bef5d4a0ea8)
+  )
+  (bus_entry (at 166.37 61.595) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 51412e4b-adb8-4b95-8971-1bef5d4a0ea9)
+  )
+  (bus_entry (at 166.37 64.135) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 51412e4b-adb8-4b95-8971-1bef5d4a0eaa)
+  )
+  (bus_entry (at 201.93 53.975) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 729e3092-4db3-43f1-b7ef-4a50690f126d)
+  )
+  (bus_entry (at 166.37 79.375) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 91349d3c-45d0-47ea-8360-ff8bd838d6f7)
+  )
+  (bus_entry (at 166.37 84.455) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a19fc341-d386-4e0e-bcf8-2e9bd36a93f7)
+  )
+  (bus_entry (at 166.37 81.915) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b6cf1b1d-a6dc-4be9-ae43-08f05c2be1cc)
+  )
+  (bus_entry (at 67.31 161.29) (size -2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d1cbaa8f-f86c-4c6c-84c1-918def2e721f)
+  )
+  (bus_entry (at 71.12 168.91) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d28d3b89-c61a-492f-be97-5c3f1b5d6d25)
+  )
+  (bus_entry (at 71.12 171.45) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d4cf69fd-56fa-42c2-bc40-df7b6b4b301e)
+  )
+  (bus_entry (at 166.37 86.995) (size 2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f103748f-44c2-4b4b-8d01-f2075eb251fc)
+  )
+  (bus_entry (at 67.31 153.67) (size -2.54 -2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f1755bb6-18a9-420e-8973-2cb4c1a8a128)
+  )
+
+  (wire (pts (xy 209.55 92.075) (xy 209.55 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0128e5b4-3453-43d6-9d06-76b57ff1efa0)
   )
-  (wire (pts (xy 51.435 106.045) (xy 51.435 107.95))
+  (wire (pts (xy 209.55 94.615) (xy 209.55 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 030bd81b-bf84-4aae-b974-d0d264fd68a1)
   )
-  (wire (pts (xy 86.995 149.86) (xy 88.265 149.86))
+  (bus (pts (xy 64.77 151.13) (xy 64.77 153.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 047198f2-c811-4bff-8f70-f3f023cb93e6)
+  )
+
+  (wire (pts (xy 101.6 44.45) (xy 94.615 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0476868b-4152-49d0-87d6-f14b2de1bded)
+  )
+  (wire (pts (xy 67.31 153.67) (xy 102.235 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 063e44c5-74e8-490a-9a3e-2a852f6f1656)
   )
-  (wire (pts (xy 80.01 78.105) (xy 78.74 78.105))
+  (wire (pts (xy 238.125 66.675) (xy 236.855 66.675))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 11333d7f-d113-4743-a8b5-e26d8290cd42)
   )
-  (wire (pts (xy 229.235 74.93) (xy 230.505 74.93))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 11968a95-90c0-4e69-b9ee-50661f079eb1)
-  )
-  (wire (pts (xy 73.66 130.175) (xy 81.915 130.175))
+  (wire (pts (xy 87.63 133.985) (xy 95.885 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 137f6de6-8c6d-4c68-beae-3308c5bd00eb)
   )
-  (wire (pts (xy 238.76 71.755) (xy 238.76 74.93))
+  (wire (pts (xy 59.69 44.45) (xy 59.69 46.355))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 143e0992-a738-40ba-a686-3943d3bc079f)
+    (uuid 1789f3f6-f4fc-4be4-a18d-98d40c115a9e)
   )
-  (wire (pts (xy 210.185 132.715) (xy 205.105 132.715))
+  (bus (pts (xy 64.77 149.225) (xy 64.77 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 18a45d60-fcfc-4ef3-a589-d660c28c67ef)
+    (uuid 1a4e3496-3ac8-4810-a009-d6c82b6e8022)
   )
-  (wire (pts (xy 233.68 109.22) (xy 235.585 109.22))
+
+  (wire (pts (xy 123.19 48.26) (xy 125.095 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a9047a9-c25e-42ec-96d6-3e7e334ebe22)
   )
-  (wire (pts (xy 216.535 137.795) (xy 217.805 137.795))
+  (wire (pts (xy 106.045 76.835) (xy 107.315 76.835))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1b994ab5-3a6b-4b03-811b-11e1b3f234b5)
   )
-  (wire (pts (xy 85.725 172.72) (xy 88.265 172.72))
+  (wire (pts (xy 99.695 176.53) (xy 102.235 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1b9f5d95-6d00-4bf2-a84e-1c1961f5c909)
   )
-  (wire (pts (xy 187.96 145.415) (xy 193.675 145.415))
+  (wire (pts (xy 77.47 95.25) (xy 83.185 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1cbe5a42-0848-4fa4-b54a-0e98605f26ad)
   )
-  (wire (pts (xy 225.425 109.22) (xy 228.6 109.22))
+  (bus (pts (xy 71.12 168.91) (xy 71.12 171.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1d4acf6a-bbc6-4641-a03c-559e98c9a449)
+  )
+
+  (wire (pts (xy 114.935 48.26) (xy 118.11 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1dde7ada-39a3-486c-9f47-1e9ba7a28ab3)
   )
-  (wire (pts (xy 66.04 49.53) (xy 66.04 53.34))
+  (wire (pts (xy 67.31 81.915) (xy 67.31 80.645))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1e79964d-23e8-4248-9969-43f7c278a2f7)
+  )
+  (wire (pts (xy 224.155 38.1) (xy 224.155 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 20a265eb-8106-4842-ae95-c54dfb2a2d6c)
   )
-  (wire (pts (xy 176.53 23.495) (xy 176.53 26.67))
+  (wire (pts (xy 142.875 81.915) (xy 166.37 81.915))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 23106e58-8883-4371-b91f-b906f0dc424a)
+  )
+  (wire (pts (xy 79.375 34.925) (xy 76.2 34.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 23a251da-5109-4e7b-9137-a298aba3c649)
   )
-  (wire (pts (xy 215.265 120.015) (xy 217.805 120.015))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 23d47f10-7e04-448b-a42e-665704087dad)
-  )
-  (wire (pts (xy 36.195 73.025) (xy 53.34 73.025))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 245beb52-968b-4b32-a22d-973cc94398cb)
-  )
-  (wire (pts (xy 186.055 35.56) (xy 192.405 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 275c5937-7b98-49bc-be95-9c75288d10f9)
-  )
-  (wire (pts (xy 86.995 147.32) (xy 88.265 147.32))
+  (wire (pts (xy 100.965 151.13) (xy 102.235 151.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ce55c30-697e-451b-b9e9-e5f503380117)
   )
-  (polyline (pts (xy 177.165 165.1) (xy 177.165 97.155))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2e1a27e3-595d-442c-8544-b9868dc49239)
-  )
-
-  (wire (pts (xy 194.945 133.985) (xy 198.755 133.985))
+  (wire (pts (xy 84.455 83.82) (xy 88.265 83.82))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e472cbf-8171-4d31-b2eb-8ed731d3b567)
   )
-  (wire (pts (xy 66.04 111.76) (xy 66.04 111.125))
+  (wire (pts (xy 224.155 100.33) (xy 224.155 99.695))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ec77ad2-f782-4488-9dd7-b7d8757b938f)
   )
-  (wire (pts (xy 203.835 145.415) (xy 206.375 145.415))
+  (wire (pts (xy 200.025 57.15) (xy 200.025 61.595))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2effc87f-3b1a-4dd5-9592-ee7b69f6cf8c)
+  )
+  (wire (pts (xy 93.345 95.25) (xy 95.885 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 35d57cce-4a95-42d1-96f3-279033660235)
   )
-  (wire (pts (xy 235.585 105.41) (xy 235.585 109.22))
+  (bus (pts (xy 168.91 59.055) (xy 168.91 61.595))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 37b2da65-0c95-450e-9fb3-d11f10b3c1f1)
+  )
+
+  (wire (pts (xy 125.095 44.45) (xy 125.095 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3867662f-541a-441b-bc78-64c3e1908e6c)
   )
-  (wire (pts (xy 233.045 71.755) (xy 238.76 71.755))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3a298673-d322-4db2-a3b9-079bbc6811bf)
-  )
-  (wire (pts (xy 215.265 132.715) (xy 217.805 132.715))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3a608606-cfeb-45c0-92c7-2789350989a6)
-  )
-  (wire (pts (xy 86.995 157.48) (xy 88.265 157.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3e503cab-7958-4a9f-99ea-88fe167c3dfd)
-  )
-  (wire (pts (xy 181.61 35.56) (xy 186.055 35.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3f154179-2347-488a-896a-1a59ed2d65b1)
-  )
-  (wire (pts (xy 173.99 26.67) (xy 176.53 26.67))
+  (wire (pts (xy 76.2 32.385) (xy 76.2 34.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 405ae4f5-2a9b-4f73-a2ab-2aafc9725ab5)
   )
-  (wire (pts (xy 220.98 62.23) (xy 220.98 64.77))
+  (wire (pts (xy 198.755 57.15) (xy 200.025 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 41c2795a-4f5e-497b-b989-e042de40cb77)
+    (uuid 408f425f-584f-49e3-849b-f22fee63404f)
   )
-  (wire (pts (xy 81.915 130.175) (xy 81.915 130.81))
+  (wire (pts (xy 95.885 133.985) (xy 95.885 134.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 428fdb39-7d5f-407f-89e6-173d74ca3b58)
   )
-  (wire (pts (xy 85.725 174.625) (xy 85.725 172.72))
+  (wire (pts (xy 192.405 61.595) (xy 200.025 61.595))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4532deac-3c6c-481e-9c58-7ced01129179)
+  )
+  (wire (pts (xy 94.615 44.45) (xy 94.615 48.895))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4a42afd8-62ac-468f-b2fe-4b5537e95fd3)
+  )
+  (wire (pts (xy 142.875 79.375) (xy 166.37 79.375))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 50e3d339-d531-4188-b823-43719abf9f38)
+  )
+  (wire (pts (xy 99.695 178.435) (xy 99.695 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 519bae06-3638-4ada-818a-b4e138ca2cde)
   )
-  (wire (pts (xy 86.995 152.4) (xy 88.265 152.4))
+  (wire (pts (xy 67.31 156.21) (xy 102.235 156.21))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 51b4d145-79fd-416d-b493-1ff073bf0b84)
   )
-  (wire (pts (xy 85.725 170.18) (xy 85.725 172.72))
+  (wire (pts (xy 204.47 56.515) (xy 211.455 56.515))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 52d2a415-1b9d-48dd-80e8-933e8ddf040c)
+  )
+  (wire (pts (xy 99.695 173.99) (xy 99.695 176.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53ca9aa9-5a5b-412b-871b-53096cb1c139)
   )
-  (wire (pts (xy 81.915 136.525) (xy 73.66 136.525))
+  (wire (pts (xy 95.885 140.335) (xy 87.63 140.335))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 53f72ed2-5d18-483f-bc37-1d80af6f3be9)
   )
-  (polyline (pts (xy 210.82 13.335) (xy 153.035 13.97))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 54f06918-c785-482e-94a4-90537986db92)
-  )
-
-  (wire (pts (xy 198.755 133.985) (xy 198.755 137.795))
+  (wire (pts (xy 88.265 83.82) (xy 88.265 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 57113ca8-7012-497b-aeca-63d4f3daf50e)
   )
-  (wire (pts (xy 233.045 64.77) (xy 233.045 71.755))
+  (wire (pts (xy 142.875 86.995) (xy 166.37 86.995))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5b8b5dad-0315-4956-b330-8d3a525021df)
+    (uuid 591d4894-c08a-4190-9c4f-8b40f2bd7b4b)
   )
-  (wire (pts (xy 80.01 80.645) (xy 78.74 80.645))
+  (wire (pts (xy 91.44 61.595) (xy 107.315 61.595))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5c6c7526-7ac3-41ca-9b6c-d6cec3f9eeec)
+  )
+  (wire (pts (xy 104.14 81.915) (xy 107.315 81.915))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5fbd7115-7f11-46ba-83f7-55f88ce1a667)
+  )
+  (wire (pts (xy 238.125 69.215) (xy 236.855 69.215))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 607c4423-86aa-4c71-8031-86fa8a92374f)
   )
-  (wire (pts (xy 53.34 103.505) (xy 51.435 103.505))
+  (bus (pts (xy 168.91 64.135) (xy 168.91 66.675))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6353a964-dc5e-432d-80a4-bbeb5b03bf35)
+  )
+
+  (wire (pts (xy 211.455 92.075) (xy 209.55 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 63cbfc2a-d669-4376-ae52-05e6349ed2a1)
   )
-  (wire (pts (xy 53.34 100.965) (xy 51.435 100.965))
+  (wire (pts (xy 211.455 89.535) (xy 209.55 89.535))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 662dd460-99f6-4d66-8696-aecc06c7b854)
   )
-  (wire (pts (xy 65.405 53.34) (xy 66.04 53.34))
+  (wire (pts (xy 223.52 41.91) (xy 224.155 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 667da294-bc20-440f-84e7-7f365943da16)
   )
-  (wire (pts (xy 81.915 135.89) (xy 81.915 136.525))
+  (wire (pts (xy 67.31 40.005) (xy 67.31 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6740afc3-e993-4c3f-9dee-ba2c8d3f2066)
+  )
+  (bus (pts (xy 201.295 50.8) (xy 201.93 50.8))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 68fb0171-7940-4e38-bb2d-2e03d1b840a0)
+  )
+
+  (wire (pts (xy 95.885 139.7) (xy 95.885 140.335))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 696613bb-5ce4-4810-bdf4-8bed9f09c34c)
   )
-  (wire (pts (xy 86.995 154.94) (xy 88.265 154.94))
+  (bus (pts (xy 201.93 50.8) (xy 201.93 51.435))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6a1527c6-b094-4bef-8b14-acb2249200c1)
+  )
+
+  (wire (pts (xy 100.965 158.75) (xy 102.235 158.75))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a45d875-cb85-4334-80b3-40bf84dff2c0)
   )
-  (wire (pts (xy 80.01 67.945) (xy 78.74 67.945))
+  (wire (pts (xy 238.125 56.515) (xy 236.855 56.515))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6bb5e30b-6b27-4b4a-a933-a96201d92bb3)
   )
-  (wire (pts (xy 187.96 137.795) (xy 189.865 137.795))
+  (wire (pts (xy 77.47 87.63) (xy 79.375 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6d11f184-9686-4ff1-b378-98b8f6c22fbc)
   )
-  (wire (pts (xy 194.945 137.795) (xy 198.755 137.795))
+  (wire (pts (xy 84.455 87.63) (xy 88.265 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6ea42676-788c-4a7c-8925-6d55ced6e3ab)
   )
-  (wire (pts (xy 233.045 54.61) (xy 220.98 54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 6f124837-de22-4a72-9686-efd0c05f7500)
-  )
-  (wire (pts (xy 73.66 137.795) (xy 73.66 136.525))
+  (wire (pts (xy 87.63 141.605) (xy 87.63 140.335))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 73c983c3-b186-4968-89ea-014889eb8ad3)
   )
-  (wire (pts (xy 60.325 53.34) (xy 59.69 53.34))
+  (wire (pts (xy 193.675 57.15) (xy 192.405 57.15))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 750be4a8-c1dc-4cb5-9d50-3ed16b59fcdb)
+  )
+  (wire (pts (xy 218.44 41.91) (xy 217.805 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7720c2f8-8dec-45cc-b440-b33ae33bd3c4)
   )
-  (wire (pts (xy 166.37 35.56) (xy 171.45 35.56))
+  (wire (pts (xy 67.31 24.765) (xy 67.31 26.035))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 77cfa961-6322-48af-9088-4fc9617c7e25)
   )
-  (wire (pts (xy 80.01 83.185) (xy 78.74 83.185))
+  (wire (pts (xy 238.125 71.755) (xy 236.855 71.755))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 79a62935-fb7f-483f-b7b1-b703891687e4)
   )
-  (wire (pts (xy 80.01 90.805) (xy 78.74 90.805))
+  (wire (pts (xy 142.875 69.215) (xy 166.37 69.215))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7ab878fb-de5e-49c9-8fb7-980485a56be7)
+  )
+  (wire (pts (xy 238.125 79.375) (xy 236.855 79.375))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c4635e1-9c23-4b2f-a2cc-f1f711958d79)
   )
-  (wire (pts (xy 85.725 137.16) (xy 88.265 137.16))
+  (wire (pts (xy 99.695 140.97) (xy 102.235 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 85553150-665f-46cd-a0c7-87cff036d4b0)
   )
-  (wire (pts (xy 86.995 160.02) (xy 88.265 160.02))
+  (wire (pts (xy 200.025 61.595) (xy 211.455 61.595))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8637d5a6-db67-465e-958e-cf43bcaf8af8)
+  )
+  (wire (pts (xy 142.875 66.675) (xy 166.37 66.675))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 86c7afd4-4afa-4faa-bb50-bca34b385d8e)
+  )
+  (wire (pts (xy 67.31 26.035) (xy 67.31 29.845))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 87bd5aec-e179-4e06-b3cc-8b306b9aed7e)
+  )
+  (wire (pts (xy 100.965 163.83) (xy 102.235 163.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 884b46a0-67b1-4a69-8684-e5990c2203b7)
   )
-  (wire (pts (xy 205.105 132.715) (xy 205.105 120.015))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 888b61fc-5df0-462b-95c7-801b21f01472)
-  )
-  (wire (pts (xy 86.995 165.1) (xy 88.265 165.1))
+  (wire (pts (xy 73.66 168.91) (xy 102.235 168.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 889536ce-cf0e-48f5-a393-d876f81fc672)
   )
-  (wire (pts (xy 36.195 66.675) (xy 36.195 67.31))
+  (bus (pts (xy 201.93 51.435) (xy 201.93 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 88fa5efa-10cb-4430-88a5-7a6df1a7f4e7)
+    (uuid 89a8d80e-3fff-493d-8c5f-4cc119a6d85d)
   )
-  (wire (pts (xy 187.96 145.415) (xy 187.96 137.795))
+
+  (wire (pts (xy 77.47 95.25) (xy 77.47 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8a76ed20-79f9-424e-9293-3a2b321cec91)
   )
-  (wire (pts (xy 166.37 24.765) (xy 166.37 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8a9f6708-2e76-48c3-81f3-38862a78b48c)
-  )
-  (wire (pts (xy 80.01 73.025) (xy 78.74 73.025))
+  (wire (pts (xy 238.125 61.595) (xy 236.855 61.595))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8b0f1fc5-0e99-4239-a2c8-d3a5a42a7e00)
   )
-  (wire (pts (xy 73.66 130.81) (xy 73.66 130.175))
+  (wire (pts (xy 87.63 134.62) (xy 87.63 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8cc88670-40b2-4348-8277-180ecc04fdac)
   )
-  (wire (pts (xy 203.835 120.015) (xy 205.105 120.015))
+  (wire (pts (xy 66.04 44.45) (xy 67.31 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8e4e1a39-de57-4be1-b781-96995f6ecd91)
+    (uuid 8e0a1c58-243c-407b-9047-64e0d5218c97)
   )
-  (wire (pts (xy 59.69 53.34) (xy 59.69 53.975))
+  (bus (pts (xy 69.215 173.355) (xy 71.12 173.355))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8f831e97-548d-4a9b-af09-5b74a9fc9b42)
+  )
+
+  (wire (pts (xy 217.805 41.91) (xy 217.805 42.545))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90b66d09-bec7-483e-87ec-20d62b35f070)
   )
-  (polyline (pts (xy 213.36 13.335) (xy 213.36 95.885))
+  (wire (pts (xy 101.6 48.895) (xy 101.6 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 90f01fb1-b83a-43f1-ad5c-cbd38fb59d58)
+    (uuid 936fea1a-6b4d-4a26-b13d-b6158032596a)
+  )
+  (wire (pts (xy 67.31 44.45) (xy 94.615 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 93da5736-94c2-43dd-a77c-8349e60117b1)
+  )
+  (bus (pts (xy 168.91 79.375) (xy 168.91 81.915))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9be57b64-c30f-43fc-aa86-b255515b9d78)
   )
 
-  (wire (pts (xy 214.63 145.415) (xy 217.805 145.415))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 92a25643-4da6-4b11-87ab-68b79cc71b03)
-  )
-  (polyline (pts (xy 283.845 97.155) (xy 283.845 165.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 92f8e42a-025b-4b4f-99f2-967d8abb1e8a)
-  )
-
-  (wire (pts (xy 36.195 72.39) (xy 36.195 73.025))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 97ed058a-8bf9-4835-a30b-3712f13f02cd)
-  )
-  (wire (pts (xy 214.63 151.765) (xy 214.63 153.67))
+  (wire (pts (xy 104.14 101.6) (xy 104.14 103.505))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9d5fda09-0809-4444-ba47-2f6369a07e7d)
   )
-  (wire (pts (xy 34.29 73.025) (xy 36.195 73.025))
+  (wire (pts (xy 76.2 27.305) (xy 76.2 26.035))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9de9f557-b263-40c4-a70b-5de513ec0550)
+    (uuid 9d734012-f62f-417e-929c-e7eb18aae3e1)
   )
-  (wire (pts (xy 214.63 142.875) (xy 217.805 142.875))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9e7ecd41-0793-4e98-87b5-c300a030aabd)
-  )
-  (wire (pts (xy 184.785 145.415) (xy 187.96 145.415))
+  (wire (pts (xy 74.295 95.25) (xy 77.47 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f09006d-597b-4142-9ba0-843b2c9a0afd)
   )
-  (wire (pts (xy 235.585 109.22) (xy 235.585 114.935))
+  (wire (pts (xy 125.095 48.26) (xy 125.095 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f99d3c0-9e54-49ea-a2e7-bd5fbfca4797)
   )
-  (polyline (pts (xy 153.035 13.97) (xy 153.035 53.975))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a2e7da1c-aaf7-4e4e-a6bc-c878dc3201f1)
-  )
-
-  (wire (pts (xy 220.98 62.23) (xy 233.045 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a624e386-d9f9-4d7d-88be-9e9bfb12075f)
-  )
-  (wire (pts (xy 85.725 142.24) (xy 85.725 139.7))
+  (wire (pts (xy 99.695 146.05) (xy 99.695 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a8a69588-a1ce-472f-8664-9d700e0510ea)
   )
-  (wire (pts (xy 73.66 136.525) (xy 73.66 135.89))
+  (wire (pts (xy 87.63 140.335) (xy 87.63 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aaa293bb-edae-41d1-a944-83c2d4c83a1b)
   )
-  (polyline (pts (xy 153.035 53.975) (xy 210.82 53.975))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ab2b8d04-9705-4e77-9dd3-73f6e44c9b6e)
-  )
-
-  (wire (pts (xy 88.265 139.7) (xy 85.725 139.7))
+  (wire (pts (xy 102.235 143.51) (xy 99.695 143.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab717fc8-b450-45f3-a273-3e4f9dbcf896)
   )
-  (wire (pts (xy 186.055 33.655) (xy 186.055 35.56))
+  (wire (pts (xy 60.96 44.45) (xy 59.69 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b38a3d0e-ed95-4580-8127-2f16cb3ecf9b)
+    (uuid adefded2-40a9-4a01-b8a6-8fd602161dcb)
   )
-  (wire (pts (xy 86.995 162.56) (xy 88.265 162.56))
+  (wire (pts (xy 142.875 84.455) (xy 166.37 84.455))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b042d443-84c6-4791-bb0e-6d91f06c2e70)
+  )
+  (bus (pts (xy 64.77 153.67) (xy 64.77 158.75))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b6af0258-6e50-4adc-86a6-61c4b7d207f1)
+  )
+  (bus (pts (xy 168.91 53.975) (xy 168.91 59.055))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b6b4bc86-699e-4aa5-9add-069cba03ff60)
+  )
+
+  (wire (pts (xy 73.66 166.37) (xy 102.235 166.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b73f93c9-5107-43ca-8737-5297fa1b12aa)
   )
-  (polyline (pts (xy 210.82 53.975) (xy 210.82 13.335))
+  (wire (pts (xy 94.615 53.975) (xy 94.615 59.055))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bb5b10f8-03d4-4fd4-a401-f3312ecc1367)
+    (uuid bc674dc6-8fd0-4d9f-9621-f82fa801713c)
   )
-
-  (wire (pts (xy 66.04 53.34) (xy 66.04 60.325))
+  (wire (pts (xy 224.155 41.91) (xy 224.155 48.895))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bf708736-41e0-4723-ae5c-72b4404c266c)
   )
-  (wire (pts (xy 176.53 26.67) (xy 176.53 27.94))
+  (wire (pts (xy 101.6 71.755) (xy 107.315 71.755))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c04767df-cb5e-4faf-986f-89fa353064b3)
+  )
+  (wire (pts (xy 76.2 34.925) (xy 74.93 34.925))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c12d1548-29af-4154-b586-a61f5b3b10bc)
   )
-  (polyline (pts (xy 283.845 13.335) (xy 213.36 13.335))
+  (wire (pts (xy 76.2 26.035) (xy 67.31 26.035))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c2e86c85-e2f1-4c16-bdd4-4f007d9343e3)
+    (uuid c16fe7cd-c68a-471c-a668-6024baf6277c)
+  )
+  (bus (pts (xy 168.91 61.595) (xy 168.91 64.135))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c51f9028-6273-4f97-ac86-c2cf8a21531c)
+  )
+  (bus (pts (xy 168.91 74.295) (xy 168.91 76.835))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c679968e-4bf1-48bb-937d-26944307fa32)
   )
 
-  (wire (pts (xy 86.995 144.78) (xy 88.265 144.78))
+  (wire (pts (xy 100.965 148.59) (xy 102.235 148.59))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c6a2802b-af99-46bd-ad35-8796984fe651)
   )
-  (wire (pts (xy 85.725 130.175) (xy 81.915 130.175))
+  (wire (pts (xy 101.6 53.975) (xy 101.6 71.755))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c8331775-95d3-4b72-82d0-a1c6d5c2ce7f)
+  )
+  (wire (pts (xy 91.44 59.055) (xy 94.615 59.055))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c9917df2-2f41-4f9b-9e2f-e32625151c27)
+  )
+  (wire (pts (xy 99.695 133.985) (xy 95.885 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c9e0c5e9-835f-47d1-a916-4ea984556938)
   )
-  (wire (pts (xy 220.98 54.61) (xy 220.98 62.23))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid cca896b3-3a59-460d-a810-0cad08b6da98)
-  )
-  (wire (pts (xy 211.455 145.415) (xy 214.63 145.415))
+  (wire (pts (xy 100.965 95.25) (xy 104.14 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ce275bdb-d23a-4123-907b-6842d64f0c5e)
   )
-  (wire (pts (xy 85.725 127) (xy 85.725 130.175))
+  (wire (pts (xy 99.695 130.81) (xy 99.695 133.985))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cf39b60b-a62f-4985-8da9-820323f4cc2d)
   )
-  (wire (pts (xy 88.265 142.24) (xy 85.725 142.24))
+  (wire (pts (xy 91.44 66.675) (xy 107.315 66.675))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d108a393-3bfd-4cde-8b56-aaac44f166ba)
+  )
+  (wire (pts (xy 102.235 146.05) (xy 99.695 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d31f737d-a05f-4c8f-9d9b-a10d7fb86684)
   )
-  (wire (pts (xy 85.725 167.64) (xy 85.725 170.18))
+  (wire (pts (xy 99.695 171.45) (xy 99.695 173.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d56e46b4-2f42-4420-9617-09694f0c33d4)
   )
-  (wire (pts (xy 166.37 26.67) (xy 166.37 35.56))
+  (wire (pts (xy 91.44 69.215) (xy 107.315 69.215))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid dad34916-da78-402a-8908-249b1a935785)
+    (uuid d58a9ac0-2439-4ce4-82bb-9eb2e8dc6238)
   )
-  (polyline (pts (xy 213.36 95.885) (xy 283.845 95.885))
+  (wire (pts (xy 142.875 61.595) (xy 166.37 61.595))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e0287340-86de-402e-869f-f9a4130be0d6)
+    (uuid d7ddd6e5-8c83-4ab4-9356-39177c3ef16b)
   )
-  (polyline (pts (xy 283.845 95.885) (xy 283.845 13.335))
+  (wire (pts (xy 104.14 84.455) (xy 107.315 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e1164b5a-2080-464c-ab0c-dbd350d3a7da)
+    (uuid d9916c94-2e25-4d9b-aa18-5db464debd4a)
   )
-
-  (wire (pts (xy 214.63 142.875) (xy 214.63 145.415))
+  (wire (pts (xy 104.14 84.455) (xy 104.14 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid daf797ab-10e2-4f41-baf1-0ac5ff7e0ab0)
+  )
+  (wire (pts (xy 142.875 64.135) (xy 166.37 64.135))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dbcc4434-0d41-400f-b7b5-2389401c28cd)
+  )
+  (wire (pts (xy 94.615 59.055) (xy 107.315 59.055))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dc83c341-1c73-4c58-8c97-b7ceda6ee32a)
+  )
+  (wire (pts (xy 91.44 64.135) (xy 107.315 64.135))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid df83a0b8-b339-44ba-846e-2b9f25a3338f)
+  )
+  (wire (pts (xy 204.47 53.975) (xy 211.455 53.975))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dfde9039-a32e-4f92-95c9-aa2a5e96a2b7)
+  )
+  (wire (pts (xy 104.14 81.915) (xy 104.14 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e3e8e950-9fa4-46b4-abfd-4cdd0df871a7)
   )
-  (polyline (pts (xy 283.845 165.1) (xy 177.165 165.1))
+  (bus (pts (xy 71.12 171.45) (xy 71.12 173.355))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e4569811-14d6-4f3e-9bbd-84ebbca7240e)
+    (uuid e41f32f0-533b-4b5c-8078-e7d57beac248)
   )
 
-  (wire (pts (xy 85.725 139.7) (xy 85.725 137.16))
+  (wire (pts (xy 67.31 50.165) (xy 67.31 44.45))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e43d39a8-1ded-4604-b234-6f8f67b86bb2)
+  )
+  (wire (pts (xy 99.695 143.51) (xy 99.695 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e512795d-4499-422d-889b-5b4346487149)
   )
-  (wire (pts (xy 53.34 106.045) (xy 51.435 106.045))
+  (wire (pts (xy 211.455 94.615) (xy 209.55 94.615))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e597a61a-c132-43a3-be85-cb3fc7898d7f)
   )
-  (wire (pts (xy 80.01 70.485) (xy 78.74 70.485))
+  (wire (pts (xy 238.125 59.055) (xy 236.855 59.055))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e6448a74-05a7-4ce4-aa95-7bdacc86ef47)
   )
-  (wire (pts (xy 166.37 26.67) (xy 168.91 26.67))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e78e751a-8e03-4789-bba2-9d95925248fd)
-  )
-  (wire (pts (xy 51.435 100.965) (xy 51.435 103.505))
+  (wire (pts (xy 209.55 89.535) (xy 209.55 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9fbfeb1-a6ba-4f6c-911c-afa73ad6d1ff)
   )
-  (wire (pts (xy 80.01 88.265) (xy 78.74 88.265))
+  (wire (pts (xy 238.125 76.835) (xy 236.855 76.835))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eaf6686a-e431-49f0-b379-4899dd3f80be)
   )
-  (wire (pts (xy 85.725 130.175) (xy 85.725 137.16))
+  (wire (pts (xy 99.695 133.985) (xy 99.695 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb0132e1-04ce-434c-a6b1-4c59aa6481b6)
   )
-  (polyline (pts (xy 177.165 97.155) (xy 283.845 97.155))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid eb540183-0ee7-443a-94e3-8f577c9ead9f)
-  )
-
-  (wire (pts (xy 80.01 93.345) (xy 78.74 93.345))
+  (wire (pts (xy 238.125 81.915) (xy 236.855 81.915))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb5e9ed9-e978-494b-98e4-47aa5a5bd5c0)
   )
-  (wire (pts (xy 238.76 74.93) (xy 241.935 74.93))
+  (bus (pts (xy 168.91 76.835) (xy 168.91 79.375))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ef5c9134-3404-40ad-a6c9-c326e96aa1a8)
+    (uuid ef1a5207-7b53-472b-bda0-bc43b6dd73b2)
   )
-  (wire (pts (xy 80.01 75.565) (xy 78.74 75.565))
+  (bus (pts (xy 64.135 149.225) (xy 64.77 149.225))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f0bfccea-6e8a-4e78-8483-6763628219f7)
+  )
+
+  (wire (pts (xy 238.125 64.135) (xy 236.855 64.135))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1b2a609-1aa2-4008-9e19-0cfc9912d09e)
   )
-  (wire (pts (xy 88.265 170.18) (xy 85.725 170.18))
+  (wire (pts (xy 102.235 173.99) (xy 99.695 173.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f333e9db-3acc-44f5-ab28-b780b6f1b3c9)
   )
-  (wire (pts (xy 88.265 167.64) (xy 85.725 167.64))
+  (wire (pts (xy 91.44 71.755) (xy 101.6 71.755))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f3641bda-23ff-453f-ad18-ada96a392049)
+  )
+  (wire (pts (xy 102.235 171.45) (xy 99.695 171.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f4faba57-f238-4056-9959-16426ef48d11)
   )
-  (wire (pts (xy 235.585 74.93) (xy 238.76 74.93))
+  (bus (pts (xy 168.91 81.915) (xy 168.91 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f9939f10-278b-489b-83de-1bc7c6fc96ce)
+    (uuid f9937311-0317-4519-98fc-87e9cdd24244)
   )
-  (wire (pts (xy 80.01 65.405) (xy 78.74 65.405))
+
+  (wire (pts (xy 238.125 53.975) (xy 236.855 53.975))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fae030d4-091a-4ca9-9bc1-3a2160bfe661)
   )
-  (wire (pts (xy 205.105 120.015) (xy 210.185 120.015))
+  (wire (pts (xy 67.31 161.29) (xy 102.235 161.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid fae60ab1-bdeb-49d4-9c1a-fd61ee4b3f01)
+    (uuid fc44b558-c078-4a31-b1e6-2f10a092a1b8)
   )
-  (wire (pts (xy 214.63 145.415) (xy 214.63 146.685))
+  (wire (pts (xy 104.14 95.25) (xy 104.14 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fdf37c49-1313-4d4a-8c42-daa6f099e470)
   )
 
-  (text "<1mA" (at 277.495 164.465 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 13062042-f757-49cc-ab04-1a7d577bfe5b)
-  )
-  (text "TODO: mosfet hard" (at 168.275 50.165 0)
+  (text "TODO: mosfet hard" (at 71.755 24.765 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 43523baa-7737-48dd-84d9-f8e2b2611975)
   )
-  (text "~100mA" (at 275.59 95.25 0)
+  (text "~100mA" (at 80.645 77.47 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 65ec4782-3553-4e8b-8bc7-d6b61a93c2b6)
   )
-  (text "Multiplexer for SD Card" (at 177.8 99.695 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 720ce6b7-47e3-4b2c-989d-0ddf191053c7)
-  )
-  (text "TODO: rare component" (at 241.935 104.14 0)
+  (text "TODO: rare component" (at 131.445 43.18 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 72db4abd-fa15-45ec-b50c-5e5d692282ed)
   )
-  (text "SD storage is stateful, so recommended to ensure writes\nare flushed, then kill power to the SD card, before\nswapping which IC is connected"
-    (at 213.995 22.225 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 735a3ce6-dfea-4d5a-bb25-b9a2d300b388)
-  )
   (text "TODO: find a real distributor!!\nhttps://www.aliexpress.com/item/1005004267165249.html\n\nPinout looks standard. This store does a 0.5mm pitch\nFFC connector with a ST7735S."
-    (at 99.695 151.765 0)
+    (at 113.665 155.575 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 756e21f8-58fc-49f9-a049-9900f6e5b9ba)
   )
-  (text "SD Card" (at 213.995 15.875 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 7592a60f-4467-48a5-8d2f-d0a2fe8015a6)
-  )
-  (text "TODO: active high or low?" (at 98.425 84.455 0)
+  (text "TODO: active high or low?" (at 256.54 73.025 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 85727159-77cf-404c-b6b5-789d9657548b)
   )
-  (text "TODO: could use less bits?" (at 253.365 108.585 0)
+  (text "TODO: could use less bits?" (at 142.875 47.625 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a18bcab6-60c6-4b4b-91d1-6859c8f16776)
   )
   (text "TODO: what is going on here?\nmux drawing way too much\ncurrent when switching?"
-    (at 180.975 159.385 0)
+    (at 70.485 109.22 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b65e1248-363f-4c17-b32b-3b642838de91)
   )
-  (text "Power Enable" (at 153.67 16.51 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid d47ad022-d820-4b8a-a228-ee0141b8a60f)
+  (text "TODO: double check how\nto handle these" (at 41.275 63.5 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid d7b639bb-a60a-4706-811c-0b11e6b569a6)
   )
-  (text "Address:\n0x20" (at 52.705 100.33 180)
+  (text "Address:\n0x20" (at 210.82 88.9 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid fd662975-da05-48ea-82fb-daa4c92576cb)
   )
 
-  (global_label "SD_DAT0" (shape input) (at 217.805 122.555 180) (fields_autoplaced)
+  (label "SAMD_SPI.POCI" (at 166.37 79.375 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 0613cab5-a8ee-4479-839c-15d73dda476e)
+  )
+  (label "I2C.SDA" (at 80.01 166.37 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 0f1adfc6-3057-4bb8-88aa-0d8e23ff7e85)
+  )
+  (label "I2C.SCL" (at 211.455 53.975 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 1e7de6c7-b09c-4606-822d-dc9b3171c9a1)
+  )
+  (label "SAMD_SPI.PICO" (at 166.37 84.455 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 3746181e-d76d-40b3-ac9e-7e23f65b2ac6)
+  )
+  (label "ESP_SPI.PICO" (at 166.37 66.675 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 4bf723e3-e4e1-42cf-b28d-6ad033da5e88)
+  )
+  (label "ESP_SPI.SD_CS" (at 166.37 69.215 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 4c1c7510-04b0-477e-8f3c-eba489d77c05)
+  )
+  (label "ESP_SPI.POCI" (at 166.37 61.595 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 4c81034d-4a2b-4c4a-af1b-2c3c6fa03895)
+  )
+  (label "ESP_SPI.PICO" (at 67.31 161.29 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 4e1140cd-fb63-46db-8674-8e0023c7ceb8)
+  )
+  (label "SAMD_SPI.SCLK" (at 166.37 81.915 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 7cae6aad-465a-4c89-ba32-99148fd0bf28)
+  )
+  (label "ESP_SPI.DISPLAY_CS" (at 67.31 153.67 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid b6798340-b123-4761-8743-3e2e737a54a5)
+  )
+  (label "SAMD_SPI.SD_CS" (at 166.37 86.995 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid bbe33f9a-f7e0-4907-99cf-e5e933066fd9)
+  )
+  (label "ESP_SPI.SCLK" (at 67.31 156.21 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid be3f1eff-9b61-4d4c-a791-e44fa5ae7514)
+  )
+  (label "I2C.SDA" (at 211.455 56.515 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid d12fc171-c9dd-4bd4-92b6-7c3e6e12a253)
+  )
+  (label "ESP_SPI.SCLK" (at 166.37 64.135 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid f92c612f-85ba-47e2-ab19-19799062a7a0)
+  )
+  (label "I2C.SCL" (at 80.01 168.91 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid fec8bc01-1bd0-419f-862a-686bb2cdfd1b)
+  )
+
+  (global_label "ESP_SPI{ESP_SPI}" (shape input) (at 168.91 53.975 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 02f1c0c3-c64b-4e37-8a08-9aa2663263bc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 207.409 122.4756 0)
+    (uuid 0b63733b-fd98-4678-9c5b-8f4c90feb755)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 149.4426 54.0544 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_POCI" (shape input) (at 253.365 122.555 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 033d2db9-39c8-4bfa-aff9-bbf7a5dce18a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 264.8495 122.4756 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ATSAMD_POCI" (shape input) (at 253.365 140.335 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 0a5228d7-8450-4041-b588-803d2b6deb7d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 268.2967 140.2556 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DISPLAY_LED_EN" (shape input) (at 86.995 144.78 180) (fields_autoplaced)
+  (global_label "DISPLAY_LED_EN" (shape input) (at 100.965 148.59 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0b6f5a50-2368-4f60-9c46-39fd6ab471ae)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 69.1605 144.8594 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 83.1305 148.6694 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "~{ATSAMD_INT}" (shape input) (at 80.01 93.345 0) (fields_autoplaced)
+  (global_label "~{SAMD_INT}" (shape input) (at 238.125 81.915 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0cddf8f5-069a-4e41-91f4-e4e513bc566a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 93.3693 93.4244 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.4281 81.8356 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "ATSAMD_SD_CS" (shape input) (at 253.365 147.955 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 1180141a-cd0e-458b-b82e-71957016c046)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 269.7481 147.8756 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "ESP_SD_CS" (shape input) (at 253.365 130.175 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 11b45526-ac58-4ac9-b5bd-98cd5e9ca978)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 266.301 130.0956 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "KEY_LOCK" (shape input) (at 122.555 67.31 180) (fields_autoplaced)
+  (global_label "KEY_LOCK" (shape input) (at 243.205 140.97 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 192ce8eb-8b2e-4b24-9ecb-3f13f5909478)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 110.7681 67.2306 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 231.4181 140.8906 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "~{3.5mm_DETECT}" (shape input) (at 80.01 90.805 0) (fields_autoplaced)
+  (global_label "~{3.5mm_DETECT}" (shape input) (at 238.125 79.375 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 1aefc256-08be-42fb-80ef-81dfbcf90350)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 96.5745 90.7256 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 254.6895 79.2956 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SD_VDD" (shape input) (at 192.405 35.56 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 1fa1897a-49a6-4dfa-a4c2-67d10bd1608c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 201.8938 35.4806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "DISPLAY_CS" (shape input) (at 86.995 149.86 180) (fields_autoplaced)
+  (global_label "SD_WP" (shape input) (at 41.275 70.485 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 233c575a-e02d-4f34-8f3d-249dce7ca497)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 73.5752 149.9394 0)
+    (uuid 1b31ca12-68cd-4183-9f7f-c49282a1d51c)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 32.6933 70.4056 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "~{TOUCH_INT}" (shape input) (at 80.01 78.105 0) (fields_autoplaced)
+  (global_label "~{TOUCH_INT}" (shape input) (at 238.125 66.675 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 266fb690-07ae-4c9a-9c91-5b9d6c58b944)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 92.5226 78.1844 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 250.6376 66.7544 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "ESP_PICO" (shape input) (at 86.995 157.48 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 2825597f-13c1-4098-a5c0-82e32a3a58d1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 75.5105 157.5594 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "KEY_LOCK" (shape input) (at 80.01 75.565 0) (fields_autoplaced)
+  (global_label "KEY_LOCK" (shape input) (at 238.125 64.135 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2fba0155-d2b0-4043-adef-4c5cc0cda880)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 91.7969 75.6444 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.9119 64.2144 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "ESP_SDA" (shape input) (at 86.995 162.56 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 34e7dc0b-35e0-487f-be7a-104bbac5c7c2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.4176 162.4806 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "SD_CMD" (shape input) (at 217.805 127.635 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 38a58ec9-8d21-4939-8d1d-0a5f257e5c93)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 207.9533 127.5556 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "SD_VDD" (shape input) (at 203.835 120.015 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 394298f7-3ba4-49b5-bbbd-803c819e8d15)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 194.3462 120.0944 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "SD_DAT2" (shape input) (at 233.045 41.91 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 400df6f9-a256-429f-ba07-3a53e1f25b61)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 222.649 41.8306 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ATSAMD_PICO" (shape input) (at 253.365 145.415 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 40145db0-47b2-4a37-9c36-0522249a5f4b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 268.2967 145.3356 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SD_DAT3" (shape input) (at 233.045 44.45 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 425099e2-778a-4d69-9696-a7688e14997f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 222.649 44.3706 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "~{DISPLAY_RST}" (shape input) (at 99.695 97.79 0) (fields_autoplaced)
+  (global_label "~{DISPLAY_RST}" (shape input) (at 257.81 86.36 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 45a35b93-64a1-4374-9d96-aca5edc44959)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 114.0824 97.7106 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 272.1974 86.2806 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SD_VDD" (shape input) (at 233.045 49.53 180) (fields_autoplaced)
+  (global_label "I2C{I2C}" (shape input) (at 69.215 173.355 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 492c53b6-0962-486a-ab25-f2910b3e2d29)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 223.5562 49.6094 0)
+    (uuid 45fea73b-204c-4946-8196-67c06f8fd5ec)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 58.94 173.4344 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SCL" (shape input) (at 86.995 165.1 180) (fields_autoplaced)
+  (global_label "SAMD_SPI{SAMD_SPI}" (shape input) (at 168.91 74.295 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 4c452efe-bea7-43ef-89e1-0595584bbd6a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 76.4781 165.0206 0)
+    (uuid 4628c050-f341-48de-b168-9b8d340f3b2c)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 146.6607 74.2156 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "SD_DAT0" (shape input) (at 233.045 57.15 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 5084b125-2e41-480e-9b9e-539851edbb0f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 222.649 57.0706 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ATSAMD_SCLK" (shape input) (at 253.365 142.875 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 6b885612-5da4-4594-878b-0f20c04f437d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 268.5991 142.7956 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SD_DAT3" (shape input) (at 217.805 130.175 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 6cc43b12-a7ba-417d-bcae-ba79401750f3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 207.409 130.2544 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "~{SD_VDD_EN}" (shape input) (at 176.53 23.495 0) (fields_autoplaced)
+  (global_label "~{SD_VDD_EN}" (shape input) (at 79.375 34.925 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 70c630b9-ac6d-411f-b050-4034f474df6e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 189.466 23.5744 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 92.311 35.0044 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "DISPLAY_DR" (shape input) (at 80.01 80.645 0) (fields_autoplaced)
+  (global_label "DISPLAY_DR" (shape input) (at 238.125 69.215 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 78fda0f9-43c4-4b9c-ba77-1a8655205af8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 93.4902 80.7244 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 251.6052 69.2944 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "~{TOUCH_INT}" (shape input) (at 86.995 160.02 180) (fields_autoplaced)
+  (global_label "~{TOUCH_INT}" (shape input) (at 100.965 163.83 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7a6cdcee-d118-4954-bf54-6321a51f2e96)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 74.4824 160.0994 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 88.4524 163.9094 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "SD_DAT1" (shape input) (at 233.045 59.69 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 82b2b959-8dea-49b6-bdf4-203d3d7cb5c7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 222.649 59.6106 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "ESP_SCLK" (shape input) (at 86.995 152.4 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 89f26c11-7085-4014-8cab-22909d0e2bbc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 75.2081 152.4794 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "DISPLAY_LED_EN" (shape input) (at 80.01 83.185 0) (fields_autoplaced)
+  (global_label "DISPLAY_LED_EN" (shape input) (at 238.125 71.755 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 8b77a297-0ffe-41dc-b968-c150315ab730)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 97.8445 83.1056 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 255.9595 71.6756 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "~{SD_VDD_EN}" (shape input) (at 80.01 65.405 0) (fields_autoplaced)
+  (global_label "I2C{I2C}" (shape input) (at 201.295 50.8 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 8c505192-35aa-4308-b5e5-5f951b4d3d3c)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 191.02 50.8794 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
+  (global_label "~{SD_VDD_EN}" (shape input) (at 238.125 53.975 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 928a5a94-49dc-4f0a-9ebc-416db2118be6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 92.946 65.4844 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 251.061 54.0544 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "~{DISPLAY_RST}" (shape input) (at 86.995 154.94 180) (fields_autoplaced)
+  (global_label "SD_CD" (shape input) (at 41.275 67.945 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 9588f34b-d0b0-4919-a7c1-3f6078b158f6)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 32.8748 68.0244 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
+  (global_label "~{DISPLAY_RST}" (shape input) (at 100.965 158.75 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 973365a0-eb9d-440f-88f1-ab75637c639b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.6076 155.0194 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 86.5776 158.8294 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_PICO" (shape input) (at 253.365 127.635 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 990518d4-dcfb-4490-a4b1-f5f64f2560d0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 264.8495 127.5556 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SD_MUX_SW" (shape input) (at 80.01 67.945 0) (fields_autoplaced)
+  (global_label "SD_MUX_SW" (shape input) (at 238.125 56.515 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 99f65bbd-b5de-4c7f-abf3-841a0c828e61)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 93.4902 68.0244 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 251.6052 56.5944 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SD_CMD" (shape input) (at 233.045 46.99 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a04b3c57-a6fc-4655-93f4-c158fb079f23)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 223.1933 46.9106 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "SD_CLK" (shape input) (at 217.805 125.095 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a2f91ed9-745e-4a26-9b8f-4aa33dea64b6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 208.3767 125.1744 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "KEY_VOL_UP" (shape input) (at 80.01 70.485 0) (fields_autoplaced)
+  (global_label "KEY_VOL_UP" (shape input) (at 238.125 59.055 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid a4358ade-b551-4236-be1e-196bdbd96235)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 93.9136 70.5644 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 252.0286 59.1344 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "SD_MUX_SW" (shape input) (at 194.945 133.985 180) (fields_autoplaced)
+  (global_label "SD_MUX_SW" (shape input) (at 84.455 83.82 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ae2b4ece-1e4a-4cd8-bfe9-1dec2492c1cf)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 181.4648 133.9056 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 70.9748 83.7406 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SDA" (shape input) (at 53.34 67.945 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid b017db69-fd0e-4b33-aed0-4cd18653322e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 42.7626 67.8656 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "KEY_VOL_DOWN" (shape input) (at 80.01 73.025 0) (fields_autoplaced)
+  (global_label "KEY_VOL_DOWN" (shape input) (at 238.125 61.595 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid b97e439d-04ff-4503-b975-b794a4b64bca)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 96.6955 73.1044 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 254.8105 61.6744 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "USB_VDD33" (shape input) (at 229.235 74.93 180) (fields_autoplaced)
+  (global_label "ESP_SPI{ESP_SPI}" (shape input) (at 63.5 149.225 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
-    (uuid b9c5adef-06de-4152-bf36-17b99b020a27)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 215.9967 75.0094 0)
+    (uuid bb928e12-c912-4a41-9859-4b1784369778)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 44.0326 149.3044 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "DISPLAY_DR" (shape input) (at 86.995 147.32 180) (fields_autoplaced)
+  (global_label "DISPLAY_DR" (shape input) (at 100.965 151.13 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c143910b-b409-41e3-9325-776474d6d50d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 73.5148 147.3994 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 87.4848 151.2094 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SCL" (shape input) (at 53.34 65.405 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid c2751d23-aa33-4613-b5b6-4398d8198b0c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 42.8231 65.3256 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "~{GPIO_INT}" (shape input) (at 34.29 73.025 180) (fields_autoplaced)
+  (global_label "~{GPIO_INT}" (shape input) (at 192.405 61.595 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c540cd8f-c17a-4561-bf67-d1fdf817d529)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 23.5312 72.9456 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 181.6462 61.5156 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "SD_CLK" (shape input) (at 233.045 52.07 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid ccc3a69e-7f0b-4999-bebd-66d729719ca9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 223.6167 52.1494 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "KEY_VOL_DOWN" (shape input) (at 122.555 62.23 180) (fields_autoplaced)
+  (global_label "KEY_VOL_DOWN" (shape input) (at 243.205 135.89 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid d9ca3fbc-6382-496f-833b-6665d6026192)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 105.8695 62.1506 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 226.5195 135.8106 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "SD_CD" (shape input) (at 241.935 74.93 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid da38e4d3-9630-44af-aefa-0df3d5ff9871)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 250.3352 74.8506 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "~{3V3_MODE}" (shape input) (at 80.01 88.265 0) (fields_autoplaced)
+  (global_label "~{3V3_MODE}" (shape input) (at 238.125 76.835 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid eaca3bea-6f42-4353-b672-b7622250b646)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 92.0993 88.3444 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 250.2143 76.9144 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "KEY_VOL_UP" (shape input) (at 122.555 64.77 180) (fields_autoplaced)
+  (global_label "KEY_VOL_UP" (shape input) (at 243.205 138.43 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ed8765ec-8eda-4b39-8c78-6806843b04ee)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 108.6514 64.6906 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 229.3014 138.3506 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "ESP_SCLK" (shape input) (at 253.365 125.095 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid f499efc3-d002-453a-a00a-f5dbc463ed54)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 265.1519 125.0156 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "~{SD_VDD_EN}" (shape input) (at 216.535 137.795 180) (fields_autoplaced)
+  (global_label "~{SD_VDD_EN}" (shape input) (at 106.045 76.835 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid fc004ee7-7757-41a9-b728-d81809313353)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 203.599 137.7156 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 93.109 76.7556 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 212.725 132.715 270) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 94.615 51.435 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 13698209-70f7-47db-afa3-e97d8a0398b9)
-    (property "Reference" "R?" (id 0) (at 210.185 134.62 90))
-    (property "Value" "10k" (id 1) (at 215.265 134.62 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 212.725 132.715 0)
+    (uuid 01c6ceb4-199c-4d82-a189-dbf1eda2a73a)
+    (property "Reference" "R?" (id 0) (at 97.79 50.8 0))
+    (property "Value" "10k" (id 1) (at 97.79 52.705 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 94.615 51.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 212.725 132.715 0)
+    (property "Datasheet" "~" (id 3) (at 94.615 51.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603JR-0710KL" (id 4) (at 212.725 132.715 0)
+    (property "PN" "AC0603JR-0710KL" (id 4) (at 94.615 51.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5ad1b6b4-c5e1-4d94-9fd4-4ea8462c55c8))
-    (pin "2" (uuid 48279acd-d7ad-432f-84a1-75267416bbae))
+    (pin "1" (uuid 381affac-1ce4-41e8-b60d-647bfa20b3b4))
+    (pin "2" (uuid a5a3f6e4-74a2-487f-a5a2-e2c1dfd65202))
   )
 
-  (symbol (lib_id "Interface_Expansion:PCA9555D") (at 66.04 85.725 0) (unit 1)
+  (symbol (lib_id "Interface_Expansion:PCA9555D") (at 224.155 74.295 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1987254b-d2b8-4692-9467-b98f80a97f48)
-    (property "Reference" "U?" (id 0) (at 67.945 58.42 0)
+    (property "Reference" "U?" (id 0) (at 226.06 46.99 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 67.945 60.96 0)
+    (property "Value" "PCA8575" (id 1) (at 226.06 49.53 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 90.17 111.125 0)
+    (property "Footprint" "Package_SO:SSOP-24_3.9x8.7mm_P0.635mm" (id 2) (at 248.285 99.695 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.nxp.com/docs/en/data-sheet/PCA9555.pdf" (id 3) (at 66.04 85.725 0)
+    (property "Datasheet" "https://www.nxp.com/docs/en/data-sheet/PCA9555.pdf" (id 3) (at 224.155 74.295 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PCA8575" (id 4) (at 66.04 85.725 0)
+    (property "PN" "PCA8575" (id 4) (at 224.155 74.295 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0588184f-5392-423b-a631-c8a1bb4ae11e))
@@ -2081,40 +1936,40 @@
     (pin "9" (uuid 30241cd1-8d1c-4a86-939e-8118c752d2ba))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 208.915 145.415 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 98.425 95.25 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1af9895a-cfb9-46e3-9e0f-6159b6c64dba)
-    (property "Reference" "R414" (id 0) (at 208.5975 141.2875 90))
-    (property "Value" "" (id 1) (at 208.5975 143.1925 90))
-    (property "Footprint" "" (id 2) (at 208.915 145.415 0)
+    (property "Reference" "R414" (id 0) (at 98.1075 91.1225 90))
+    (property "Value" "10k" (id 1) (at 98.1075 93.0275 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 98.425 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 208.915 145.415 0)
+    (property "Datasheet" "~" (id 3) (at 98.425 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603JR-0710KL" (id 4) (at 208.915 145.415 0)
+    (property "PN" "AC0603JR-0710KL" (id 4) (at 98.425 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c2720f6a-ddac-494f-bd47-36d5c20f5b83))
     (pin "2" (uuid bb985baa-7251-4575-9bfb-0c7e2c6a6ebd))
   )
 
-  (symbol (lib_id "Analog_Switch:TS3A27518EPW") (at 235.585 135.255 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Analog_Switch:TS3A27518EPW") (at 125.095 74.295 0) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid 1d38fc78-d0b7-419c-9186-2a9df74149ea)
-    (property "Reference" "U405" (id 0) (at 237.6044 112.395 0)
+    (property "Reference" "U405" (id 0) (at 123.19 72.39 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 237.6044 114.935 0)
+    (property "Value" "TS3A27518EPW" (id 1) (at 118.745 74.93 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 235.585 109.855 0)
+    (property "Footprint" "Package_SO:TSSOP-24_4.4x7.8mm_P0.65mm" (id 2) (at 125.095 48.895 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/ts3a27518e.pdf" (id 3) (at 235.585 137.795 0)
+    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/ts3a27518e.pdf" (id 3) (at 125.095 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "TS3A27518EPW" (id 4) (at 235.585 135.255 0)
+    (property "PN" "TS3A27518EPW" (id 4) (at 125.095 74.295 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bd1afdc1-f4b8-4ad6-b2b1-41e438ec6e87))
@@ -2143,83 +1998,101 @@
     (pin "9" (uuid f485a76b-8fd8-4900-97ad-48830dbb57b7))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 231.14 109.22 270) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 101.6 51.435 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 2508ede4-9915-4302-a20d-1df71873819d)
+    (property "Reference" "R?" (id 0) (at 104.775 50.8 0))
+    (property "Value" "10k" (id 1) (at 104.775 52.705 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 101.6 51.435 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 101.6 51.435 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "PN" "AC0603JR-0710KL" (id 4) (at 101.6 51.435 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0fee5235-f587-481c-8acf-6ba1d73ac169))
+    (pin "2" (uuid 0fd30b34-e6fa-43f2-a386-536014a8f659))
+  )
+
+  (symbol (lib_id "Device:C_Small") (at 120.65 48.26 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 25f2f9cb-fd73-4a85-a9f8-89d40401d85a)
-    (property "Reference" "C415" (id 0) (at 231.14 104.14 90))
-    (property "Value" "" (id 1) (at 231.14 106.045 90))
-    (property "Footprint" "" (id 2) (at 231.14 109.22 0)
+    (property "Reference" "C415" (id 0) (at 120.65 43.18 90))
+    (property "Value" "0.1uF" (id 1) (at 120.65 45.085 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 120.65 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 231.14 109.22 0)
+    (property "Datasheet" "~" (id 3) (at 120.65 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 231.14 109.22 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 120.65 48.26 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bf4af8c8-0a5e-4ba0-887a-511c2eae3680))
     (pin "2" (uuid 1a866416-45dc-4ecb-bdab-95870aba0209))
   )
 
-  (symbol (lib_id "power:GND") (at 59.69 53.975 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 217.805 42.545 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 28e17218-ae99-4735-aea4-d858e8439921)
-    (property "Reference" "#PWR?" (id 0) (at 59.69 60.325 0)
+    (property "Reference" "#PWR?" (id 0) (at 217.805 48.895 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 59.69 57.785 0))
-    (property "Footprint" "" (id 2) (at 59.69 53.975 0)
+    (property "Value" "GND" (id 1) (at 217.805 46.355 0))
+    (property "Footprint" "" (id 2) (at 217.805 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 59.69 53.975 0)
+    (property "Datasheet" "" (id 3) (at 217.805 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2855c251-32c9-456f-8f08-9212ad05a3e6))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 62.865 53.34 270) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 220.98 41.91 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2a4b340f-5505-4159-a444-f6d10a3482f2)
-    (property "Reference" "C?" (id 0) (at 62.865 48.26 90))
-    (property "Value" "" (id 1) (at 62.865 50.165 90))
-    (property "Footprint" "" (id 2) (at 62.865 53.34 0)
+    (property "Reference" "C?" (id 0) (at 220.98 36.83 90))
+    (property "Value" "1uF" (id 1) (at 220.98 38.735 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 220.98 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 62.865 53.34 0)
+    (property "Datasheet" "~" (id 3) (at 220.98 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 62.865 53.34 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 220.98 41.91 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 561842b6-e964-48a6-8ff2-fcfda41a2e72))
     (pin "2" (uuid 5d0c1fb9-e02d-4c40-9f26-0e687bc22636))
   )
 
-  (symbol (lib_id "power:GND") (at 186.055 40.64 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 59.69 46.355 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2cbafcff-c320-4c3e-b041-ca7d11e9a340)
-    (property "Reference" "#PWR?" (id 0) (at 186.055 46.99 0)
+    (property "Reference" "#PWR?" (id 0) (at 59.69 52.705 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 186.055 44.45 0))
-    (property "Footprint" "" (id 2) (at 186.055 40.64 0)
+    (property "Value" "GND" (id 1) (at 59.69 50.165 0))
+    (property "Footprint" "" (id 2) (at 59.69 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 186.055 40.64 0)
+    (property "Datasheet" "" (id 3) (at 59.69 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5bd89815-96fd-49ac-8c7c-c2b82522682d))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x15") (at 93.345 154.94 0) (mirror x) (unit 1)
+  (symbol (lib_id "Connector_Generic:Conn_01x15") (at 107.315 158.75 0) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 38a74021-a761-42a5-8b3e-90af2c57637c)
-    (property "Reference" "J?" (id 0) (at 93.345 130.81 0))
-    (property "Value" "" (id 1) (at 93.345 133.35 0))
-    (property "Footprint" "" (id 2) (at 93.345 154.94 0)
+    (property "Reference" "J?" (id 0) (at 107.315 134.62 0))
+    (property "Value" "FACEPLATE" (id 1) (at 107.315 137.16 0))
+    (property "Footprint" "Connector_FFC-FPC:Molex_200528-0150_1x15-1MP_P1.00mm_Horizontal" (id 2) (at 107.315 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 93.345 154.94 0)
+    (property "Datasheet" "~" (id 3) (at 107.315 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 032b68f6-4bd2-4912-aca8-955951ae04e9))
@@ -2239,138 +2112,102 @@
     (pin "9" (uuid 64247cde-fc97-4bf8-8e8b-5fff02ee1f57))
   )
 
-  (symbol (lib_id "power:GND") (at 214.63 153.67 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 104.14 103.505 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3f72fb84-a749-4794-b68d-9c2c926aa134)
-    (property "Reference" "#PWR?" (id 0) (at 214.63 160.02 0)
+    (property "Reference" "#PWR?" (id 0) (at 104.14 109.855 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 214.63 157.48 0))
-    (property "Footprint" "" (id 2) (at 214.63 153.67 0)
+    (property "Value" "GND" (id 1) (at 104.14 107.315 0))
+    (property "Footprint" "" (id 2) (at 104.14 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 214.63 153.67 0)
+    (property "Datasheet" "" (id 3) (at 104.14 103.505 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eca55777-3586-496e-9c81-1a3625b9947f))
   )
 
-  (symbol (lib_id "power:GND") (at 225.425 109.22 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 114.935 48.26 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 48a31796-81b2-4e52-af27-c8488db17306)
-    (property "Reference" "#PWR?" (id 0) (at 225.425 115.57 0)
+    (property "Reference" "#PWR?" (id 0) (at 114.935 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 225.425 113.03 0))
-    (property "Footprint" "" (id 2) (at 225.425 109.22 0)
+    (property "Value" "GND" (id 1) (at 114.935 52.07 0))
+    (property "Footprint" "" (id 2) (at 114.935 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 225.425 109.22 0)
+    (property "Datasheet" "" (id 3) (at 114.935 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8d053ffa-6569-455e-9e10-6d29a89350c6))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 186.055 33.655 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 52e1e0da-5e1d-4f0d-9e3b-c1416cb1dc44)
-    (property "Reference" "#FLG?" (id 0) (at 186.055 31.75 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "PWR_FLAG" (id 1) (at 188.595 32.3849 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 186.055 33.655 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 186.055 33.655 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid c9f88faf-1e8d-45bb-bd26-74af0f10975e))
-  )
-
-  (symbol (lib_id "power:GND") (at 73.66 137.795 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 87.63 141.605 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5da9d51b-679b-40e1-95bc-45f8c1989889)
-    (property "Reference" "#PWR?" (id 0) (at 73.66 144.145 0)
+    (property "Reference" "#PWR?" (id 0) (at 87.63 147.955 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 73.66 141.605 0))
-    (property "Footprint" "" (id 2) (at 73.66 137.795 0)
+    (property "Value" "GND" (id 1) (at 87.63 145.415 0))
+    (property "Footprint" "" (id 2) (at 87.63 141.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 73.66 137.795 0)
+    (property "Datasheet" "" (id 3) (at 87.63 141.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f2938431-677f-4180-8a1b-b289cd2f0a08))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 192.405 137.795 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 81.915 87.63 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 5e021c81-21c3-42c4-b1e0-7cd858dbf272)
-    (property "Reference" "R413" (id 0) (at 192.405 139.7 90))
-    (property "Value" "" (id 1) (at 192.405 141.605 90))
-    (property "Footprint" "" (id 2) (at 192.405 137.795 0)
+    (property "Reference" "R413" (id 0) (at 81.915 89.535 90))
+    (property "Value" "100k" (id 1) (at 81.915 91.44 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 81.915 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 192.405 137.795 0)
+    (property "Datasheet" "~" (id 3) (at 81.915 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 192.405 137.795 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 81.915 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 831f9ed6-da2b-4b3b-9da8-3b83878268ca))
     (pin "2" (uuid 8a633b8b-bc0d-4707-8fb7-eeba283adc21))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 81.915 133.35 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 95.885 137.16 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6ddb8b76-5a57-40c9-a90c-f9412e95d93c)
-    (property "Reference" "C?" (id 0) (at 77.7875 132.3975 0))
-    (property "Value" "" (id 1) (at 77.7875 134.3025 0))
-    (property "Footprint" "" (id 2) (at 81.915 133.35 0)
+    (property "Reference" "C?" (id 0) (at 91.7575 136.2075 0))
+    (property "Value" "1uF" (id 1) (at 91.7575 138.1125 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 95.885 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 81.915 133.35 0)
+    (property "Datasheet" "~" (id 3) (at 95.885 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 81.915 133.35 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 95.885 137.16 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bd07eee0-4470-47f9-bc82-fe2789f6ff23))
     (pin "2" (uuid 9fd11bc1-7fda-4bbf-8850-58a55a54f181))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 233.045 74.93 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 6eef54bc-2e0a-419f-bc35-1ed87e11f343)
-    (property "Reference" "R403" (id 0) (at 233.045 76.835 90))
-    (property "Value" "" (id 1) (at 233.045 78.74 90))
-    (property "Footprint" "" (id 2) (at 233.045 74.93 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 233.045 74.93 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 233.045 74.93 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid a65ffe80-f295-4097-a93c-caa2faaaee91))
-    (pin "2" (uuid 62245895-4855-4d7c-9e51-5c65a1e86452))
-  )
-
-  (symbol (lib_id "Device:Q_PMOS_GSD") (at 198.755 142.875 270) (unit 1)
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 88.265 92.71 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 701f6a8b-177d-4144-9fb0-3f9fdcead618)
-    (property "Reference" "Q401" (id 0) (at 198.755 149.225 90))
-    (property "Value" "" (id 1) (at 198.755 151.765 90))
-    (property "Footprint" "" (id 2) (at 201.295 147.955 0)
+    (property "Reference" "Q401" (id 0) (at 88.265 99.06 90))
+    (property "Value" "PMV48XPA2R" (id 1) (at 88.265 101.6 90))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 90.805 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 198.755 142.875 0)
+    (property "Datasheet" "~" (id 3) (at 88.265 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PMV48XPA2R" (id 4) (at 198.755 142.875 90)
+    (property "PN" "PMV48XPA2R" (id 4) (at 88.265 92.71 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ca012b36-e774-41bb-91f5-5213a3527dd4))
@@ -2378,166 +2215,150 @@
     (pin "3" (uuid 0a3ea6c2-3dd6-4cb4-bf83-27e5a9c95ad1))
   )
 
-  (symbol (lib_id "power:GND") (at 276.225 64.77 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 72cf4984-3cb0-49a1-8498-2bc45dabd6dc)
-    (property "Reference" "#PWR?" (id 0) (at 276.225 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "" (id 1) (at 276.225 68.58 0))
-    (property "Footprint" "" (id 2) (at 276.225 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 276.225 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fd351bac-7abe-4eb5-bb58-515685918335))
-  )
-
-  (symbol (lib_id "power:+3V3") (at 85.725 127 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 99.695 130.81 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 76069edb-b58d-4ca9-ab6a-a9d28dc7f917)
-    (property "Reference" "#PWR?" (id 0) (at 85.725 130.81 0)
+    (property "Reference" "#PWR?" (id 0) (at 99.695 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 85.725 122.555 0))
-    (property "Footprint" "" (id 2) (at 85.725 127 0)
+    (property "Value" "+3V3" (id 1) (at 99.695 126.365 0))
+    (property "Footprint" "" (id 2) (at 99.695 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.725 127 0)
+    (property "Datasheet" "" (id 3) (at 99.695 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7a97ef3a-6585-449b-b8f1-6f5d0eab3b0d))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 171.45 26.67 270) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 76.2 29.845 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7a001c96-0ce3-4904-be2c-7a8e489ff42e)
-    (property "Reference" "R?" (id 0) (at 171.45 24.765 90))
-    (property "Value" "100k" (id 1) (at 171.45 28.575 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 171.45 26.67 0)
+    (property "Reference" "R?" (id 0) (at 79.375 28.575 0))
+    (property "Value" "100k" (id 1) (at 80.01 31.115 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 76.2 29.845 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 171.45 26.67 0)
+    (property "Datasheet" "~" (id 3) (at 76.2 29.845 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 171.45 26.67 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 76.2 29.845 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 63b4ac67-0c8e-48aa-97a6-b4c1e89d46e6))
     (pin "2" (uuid 3231f595-519a-4411-804a-c1a826fd69b3))
   )
 
-  (symbol (lib_id "power:+3V3") (at 166.37 24.765 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 67.31 24.765 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7b5edf78-5765-4e41-997f-c699fb76b37b)
-    (property "Reference" "#PWR?" (id 0) (at 166.37 28.575 0)
+    (property "Reference" "#PWR?" (id 0) (at 67.31 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 166.37 20.32 0))
-    (property "Footprint" "" (id 2) (at 166.37 24.765 0)
+    (property "Value" "+3V3" (id 1) (at 67.31 20.32 0))
+    (property "Footprint" "" (id 2) (at 67.31 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 166.37 24.765 0)
+    (property "Datasheet" "" (id 3) (at 67.31 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 947fecfe-a033-49d0-8b8c-baa277b3d114))
   )
 
-  (symbol (lib_id "power:+3V3") (at 184.785 145.415 90) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 74.295 95.25 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8198b488-6989-4cf8-84af-1490f36ba62b)
-    (property "Reference" "#PWR?" (id 0) (at 188.595 145.415 0)
+    (property "Reference" "#PWR?" (id 0) (at 78.105 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 183.515 142.875 90))
-    (property "Footprint" "" (id 2) (at 184.785 145.415 0)
+    (property "Value" "+3V3" (id 1) (at 73.025 92.71 90))
+    (property "Footprint" "" (id 2) (at 74.295 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 184.785 145.415 0)
+    (property "Datasheet" "" (id 3) (at 74.295 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5fd6cc7f-dfe4-4a3b-97dc-886cc05815fb))
   )
 
-  (symbol (lib_id "power:GND") (at 85.725 174.625 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 99.695 178.435 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 86e3f0b9-5cdd-41c4-9bc4-1c387ae569ff)
-    (property "Reference" "#PWR?" (id 0) (at 85.725 180.975 0)
+    (property "Reference" "#PWR?" (id 0) (at 99.695 184.785 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 85.725 178.435 0))
-    (property "Footprint" "" (id 2) (at 85.725 174.625 0)
+    (property "Value" "GND" (id 1) (at 99.695 182.245 0))
+    (property "Footprint" "" (id 2) (at 99.695 178.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.725 174.625 0)
+    (property "Datasheet" "" (id 3) (at 99.695 178.435 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f3a93427-a6a1-4304-ab4e-093755db69a2))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 36.195 69.85 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 196.215 57.15 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9147aad8-e172-446a-9523-00e0c38bc534)
-    (property "Reference" "R?" (id 0) (at 38.1 68.58 0)
+    (property "Reference" "R?" (id 0) (at 197.485 55.245 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 38.1 71.12 0)
+    (property "Value" "10k" (id 1) (at 198.12 59.055 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 36.195 69.85 0)
+    (property "Footprint" "" (id 2) (at 196.215 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 36.195 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 196.215 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 57c5dfc7-d4d7-453f-a736-b45b846eb860))
     (pin "2" (uuid 2ab70247-9d42-4d20-a9e6-e1735ed274dc))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 214.63 149.225 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 104.14 99.06 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 982d0f0a-f2fa-4d12-81ce-3ad1cbf66cef)
-    (property "Reference" "R412" (id 0) (at 210.82 148.59 0))
-    (property "Value" "" (id 1) (at 210.82 150.495 0))
-    (property "Footprint" "" (id 2) (at 214.63 149.225 0)
+    (property "Reference" "R412" (id 0) (at 100.33 98.425 0))
+    (property "Value" "100k" (id 1) (at 100.33 100.33 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 214.63 149.225 0)
+    (property "Datasheet" "~" (id 3) (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 214.63 149.225 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2249a50e-ab67-433a-8161-c15a18246781))
     (pin "2" (uuid de3d6bcb-47eb-4155-b001-bd5cf0cf06d5))
   )
 
-  (symbol (lib_id "power:GND") (at 66.04 111.76 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 224.155 100.33 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9864b0b9-b7c9-4ac8-8f42-0e917242fc18)
-    (property "Reference" "#PWR?" (id 0) (at 66.04 118.11 0)
+    (property "Reference" "#PWR?" (id 0) (at 224.155 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 66.04 115.57 0))
-    (property "Footprint" "" (id 2) (at 66.04 111.76 0)
+    (property "Value" "GND" (id 1) (at 224.155 104.14 0))
+    (property "Footprint" "" (id 2) (at 224.155 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 66.04 111.76 0)
+    (property "Datasheet" "" (id 3) (at 224.155 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7a8b9be7-f803-404d-b1b9-7d8f9d814fb0))
   )
 
-  (symbol (lib_id "Connector:SD_Card") (at 309.245 48.895 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "symbols:SD_Card") (at 68.58 65.405 180) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid 990d866c-3c44-44ee-9096-591b0b212546)
-    (property "Reference" "J?" (id 0) (at 309.245 30.48 0))
-    (property "Value" "" (id 1) (at 309.245 33.02 0))
-    (property "Footprint" "" (id 2) (at 309.245 48.895 0)
+    (property "Reference" "J?" (id 0) (at 53.34 79.375 0))
+    (property "Value" "SD_Card" (id 1) (at 84.455 79.375 0))
+    (property "Footprint" "" (id 2) (at 68.58 65.405 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf" (id 3) (at 309.245 48.895 0)
+    (property "Datasheet" "http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf" (id 3) (at 68.58 65.405 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 90fc2cdb-bc64-46b2-9485-c792c8a25493))
@@ -2555,18 +2376,18 @@
     (pin "9" (uuid c91c98c3-c914-42a7-8d40-7d318cb46fd7))
   )
 
-  (symbol (lib_id "Device:Q_PMOS_GSD") (at 176.53 33.02 270) (unit 1)
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 69.85 34.925 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a5d76e16-0235-40a2-b4f9-b7d86392f49e)
-    (property "Reference" "Q?" (id 0) (at 176.53 39.37 90))
-    (property "Value" "PMV48XPA2R" (id 1) (at 176.53 41.91 90))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 179.07 38.1 0)
+    (property "Reference" "Q?" (id 0) (at 57.785 34.29 0))
+    (property "Value" "PMV48XPA2R" (id 1) (at 57.785 36.83 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 64.77 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 176.53 33.02 0)
+    (property "Datasheet" "~" (id 3) (at 69.85 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PMV48XPA2R" (id 4) (at 176.53 33.02 90)
+    (property "PN" "PMV48XPA2R" (id 4) (at 69.85 34.925 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7614bd0d-beb3-4269-b283-8b760a980199))
@@ -2574,180 +2395,135 @@
     (pin "3" (uuid 24fde3ef-c349-45ba-aa46-b27ecbddcc11))
   )
 
-  (symbol (lib_id "Connector:Micro_SD_Card_Det_Hirose_DM3AT") (at 255.905 52.07 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid a81e2e97-4627-469a-84de-bceb04164c37)
-    (property "Reference" "J402" (id 0) (at 269.875 33.655 0))
-    (property "Value" "" (id 1) (at 267.335 38.1 0))
-    (property "Footprint" "" (id 2) (at 307.975 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://www.hirose.com/product/en/download_file/key_name/DM3/category/Catalog/doc_file_id/49662/?file_category_id=4&item_id=195&is_series=1" (id 3) (at 255.905 49.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "DM3AT-SF-PEJM5" (id 4) (at 255.905 52.07 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 809c1eb3-3391-480b-a68e-558a89ccfeb0))
-    (pin "10" (uuid 6eb9faa7-2fb0-47f0-8ebb-b8f0abd9c753))
-    (pin "11" (uuid f4af6f65-8475-4759-b90e-6313a2349758))
-    (pin "2" (uuid 92b2b167-70bf-4f16-bc73-d5f9b6bbeb87))
-    (pin "3" (uuid 57c0ff94-d0ea-41ee-a4e7-bfe5b0f51063))
-    (pin "4" (uuid b1672f51-13ff-42cf-8149-7f707c064919))
-    (pin "5" (uuid cdcb87a0-1a23-4010-ad4d-8a11c836180f))
-    (pin "6" (uuid e6e4ca86-df46-45df-acd4-980c56b812a9))
-    (pin "7" (uuid 8b5c0124-9689-4d6d-84e2-96e43cdc9925))
-    (pin "8" (uuid 6363e048-e5f5-425e-82c7-83d2bbfb6b03))
-    (pin "9" (uuid 6753fbae-8431-481f-927c-32930e124ff3))
-  )
-
-  (symbol (lib_id "power:+3V3") (at 235.585 105.41 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 125.095 44.45 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c091a8a9-022e-4af1-b544-ee40c839c6aa)
-    (property "Reference" "#PWR?" (id 0) (at 235.585 109.22 0)
+    (property "Reference" "#PWR?" (id 0) (at 125.095 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 235.585 101.6 0))
-    (property "Footprint" "" (id 2) (at 235.585 105.41 0)
+    (property "Value" "+3V3" (id 1) (at 125.095 40.64 0))
+    (property "Footprint" "" (id 2) (at 125.095 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 235.585 105.41 0)
+    (property "Datasheet" "" (id 3) (at 125.095 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 85f1e005-daf2-4291-9b81-0a578cf15e98))
   )
 
-  (symbol (lib_id "power:+3V3") (at 66.04 49.53 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 224.155 38.1 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c7eed6f1-6311-4b60-9c42-e6226aaad3d4)
-    (property "Reference" "#PWR?" (id 0) (at 66.04 53.34 0)
+    (property "Reference" "#PWR?" (id 0) (at 224.155 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 66.04 43.815 0))
-    (property "Footprint" "" (id 2) (at 66.04 49.53 0)
+    (property "Value" "+3V3" (id 1) (at 224.155 32.385 0))
+    (property "Footprint" "" (id 2) (at 224.155 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 66.04 49.53 0)
+    (property "Datasheet" "" (id 3) (at 224.155 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e85225cc-0d3f-4f7d-9942-11e747cc493b))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 73.66 133.35 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 87.63 137.16 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c97914d7-f29c-4420-9a71-072743c6c460)
-    (property "Reference" "C?" (id 0) (at 69.5325 132.3975 0))
-    (property "Value" "" (id 1) (at 69.5325 134.3025 0))
-    (property "Footprint" "" (id 2) (at 73.66 133.35 0)
+    (property "Reference" "C?" (id 0) (at 83.5025 136.2075 0))
+    (property "Value" "10uF" (id 1) (at 83.5025 138.1125 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 87.63 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 73.66 133.35 0)
+    (property "Datasheet" "~" (id 3) (at 87.63 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 73.66 133.35 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 87.63 137.16 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3ce79144-673b-4f75-b59d-6117d44e58a0))
     (pin "2" (uuid c2024ec0-f55b-41b3-92d4-f9be07fe5123))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 212.725 120.015 270) (mirror x) (unit 1)
+  (symbol (lib_id "power:GND") (at 67.31 81.915 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid dcc9cb2d-1dfb-4171-af6c-f287f06e1436)
-    (property "Reference" "R?" (id 0) (at 210.185 118.11 90))
-    (property "Value" "10k" (id 1) (at 215.265 118.11 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 212.725 120.015 0)
+    (uuid e250d895-b66a-4c05-8f7b-07fd6ddb3bcc)
+    (property "Reference" "#PWR?" (id 0) (at 67.31 88.265 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 212.725 120.015 0)
+    (property "Value" "GND" (id 1) (at 67.31 85.725 0))
+    (property "Footprint" "" (id 2) (at 67.31 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603JR-0710KL" (id 4) (at 212.725 120.015 0)
+    (property "Datasheet" "" (id 3) (at 67.31 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 6c7b878a-44dd-4d18-b074-6abd6227104a))
-    (pin "2" (uuid b5a5c00c-7407-4149-bf20-c74956d619f5))
+    (pin "1" (uuid cd48f460-c11f-4738-847c-ed89265dd748))
   )
 
-  (symbol (lib_id "power:+3V3") (at 36.195 66.675 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "power:+3V3") (at 192.405 57.15 0) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid e2ec6f77-eb19-4113-b71b-77b216968cc6)
-    (property "Reference" "#PWR?" (id 0) (at 36.195 70.485 0)
+    (property "Reference" "#PWR?" (id 0) (at 192.405 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 36.195 60.96 0))
-    (property "Footprint" "" (id 2) (at 36.195 66.675 0)
+    (property "Value" "+3V3" (id 1) (at 192.405 53.34 0))
+    (property "Footprint" "" (id 2) (at 192.405 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 36.195 66.675 0)
+    (property "Datasheet" "" (id 3) (at 192.405 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8d78550f-7957-428b-bb09-7feab8f6a5bb))
   )
 
-  (symbol (lib_id "power:GND") (at 235.585 155.575 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 125.095 94.615 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e56f8d21-b250-48f3-a0c9-22cba66c41fe)
-    (property "Reference" "#PWR?" (id 0) (at 235.585 161.925 0)
+    (property "Reference" "#PWR?" (id 0) (at 125.095 100.965 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 235.585 159.385 0))
-    (property "Footprint" "" (id 2) (at 235.585 155.575 0)
+    (property "Value" "GND" (id 1) (at 125.095 98.425 0))
+    (property "Footprint" "" (id 2) (at 125.095 94.615 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 235.585 155.575 0)
+    (property "Datasheet" "" (id 3) (at 125.095 94.615 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ecc25093-af2a-40f0-866f-3efb8c9c80e1))
   )
 
-  (symbol (lib_id "power:GND") (at 220.98 64.77 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e8def35b-8935-4968-a1bb-65f8c9906061)
-    (property "Reference" "#PWR?" (id 0) (at 220.98 71.12 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "" (id 1) (at 220.98 68.58 0))
-    (property "Footprint" "" (id 2) (at 220.98 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 220.98 64.77 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 27a8a6ba-d71d-4542-b4a9-2bd89b596892))
-  )
-
-  (symbol (lib_id "power:GND") (at 51.435 107.95 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 209.55 96.52 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ebfbe127-8ea0-4582-a54f-290c5df5ad11)
-    (property "Reference" "#PWR?" (id 0) (at 51.435 114.3 0)
+    (property "Reference" "#PWR?" (id 0) (at 209.55 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 51.435 111.76 0))
-    (property "Footprint" "" (id 2) (at 51.435 107.95 0)
+    (property "Value" "GND" (id 1) (at 209.55 100.33 0))
+    (property "Footprint" "" (id 2) (at 209.55 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 51.435 107.95 0)
+    (property "Datasheet" "" (id 3) (at 209.55 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 42da274b-c422-4956-898f-6ea7b5c13090))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 186.055 38.1 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 63.5 44.45 270) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid fcde54c0-8bdd-4524-941a-65c08f68f590)
-    (property "Reference" "C?" (id 0) (at 190.5 37.465 0))
-    (property "Value" "10uF" (id 1) (at 190.5 39.37 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 186.055 38.1 0)
+    (uuid ee566ee9-dbe4-45e3-aff5-49d3d41ecb18)
+    (property "Reference" "C?" (id 0) (at 63.5 47.625 90))
+    (property "Value" "10uF" (id 1) (at 63.5 41.275 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 63.5 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 186.055 38.1 0)
+    (property "Datasheet" "~" (id 3) (at 63.5 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 186.055 38.1 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 63.5 44.45 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 3a951db1-279f-45a9-b884-8073a3d7c771))
-    (pin "2" (uuid efe16534-2716-45de-9be3-8c49db26c1c5))
+    (pin "1" (uuid 6e71d231-1ac4-4c77-a448-61b77600b16a))
+    (pin "2" (uuid 7ea09e99-f356-4471-95a2-c2ad4b9aac0a))
   )
 )
diff --git a/mainboard/power.kicad_sch b/mainboard/power.kicad_sch
index 6d3e401..de971b5 100644
--- a/mainboard/power.kicad_sch
+++ b/mainboard/power.kicad_sch
@@ -1108,1022 +1108,868 @@
     )
   )
 
-  (junction (at 93.98 183.515) (diameter 0) (color 0 0 0 0)
+  (junction (at 226.695 54.61) (diameter 0) (color 0 0 0 0)
     (uuid 05c640b8-e60d-41ec-85cf-d57d02fb006e)
   )
-  (junction (at 215.265 144.145) (diameter 0) (color 0 0 0 0)
+  (junction (at 202.565 120.015) (diameter 0) (color 0 0 0 0)
     (uuid 06677bc3-5731-41e0-8ea1-074ae35e7ccd)
   )
-  (junction (at 77.47 183.515) (diameter 0) (color 0 0 0 0)
+  (junction (at 210.185 54.61) (diameter 0) (color 0 0 0 0)
     (uuid 189f38da-b775-4fce-b160-53749219d575)
   )
-  (junction (at 72.39 183.515) (diameter 0) (color 0 0 0 0)
+  (junction (at 163.83 100.965) (diameter 0) (color 0 0 0 0)
+    (uuid 1ac60a41-868b-416d-acf8-a410c3c6b15d)
+  )
+  (junction (at 55.88 78.74) (diameter 0) (color 0 0 0 0)
+    (uuid 1d722608-663e-4a1f-bb41-fdd543b567e5)
+  )
+  (junction (at 205.105 54.61) (diameter 0) (color 0 0 0 0)
     (uuid 1d8f2d94-3acd-4905-abb0-a6fb25b1f011)
   )
-  (junction (at 30.48 95.25) (diameter 0) (color 0 0 0 0)
+  (junction (at 19.05 130.175) (diameter 0) (color 0 0 0 0)
     (uuid 1f2c2de5-81b4-4d1f-8cc2-49529e0c151e)
   )
-  (junction (at 123.825 175.26) (diameter 0) (color 0 0 0 0)
+  (junction (at 256.54 46.355) (diameter 0) (color 0 0 0 0)
     (uuid 327ffd10-4931-4418-9ccd-4b23f9238531)
   )
-  (junction (at 89.535 33.655) (diameter 0) (color 0 0 0 0)
+  (junction (at 83.185 68.58) (diameter 0) (color 0 0 0 0)
     (uuid 33ccdf5c-f13b-444a-b94e-f18334facff3)
   )
-  (junction (at 236.22 73.66) (diameter 0) (color 0 0 0 0)
+  (junction (at 160.655 108.585) (diameter 0) (color 0 0 0 0)
     (uuid 40923f5b-752b-4e6e-b3fc-de5b06483a80)
   )
-  (junction (at 63.5 33.655) (diameter 0) (color 0 0 0 0)
-    (uuid 41193f70-ebff-4420-9f16-1b3f6295ae70)
-  )
-  (junction (at 93.98 173.99) (diameter 0) (color 0 0 0 0)
+  (junction (at 226.695 45.085) (diameter 0) (color 0 0 0 0)
     (uuid 54ff71ae-6cc7-4851-8c5e-c9a5c7c25b82)
   )
-  (junction (at 86.36 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 219.075 38.735) (diameter 0) (color 0 0 0 0)
     (uuid 57365469-dfd5-4c25-9aa9-33886a184d1f)
   )
-  (junction (at 57.785 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 190.5 38.735) (diameter 0) (color 0 0 0 0)
     (uuid 5a841b51-f99c-4b05-aa36-360bbf475142)
   )
-  (junction (at 103.505 173.99) (diameter 0) (color 0 0 0 0)
+  (junction (at 236.22 45.085) (diameter 0) (color 0 0 0 0)
     (uuid 5ec98c4d-8aa8-4596-900a-57aadfc9aecf)
   )
-  (junction (at 215.265 151.765) (diameter 0) (color 0 0 0 0)
-    (uuid 62eaef47-0312-477a-aa05-9df065818348)
+  (junction (at 175.895 121.285) (diameter 0) (color 0 0 0 0)
+    (uuid 772c96db-3c3e-4a5c-adf3-98b2d3545790)
   )
-  (junction (at 57.785 170.18) (diameter 0) (color 0 0 0 0)
+  (junction (at 190.5 41.275) (diameter 0) (color 0 0 0 0)
     (uuid 77dcdd54-3614-43a6-a359-880532d4b3ef)
   )
-  (junction (at 207.645 144.145) (diameter 0) (color 0 0 0 0)
-    (uuid 78c13850-cae3-4e50-b20e-2e4f5a6bf32a)
-  )
-  (junction (at 114.3 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 247.015 38.735) (diameter 0) (color 0 0 0 0)
     (uuid 7a453463-c6f1-492c-91b5-223b65b9477c)
   )
-  (junction (at 184.15 78.74) (diameter 0) (color 0 0 0 0)
-    (uuid 804e273b-4531-4cc8-a168-0b1a926d25de)
-  )
-  (junction (at 43.18 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 175.895 38.735) (diameter 0) (color 0 0 0 0)
     (uuid 81c82220-3a7d-473d-b208-4d0c114f5627)
   )
-  (junction (at 53.34 71.755) (diameter 0) (color 0 0 0 0)
+  (junction (at 41.91 106.68) (diameter 0) (color 0 0 0 0)
     (uuid 88c459e2-d8f0-47b6-86d5-542b5ebb7760)
   )
-  (junction (at 38.1 95.25) (diameter 0) (color 0 0 0 0)
+  (junction (at 26.67 130.175) (diameter 0) (color 0 0 0 0)
     (uuid 8adb71e8-f20c-4d25-bb65-5f46606d916e)
   )
-  (junction (at 38.1 102.87) (diameter 0) (color 0 0 0 0)
+  (junction (at 26.67 137.795) (diameter 0) (color 0 0 0 0)
     (uuid 8cf65d16-d7c4-42ea-a372-a0e12f27c6f5)
   )
-  (junction (at 123.825 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 256.54 38.735) (diameter 0) (color 0 0 0 0)
     (uuid 91360754-d6e5-4d78-a428-28d26e0dcd61)
   )
-  (junction (at 248.285 73.66) (diameter 0) (color 0 0 0 0)
-    (uuid 93d0c2ee-4b51-4c79-880d-f549f9b24029)
-  )
-  (junction (at 63.5 50.165) (diameter 0) (color 0 0 0 0)
-    (uuid 953f4609-070b-4fdf-b410-6460abd54639)
-  )
-  (junction (at 216.535 40.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 140.97 75.565) (diameter 0) (color 0 0 0 0)
     (uuid 95f27bd5-eaa1-4778-8ca3-274ad92f03f8)
   )
-  (junction (at 55.245 52.705) (diameter 0) (color 0 0 0 0)
+  (junction (at 43.815 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 9646b1b1-0b8a-4658-9656-ba0c04d7ab25)
   )
-  (junction (at 74.93 183.515) (diameter 0) (color 0 0 0 0)
+  (junction (at 165.735 108.585) (diameter 0) (color 0 0 0 0)
+    (uuid a8da8a54-210f-4a8d-8fc6-09083e3a3fae)
+  )
+  (junction (at 207.645 54.61) (diameter 0) (color 0 0 0 0)
     (uuid aafa366f-e656-4beb-bd85-800325d54139)
   )
-  (junction (at 216.535 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 140.97 92.075) (diameter 0) (color 0 0 0 0)
     (uuid ab4bec37-d9af-42c8-bff5-b8f59a3dfa86)
   )
-  (junction (at 53.34 74.295) (diameter 0) (color 0 0 0 0)
+  (junction (at 202.565 108.585) (diameter 0) (color 0 0 0 0)
+    (uuid ad7e957a-6036-4251-bf59-a78f2f3c8112)
+  )
+  (junction (at 41.91 109.22) (diameter 0) (color 0 0 0 0)
     (uuid bf1275f4-4866-45be-93e9-570d90a5503a)
   )
-  (junction (at 195.58 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 120.015 92.075) (diameter 0) (color 0 0 0 0)
     (uuid c083f479-6e98-4287-b62f-72940370a5fa)
   )
-  (junction (at 85.09 70.485) (diameter 0) (color 0 0 0 0)
+  (junction (at 78.74 105.41) (diameter 0) (color 0 0 0 0)
     (uuid c24de6af-c44d-4d58-879d-be9d9afc1ca6)
   )
-  (junction (at 103.505 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 236.22 38.735) (diameter 0) (color 0 0 0 0)
     (uuid c3fb0b48-c906-4300-aadb-b4a475dd6ad1)
   )
-  (junction (at 64.135 71.755) (diameter 0) (color 0 0 0 0)
+  (junction (at 52.705 106.68) (diameter 0) (color 0 0 0 0)
     (uuid c4e3836f-dca2-489b-a7cb-3aea09a7c34d)
   )
-  (junction (at 244.475 86.36) (diameter 0) (color 0 0 0 0)
-    (uuid c905e2ba-f649-4673-8c0f-6fa44d06421e)
+  (junction (at 55.88 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid d91e6c8d-cb47-4ca5-9724-66733d9bd2d3)
   )
-  (junction (at 252.73 66.04) (diameter 0) (color 0 0 0 0)
-    (uuid dc2142a2-13df-4c30-b506-2f4e5445a159)
-  )
-  (junction (at 59.055 74.295) (diameter 0) (color 0 0 0 0)
+  (junction (at 47.625 109.22) (diameter 0) (color 0 0 0 0)
     (uuid dda93dca-2359-448c-b5e6-6f49be2ec66a)
   )
-  (junction (at 252.73 80.01) (diameter 0) (color 0 0 0 0)
-    (uuid e1aded2f-111f-44c9-8165-7175e0e91461)
-  )
-  (junction (at 93.98 167.64) (diameter 0) (color 0 0 0 0)
+  (junction (at 226.695 38.735) (diameter 0) (color 0 0 0 0)
     (uuid e6a5d226-4786-4e12-a948-4f18745a2440)
   )
-  (junction (at 170.18 106.045) (diameter 0) (color 0 0 0 0)
+  (junction (at 94.615 129.54) (diameter 0) (color 0 0 0 0)
     (uuid f5b98cdd-8273-4ba9-8bff-01c298bda2bf)
   )
 
-  (no_connect (at 95.25 52.705) (uuid 21f613c0-80d6-43b4-a945-972aaa9eb42b))
-  (no_connect (at 95.25 55.245) (uuid 365966ff-e94e-4913-8e2d-c9f269956748))
-  (no_connect (at 53.34 84.455) (uuid 53873526-ea4f-4f8d-bc57-38976efa10b5))
-  (no_connect (at 53.34 86.995) (uuid 759c5fed-43da-40a5-9f29-b5ec4343217f))
+  (no_connect (at 88.9 87.63) (uuid 21f613c0-80d6-43b4-a945-972aaa9eb42b))
+  (no_connect (at 88.9 90.17) (uuid 365966ff-e94e-4913-8e2d-c9f269956748))
+  (no_connect (at 41.91 119.38) (uuid 53873526-ea4f-4f8d-bc57-38976efa10b5))
+  (no_connect (at 41.91 121.92) (uuid 759c5fed-43da-40a5-9f29-b5ec4343217f))
 
-  (wire (pts (xy 30.48 95.25) (xy 30.48 102.87))
+  (bus_entry (at 64.77 106.68) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 190b5d17-ebe1-4bcc-b006-2dc97f12da69)
+  )
+  (bus_entry (at 64.77 109.22) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b917b44a-589d-4110-9418-9439ba1f2843)
+  )
+
+  (wire (pts (xy 19.05 130.175) (xy 19.05 137.795))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 00945981-9fee-4fb6-8db5-6ccf4b30f4de)
   )
-  (polyline (pts (xy 283.845 13.335) (xy 146.685 13.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 02a5a714-879d-47a4-9167-c3ffa8beb103)
-  )
-
-  (wire (pts (xy 63.5 50.165) (xy 63.5 33.655))
+  (wire (pts (xy 55.88 85.09) (xy 55.88 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 034565a2-b313-41d6-9223-0ac0f0dd2d97)
   )
-  (wire (pts (xy 114.3 168.91) (xy 114.3 167.64))
+  (wire (pts (xy 247.015 40.005) (xy 247.015 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0390d7d6-5f99-4baf-9168-1a895dd8a591)
   )
-  (wire (pts (xy 103.505 180.975) (xy 103.505 183.515))
+  (wire (pts (xy 236.22 52.07) (xy 236.22 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0557d24d-8866-41a7-b2ae-f535ee2a3fad)
   )
-  (wire (pts (xy 207.645 145.415) (xy 207.645 144.145))
+  (wire (pts (xy 109.855 131.445) (xy 112.395 131.445))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 060db995-56ca-4529-ac6e-764c2a3ea30c)
+    (uuid 05aafbab-82af-42e1-8326-1e088d978e31)
   )
-  (wire (pts (xy 252.73 67.31) (xy 252.73 66.04))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 06ccf3ee-d418-4cb4-ad32-3f18978605f9)
-  )
-  (wire (pts (xy 55.245 33.655) (xy 55.245 52.705))
+  (wire (pts (xy 43.815 68.58) (xy 43.815 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 078c7170-d69c-42b9-932d-22325a50b29a)
   )
-  (wire (pts (xy 188.595 57.15) (xy 186.055 57.15))
+  (wire (pts (xy 113.03 92.075) (xy 110.49 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0997f373-c2ed-4e2b-a4e1-d8dfede728f4)
   )
-  (wire (pts (xy 114.3 167.64) (xy 123.825 167.64))
+  (wire (pts (xy 247.015 38.735) (xy 256.54 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09aae3c3-4445-40a7-8164-8599798166f4)
   )
-  (wire (pts (xy 216.535 40.64) (xy 216.535 57.15))
+  (wire (pts (xy 140.97 75.565) (xy 140.97 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0a403292-edab-4367-9e5c-4318f41caf68)
   )
-  (wire (pts (xy 61.595 87.63) (xy 61.595 86.995))
+  (wire (pts (xy 175.895 114.935) (xy 175.895 114.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0af8a622-020c-43a2-9a68-325985c30857)
+  )
+  (wire (pts (xy 50.165 122.555) (xy 50.165 121.92))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0af8d277-d216-421a-a245-3c03397f896e)
   )
-  (wire (pts (xy 234.315 86.36) (xy 244.475 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0d7c4bf9-9ef1-45a1-88ea-5c52e6773bd1)
-  )
-  (polyline (pts (xy 13.335 152.4) (xy 13.335 196.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 10183452-75d7-4196-aa96-716179ceda9d)
-  )
-
-  (wire (pts (xy 123.825 173.99) (xy 123.825 175.26))
+  (wire (pts (xy 256.54 45.085) (xy 256.54 46.355))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1175b482-426a-4374-974b-c708b995ccab)
   )
-  (wire (pts (xy 234.315 91.44) (xy 247.015 91.44))
+  (wire (pts (xy 158.75 126.365) (xy 181.61 126.365))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 13bd5a88-c167-4556-86c0-14ad36d78872)
   )
-  (wire (pts (xy 43.18 167.64) (xy 57.785 167.64))
+  (wire (pts (xy 175.895 38.735) (xy 190.5 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15085915-484b-4e67-85aa-dfab184e72c9)
   )
-  (wire (pts (xy 244.475 86.36) (xy 261.62 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 150f28e7-919d-4d5a-8754-493aab6c0e3d)
-  )
-  (wire (pts (xy 202.565 57.15) (xy 216.535 57.15))
+  (wire (pts (xy 127 92.075) (xy 140.97 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 15580efa-a495-489c-8fef-5007c2095e59)
   )
-  (polyline (pts (xy 150.495 152.4) (xy 150.495 196.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 160a0a9e-fcee-423e-8659-b21ff32afe54)
-  )
-
-  (wire (pts (xy 74.93 183.515) (xy 77.47 183.515))
+  (wire (pts (xy 207.645 54.61) (xy 210.185 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 16b06071-f565-434a-ab4f-db60bd883459)
   )
-  (wire (pts (xy 202.565 144.145) (xy 207.645 144.145))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 18024f75-f01a-4136-8a82-d95c7952f83a)
-  )
-  (wire (pts (xy 215.265 135.89) (xy 215.265 137.795))
+  (wire (pts (xy 202.565 108.585) (xy 202.565 113.665))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1854027b-c955-479a-b47f-fdd6414e3e7b)
   )
-  (wire (pts (xy 195.58 66.04) (xy 195.58 57.15))
+  (wire (pts (xy 120.015 100.965) (xy 120.015 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a621fc6-1b3b-4b2b-bdda-a74b4b087890)
   )
-  (wire (pts (xy 93.98 183.515) (xy 77.47 183.515))
+  (wire (pts (xy 226.695 54.61) (xy 210.185 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d0ab65b-62e5-4fa2-9e45-bdbd0fd6ac52)
   )
-  (wire (pts (xy 38.1 94.615) (xy 38.1 95.25))
+  (wire (pts (xy 163.83 100.965) (xy 167.005 100.965))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1e1f2bb5-eaed-4671-b0be-23d11c361bc1)
+  )
+  (wire (pts (xy 26.67 129.54) (xy 26.67 130.175))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1fe538db-add0-4e5b-b011-8ca816df8815)
   )
-  (wire (pts (xy 170.18 106.045) (xy 170.18 107.95))
+  (wire (pts (xy 94.615 129.54) (xy 94.615 131.445))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 22738421-4aae-4b09-abd6-fffbb129f01a)
   )
-  (wire (pts (xy 63.5 33.655) (xy 76.2 33.655))
+  (wire (pts (xy 109.22 68.58) (xy 140.97 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 2530a4bd-bbcd-4fb5-81df-8b89e0732306)
+    (uuid 231960ba-4d09-437e-ae22-65388ea24d96)
   )
-  (wire (pts (xy 184.15 96.52) (xy 184.15 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 26d60c7b-e368-41af-bf10-cf48bed43f50)
-  )
-  (wire (pts (xy 198.755 66.04) (xy 195.58 66.04))
+  (wire (pts (xy 123.19 100.965) (xy 120.015 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 288b1053-0a7d-47fc-a853-783357f52d24)
   )
-  (wire (pts (xy 59.69 172.72) (xy 57.785 172.72))
+  (wire (pts (xy 192.405 43.815) (xy 190.5 43.815))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e7f8f6e-0a8e-4eaa-8f3c-06a17daa6588)
   )
-  (wire (pts (xy 53.34 64.135) (xy 71.12 64.135))
+  (wire (pts (xy 55.245 78.74) (xy 55.88 78.74))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2fc15792-d294-4aab-be65-073d6f3c5c8d)
+  )
+  (wire (pts (xy 41.91 99.06) (xy 64.77 99.06))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2fc978cc-463b-4b7e-be1a-1e4cf15b8b9a)
   )
-  (wire (pts (xy 170.18 102.87) (xy 170.18 106.045))
+  (bus (pts (xy 67.31 111.76) (xy 67.31 114.935))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 387e799f-7c4a-4a10-9620-0723d8fd7eec)
+  )
+
+  (wire (pts (xy 94.615 126.365) (xy 94.615 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 389befb4-d796-41a6-bf87-4f36481d53e5)
   )
-  (wire (pts (xy 57.785 167.64) (xy 59.69 167.64))
+  (wire (pts (xy 190.5 38.735) (xy 192.405 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3ad5aadc-c93e-483d-a2ac-d75ff64c6b7b)
   )
-  (wire (pts (xy 254 142.875) (xy 254.635 142.875))
+  (wire (pts (xy 197.485 92.075) (xy 197.485 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3fed74db-a4a6-43eb-8d14-b11840b65a4d)
   )
-  (wire (pts (xy 234.315 93.98) (xy 247.015 93.98))
+  (wire (pts (xy 158.75 128.905) (xy 181.61 128.905))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4046cf5e-598e-4fec-82aa-46bd0c9c365a)
   )
-  (wire (pts (xy 254.635 145.415) (xy 246.38 145.415))
+  (wire (pts (xy 200.025 91.44) (xy 200.025 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 41ba67b6-3027-4771-9a3a-a215623a9f47)
   )
-  (wire (pts (xy 93.98 167.64) (xy 103.505 167.64))
+  (wire (pts (xy 226.695 38.735) (xy 236.22 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4434a62a-985c-44e4-af9f-20bbb4c11577)
   )
-  (wire (pts (xy 236.22 73.66) (xy 248.285 73.66))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 45fa20a0-8985-457e-b023-592f322e7219)
-  )
-  (wire (pts (xy 81.28 41.275) (xy 81.28 42.545))
+  (wire (pts (xy 74.93 76.2) (xy 74.93 77.47))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4692c9c1-6ade-42d9-a307-f6e89cad4bc3)
   )
-  (wire (pts (xy 43.18 167.64) (xy 43.18 168.275))
+  (wire (pts (xy 175.895 38.735) (xy 175.895 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 479ff0c9-e9de-44f1-b682-32d922dc555d)
   )
-  (wire (pts (xy 38.1 95.25) (xy 38.1 102.87))
+  (wire (pts (xy 26.67 130.175) (xy 26.67 137.795))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4bf0e47e-dba6-4aea-a38f-4754166ae934)
   )
-  (wire (pts (xy 95.25 50.165) (xy 98.425 50.165))
+  (wire (pts (xy 88.9 85.09) (xy 92.075 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4c3451ff-4a27-40d8-95af-af1c744a893c)
   )
-  (wire (pts (xy 198.755 96.52) (xy 189.865 96.52))
+  (wire (pts (xy 123.19 131.445) (xy 117.475 131.445))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4c733966-20f2-4fb8-8d95-d1acf432405d)
   )
-  (wire (pts (xy 165.1 33.655) (xy 216.535 33.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4e05298a-93ce-4d02-a50c-21ac753d4c6f)
-  )
-  (wire (pts (xy 103.505 172.72) (xy 103.505 173.99))
+  (wire (pts (xy 236.22 43.815) (xy 236.22 45.085))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4ead2ccb-982d-4f6f-9186-c5c7bfefec14)
   )
-  (wire (pts (xy 64.135 71.755) (xy 67.945 71.755))
+  (wire (pts (xy 52.705 106.68) (xy 64.77 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 50272138-b491-4666-aee8-9a6729472b28)
   )
-  (wire (pts (xy 215.265 152.4) (xy 215.265 151.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5145d065-a30f-4d98-8499-5d59baa496cd)
-  )
-  (wire (pts (xy 195.58 91.44) (xy 198.755 91.44))
+  (wire (pts (xy 120.65 126.365) (xy 123.19 126.365))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5230b7ac-7da2-4263-832b-7d210cd5e303)
   )
-  (wire (pts (xy 59.055 74.295) (xy 59.055 76.835))
+  (wire (pts (xy 47.625 109.22) (xy 47.625 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 54b1f613-a30e-4c28-b341-eadc95272602)
   )
-  (wire (pts (xy 215.265 151.765) (xy 215.265 150.495))
+  (wire (pts (xy 49.53 78.74) (xy 49.53 80.645))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 57c41534-a11c-4c73-ab44-0709effaaaab)
+  )
+  (wire (pts (xy 202.565 126.365) (xy 202.565 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5986bcbe-6ea3-403f-ae06-d42008655821)
   )
-  (wire (pts (xy 123.825 167.64) (xy 123.825 168.91))
+  (wire (pts (xy 256.54 38.735) (xy 256.54 40.005))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 59c25194-c8c6-4dcf-955d-f8bcfc87cc5f)
   )
-  (polyline (pts (xy 146.685 116.84) (xy 283.845 116.84))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5be13dff-8b15-42c6-9398-5c08de6aee8d)
-  )
-
-  (wire (pts (xy 93.98 168.275) (xy 93.98 167.64))
+  (wire (pts (xy 226.695 39.37) (xy 226.695 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5c46a6b0-0c45-4a3c-a200-01d08d0a02df)
   )
-  (wire (pts (xy 216.535 104.775) (xy 216.535 104.14))
+  (wire (pts (xy 140.97 139.7) (xy 140.97 139.065))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5d253967-5ebf-431d-ad7d-545f22417964)
   )
-  (wire (pts (xy 248.285 73.66) (xy 248.285 74.93))
+  (wire (pts (xy 165.735 108.585) (xy 165.735 109.855))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5d295c19-6913-481d-9415-030297e36d6a)
   )
-  (wire (pts (xy 81.28 70.485) (xy 85.09 70.485))
+  (wire (pts (xy 74.93 105.41) (xy 78.74 105.41))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5d99b25d-5277-4472-b3c2-25daeb1e1dda)
   )
-  (polyline (pts (xy 283.845 165.1) (xy 283.845 121.285))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 5df51d3f-3a3e-444f-ba34-ce73b33b5ee0)
-  )
-
-  (wire (pts (xy 53.34 71.755) (xy 64.135 71.755))
+  (wire (pts (xy 41.91 106.68) (xy 52.705 106.68))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5e1c8ae4-b1d3-4143-8121-8803897a3d60)
   )
-  (wire (pts (xy 182.245 78.74) (xy 184.15 78.74))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 609bded9-934a-4eca-b6fc-9f3aa9dabc58)
-  )
-  (polyline (pts (xy 177.8 165.1) (xy 283.845 165.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 61e00914-69e7-4516-a53d-391d9f3b9238)
-  )
-
-  (wire (pts (xy 103.505 173.99) (xy 93.98 173.99))
+  (wire (pts (xy 236.22 45.085) (xy 226.695 45.085))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 621ae99d-f5e3-4888-a0d6-9b6403863872)
   )
-  (polyline (pts (xy 146.685 13.335) (xy 146.685 116.84))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 628d17ed-c00f-4b79-a504-4ef859a4cf7b)
-  )
-
-  (wire (pts (xy 69.85 183.515) (xy 72.39 183.515))
+  (wire (pts (xy 202.565 54.61) (xy 205.105 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 628e0a7f-ccc9-43f1-a0b3-9511b412d9a3)
   )
-  (wire (pts (xy 198.12 86.36) (xy 198.755 86.36))
+  (wire (pts (xy 122.555 121.285) (xy 123.19 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 666b379e-e403-4675-a8e1-becc5bc6ed71)
   )
-  (wire (pts (xy 74.93 182.88) (xy 74.93 183.515))
+  (wire (pts (xy 207.645 53.975) (xy 207.645 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a0654de-5164-4ce7-8100-2713becb72f4)
   )
-  (wire (pts (xy 53.34 74.295) (xy 59.055 74.295))
+  (wire (pts (xy 41.91 109.22) (xy 47.625 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6bddf8fd-6dd6-4689-9263-404b4203fde2)
   )
-  (wire (pts (xy 77.47 183.515) (xy 77.47 184.15))
+  (wire (pts (xy 123.19 116.205) (xy 94.615 116.205))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6e80230e-58e6-4864-b75f-8a98b9ccb08f)
+  )
+  (wire (pts (xy 210.185 54.61) (xy 210.185 55.245))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 70777442-1638-4267-8eaf-d059295247bd)
   )
-  (wire (pts (xy 55.245 33.655) (xy 63.5 33.655))
+  (wire (pts (xy 55.88 68.58) (xy 69.85 68.58))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 736e07b7-521f-4eb0-a9eb-db3fb5fb836d)
+  )
+  (wire (pts (xy 43.815 68.58) (xy 55.88 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 76e00c74-8aaf-4cdf-bafa-78e7801b18f0)
   )
-  (wire (pts (xy 57.785 170.18) (xy 57.785 172.72))
+  (wire (pts (xy 190.5 41.275) (xy 190.5 43.815))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 777b7b5e-a3a7-4137-9e0e-50e6da6831c7)
   )
-  (wire (pts (xy 252.73 81.28) (xy 252.73 80.01))
+  (wire (pts (xy 165.735 115.57) (xy 165.735 114.935))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b5b9385-8a06-4a42-a2b0-688e32246388)
   )
-  (wire (pts (xy 186.055 57.15) (xy 186.055 59.055))
+  (wire (pts (xy 110.49 92.075) (xy 110.49 93.98))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7ea869ee-c102-49c9-ac47-6e86e9375632)
   )
-  (wire (pts (xy 93.98 180.975) (xy 93.98 183.515))
+  (wire (pts (xy 226.695 52.07) (xy 226.695 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 817dd2c4-5af3-4b79-b35a-17ba8bd838a4)
   )
-  (wire (pts (xy 123.825 167.64) (xy 139.7 167.64))
+  (wire (pts (xy 256.54 38.735) (xy 272.415 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 82582c27-08cf-4039-b98f-51c525259c93)
   )
-  (wire (pts (xy 86.36 167.64) (xy 85.09 167.64))
+  (wire (pts (xy 219.075 38.735) (xy 217.805 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 84ea104a-f947-47e9-8bf6-14734bfdde4e)
   )
-  (wire (pts (xy 212.09 42.545) (xy 212.09 40.64))
+  (wire (pts (xy 136.525 77.47) (xy 136.525 75.565))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 875f359f-65e0-41e2-a159-09f15bada60c)
   )
-  (wire (pts (xy 30.48 102.87) (xy 31.75 102.87))
+  (wire (pts (xy 19.05 137.795) (xy 20.32 137.795))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8bb8b66e-f25c-4902-9dcc-f908278b3f08)
   )
-  (wire (pts (xy 86.36 170.18) (xy 86.36 167.64))
+  (wire (pts (xy 219.075 41.275) (xy 219.075 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8ca8c41a-51b1-4d8e-8ff2-3f313417f4aa)
   )
-  (wire (pts (xy 53.34 61.595) (xy 71.12 61.595))
+  (wire (pts (xy 41.91 96.52) (xy 64.77 96.52))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8caed487-c88e-4435-8d8c-fe93d4901047)
   )
-  (wire (pts (xy 236.22 78.74) (xy 236.22 73.66))
+  (wire (pts (xy 160.655 113.665) (xy 160.655 108.585))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8d4b39a4-b45a-4462-ad6d-9a67f3718e20)
   )
-  (wire (pts (xy 244.475 86.36) (xy 244.475 88.9))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 8d8275d0-efbe-40db-a0ce-42965cebb57c)
-  )
-  (wire (pts (xy 53.34 56.515) (xy 55.245 56.515))
+  (wire (pts (xy 41.91 91.44) (xy 43.815 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e3d4d52-7ed4-4115-a212-503a66cba8cd)
   )
-  (wire (pts (xy 59.055 74.295) (xy 67.945 74.295))
+  (wire (pts (xy 47.625 109.22) (xy 64.77 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8fcb2a57-18b0-4a96-b167-bbc96e6da479)
   )
-  (polyline (pts (xy 150.495 196.85) (xy 13.335 196.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9004cffd-e192-4364-8433-5e14ab18eb1c)
-  )
-
-  (wire (pts (xy 170.18 94.615) (xy 170.18 97.79))
+  (wire (pts (xy 94.615 116.205) (xy 94.615 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 90593372-f77c-42d3-aea8-0fe2006246e8)
   )
-  (wire (pts (xy 246.38 145.415) (xy 246.38 149.225))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 905ecfde-0cb5-4333-a140-1477d5936a88)
-  )
-  (wire (pts (xy 114.3 175.26) (xy 114.3 173.99))
+  (wire (pts (xy 247.015 46.355) (xy 247.015 45.085))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 906344b9-ba41-4a6c-9b05-13f61b60e14a)
   )
-  (wire (pts (xy 189.865 78.74) (xy 198.755 78.74))
+  (wire (pts (xy 117.475 113.665) (xy 123.19 113.665))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 91000c8a-1cc6-4d85-a8ac-969bbc5b4045)
   )
-  (wire (pts (xy 55.245 52.705) (xy 55.245 56.515))
+  (wire (pts (xy 43.815 87.63) (xy 43.815 91.44))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 930418ff-727a-4635-b843-3c4e069b9872)
   )
-  (wire (pts (xy 53.34 71.755) (xy 53.34 69.215))
+  (wire (pts (xy 41.91 106.68) (xy 41.91 104.14))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 943d95c1-b1e5-4886-a9ee-fdbef7b0777f)
   )
-  (wire (pts (xy 114.3 175.26) (xy 123.825 175.26))
+  (wire (pts (xy 247.015 46.355) (xy 256.54 46.355))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 944c21c9-49e9-49e5-a744-380441cdf571)
   )
-  (wire (pts (xy 86.36 33.655) (xy 89.535 33.655))
+  (wire (pts (xy 80.01 68.58) (xy 83.185 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 950d54bc-a91a-4a2b-a887-2275bf1d6a3e)
   )
-  (wire (pts (xy 252.73 72.39) (xy 252.73 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 965ee038-ed7c-4f80-9ef5-a5dc2b515eaa)
-  )
-  (polyline (pts (xy 177.8 121.285) (xy 177.8 165.1))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 96df572d-536a-4d67-8894-f22cb0c58fda)
-  )
-
-  (wire (pts (xy 207.645 151.765) (xy 215.265 151.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 98e38c5e-a15f-4007-bbd6-2dd30142e134)
-  )
-  (wire (pts (xy 87.63 167.64) (xy 86.36 167.64))
+  (wire (pts (xy 220.345 38.735) (xy 219.075 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 991ce149-1c55-42e3-861f-15348e494f70)
   )
-  (wire (pts (xy 98.425 50.165) (xy 98.425 46.99))
+  (wire (pts (xy 175.895 121.285) (xy 175.895 120.015))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9b6bdde5-b43d-4889-b076-e21d3579d55a)
+  )
+  (wire (pts (xy 92.075 85.09) (xy 92.075 81.915))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9b84fb8e-f9ba-42f9-819b-de6d1579c86e)
   )
-  (wire (pts (xy 216.535 57.15) (xy 216.535 58.42))
+  (wire (pts (xy 140.97 92.075) (xy 140.97 93.345))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a04c3a54-d22e-412a-a330-5670246172a0)
   )
-  (wire (pts (xy 244.475 88.9) (xy 247.015 88.9))
+  (wire (pts (xy 55.88 68.58) (xy 55.88 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a187cf97-20b5-4592-a78d-c38737a80a3a)
+    (uuid a0919bcc-111d-4a6c-9567-3bfc594f1555)
   )
-  (wire (pts (xy 72.39 183.515) (xy 74.93 183.515))
+  (wire (pts (xy 205.105 54.61) (xy 207.645 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a251c78d-aaec-4a58-8fb2-bd3ca1be9fcc)
   )
-  (wire (pts (xy 215.265 144.145) (xy 215.265 142.875))
+  (wire (pts (xy 202.565 120.015) (xy 202.565 118.745))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a348e94d-6c22-46cd-87e7-f127149e0ed2)
   )
-  (wire (pts (xy 139.7 165.1) (xy 139.7 167.64))
+  (wire (pts (xy 272.415 36.195) (xy 272.415 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a740eb20-3afa-4ada-b39c-7bb970adc1a7)
   )
-  (wire (pts (xy 59.69 170.18) (xy 57.785 170.18))
+  (wire (pts (xy 192.405 41.275) (xy 190.5 41.275))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a7db985a-9ee0-466d-b210-fb2a1f7f6faa)
   )
-  (wire (pts (xy 234.315 78.74) (xy 236.22 78.74))
+  (wire (pts (xy 158.75 113.665) (xy 160.655 113.665))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa77c03f-6765-4e7c-be98-2c0d7a321ffa)
   )
-  (wire (pts (xy 166.37 102.87) (xy 166.37 106.045))
+  (wire (pts (xy 90.17 126.365) (xy 90.17 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ace5c2f1-5408-42be-a7e6-b97a54927e06)
   )
-  (wire (pts (xy 30.48 94.615) (xy 30.48 95.25))
+  (wire (pts (xy 163.83 38.735) (xy 163.83 100.965))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ad07a498-3584-4e73-916a-c76f2853fab8)
+  )
+  (wire (pts (xy 165.735 108.585) (xy 202.565 108.585))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid adf11708-423b-4720-9cca-e1c229b4c656)
+  )
+  (wire (pts (xy 19.05 129.54) (xy 19.05 130.175))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ae123b19-4acb-4a58-aa1e-05a27f1306c7)
   )
-  (wire (pts (xy 212.09 40.64) (xy 216.535 40.64))
+  (wire (pts (xy 202.565 120.015) (xy 208.915 120.015))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b0794383-1d08-4c92-ba4c-d0d868a44613)
+  )
+  (wire (pts (xy 123.19 111.125) (xy 90.17 111.125))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b07a2ed2-6e75-4d6d-a061-31be8c2f54ed)
+  )
+  (wire (pts (xy 136.525 75.565) (xy 140.97 75.565))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b0e4dd8c-0f2e-4054-b7b9-f84674a8ec25)
   )
-  (wire (pts (xy 195.58 57.15) (xy 197.485 57.15))
+  (wire (pts (xy 120.015 92.075) (xy 121.92 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b13e7152-2075-4979-95c3-8b0c0b5a6f0a)
   )
-  (wire (pts (xy 215.265 145.415) (xy 215.265 144.145))
+  (wire (pts (xy 202.565 121.285) (xy 202.565 120.015))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b2775f9f-f459-44aa-9a31-1424e83c99b9)
   )
-  (polyline (pts (xy 283.845 116.84) (xy 283.845 13.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b442e8c1-bfea-4782-8e42-651ccea29de0)
-  )
-
-  (wire (pts (xy 212.09 47.625) (xy 212.09 49.53))
+  (wire (pts (xy 136.525 82.55) (xy 136.525 84.455))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4e0d7be-a7b4-4fc0-b7b2-a2bad0dedcd3)
   )
-  (polyline (pts (xy 283.845 121.285) (xy 177.8 121.285))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b819616f-016a-46a9-b62a-2a77c51cf562)
-  )
-
-  (wire (pts (xy 85.09 70.485) (xy 85.09 71.12))
+  (wire (pts (xy 78.74 105.41) (xy 78.74 106.045))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bc9ad445-d411-4a8b-8ece-ddc809dec0be)
   )
-  (wire (pts (xy 248.285 73.66) (xy 263.525 73.66))
+  (wire (pts (xy 158.75 121.285) (xy 175.895 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bd491450-ff22-49c0-977c-8db096031856)
+    (uuid c00cfd97-a1f2-47b3-bf17-9612ae2db296)
   )
-  (wire (pts (xy 64.135 71.755) (xy 64.135 76.835))
+  (wire (pts (xy 52.705 106.68) (xy 52.705 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c1364553-d4c8-4db9-8a5b-839dd35b4cac)
   )
-  (wire (pts (xy 77.47 182.88) (xy 77.47 183.515))
+  (wire (pts (xy 210.185 53.975) (xy 210.185 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c1968e33-647a-49ce-a6a9-f805908cd047)
   )
-  (wire (pts (xy 72.39 182.88) (xy 72.39 183.515))
+  (wire (pts (xy 205.105 53.975) (xy 205.105 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c39a08e6-990c-43c7-812d-f8666c77f950)
   )
-  (wire (pts (xy 216.535 33.655) (xy 216.535 40.64))
+  (bus (pts (xy 67.31 109.22) (xy 67.31 111.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c4fc6fd5-a442-4e98-aee4-e8a72dbbbd6b)
+  )
+
+  (wire (pts (xy 140.97 68.58) (xy 140.97 75.565))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c650a92c-36b3-473e-9d8a-c8a7025e464b)
   )
-  (wire (pts (xy 38.1 102.87) (xy 38.1 104.14))
+  (wire (pts (xy 26.67 137.795) (xy 26.67 139.065))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c896e082-b024-43e1-9343-83a407a5bbff)
   )
-  (wire (pts (xy 85.09 173.99) (xy 93.98 173.99))
+  (wire (pts (xy 217.805 45.085) (xy 226.695 45.085))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c8d71244-5dd0-4cb2-a3ac-323a11234ad8)
   )
-  (wire (pts (xy 103.505 167.64) (xy 114.3 167.64))
+  (wire (pts (xy 236.22 38.735) (xy 247.015 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c8f3e477-1f55-4f35-8e5b-4985678bcd9d)
   )
-  (wire (pts (xy 93.98 173.99) (xy 93.98 175.895))
+  (wire (pts (xy 226.695 45.085) (xy 226.695 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cab0c622-653d-4fca-a9b3-0fed4a7f3146)
   )
-  (wire (pts (xy 254 147.955) (xy 254.635 147.955))
+  (wire (pts (xy 202.565 91.44) (xy 202.565 108.585))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cd12510d-e65b-4476-a0d0-862d61aa078c)
   )
-  (wire (pts (xy 69.85 182.88) (xy 69.85 183.515))
+  (wire (pts (xy 202.565 53.975) (xy 202.565 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cdb47869-1413-43bd-bec1-ec74c88b7d70)
   )
-  (wire (pts (xy 184.785 78.74) (xy 184.15 78.74))
+  (wire (pts (xy 109.855 113.665) (xy 112.395 113.665))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ce8bfeb6-9176-4a92-811b-aecf859db484)
   )
-  (wire (pts (xy 103.505 173.99) (xy 103.505 175.895))
+  (wire (pts (xy 236.22 45.085) (xy 236.22 46.99))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cefe12ab-291a-437e-ad38-92830829e821)
   )
-  (wire (pts (xy 234.315 66.04) (xy 252.73 66.04))
+  (wire (pts (xy 158.75 100.965) (xy 163.83 100.965))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d10958d2-bc66-42fb-8db8-f9efdfb76000)
   )
-  (wire (pts (xy 166.37 106.045) (xy 170.18 106.045))
+  (wire (pts (xy 175.895 121.285) (xy 181.61 121.285))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d288d473-da91-4de8-9d37-266b95bcaeac)
+  )
+  (wire (pts (xy 160.655 108.585) (xy 165.735 108.585))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d3080d1e-5b61-460d-989d-337803943f3a)
+  )
+  (wire (pts (xy 90.17 129.54) (xy 94.615 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3c29d57-b562-46ac-a56c-92813b417420)
   )
-  (wire (pts (xy 93.98 167.64) (xy 92.71 167.64))
+  (wire (pts (xy 226.695 38.735) (xy 225.425 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d4e83c0e-3b40-4c50-ab8d-8f969090a549)
   )
-  (wire (pts (xy 93.98 173.99) (xy 93.98 173.355))
+  (wire (pts (xy 226.695 45.085) (xy 226.695 44.45))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d90c27e9-1e58-4c44-8324-497d9fc24d36)
   )
-  (wire (pts (xy 57.785 170.18) (xy 57.785 167.64))
+  (wire (pts (xy 190.5 41.275) (xy 190.5 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d93d2738-4384-4e3e-8d3c-dd4186730f58)
   )
-  (wire (pts (xy 184.785 96.52) (xy 184.15 96.52))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid daa02fee-2d00-4146-94d3-5077553add17)
-  )
-  (wire (pts (xy 89.535 33.655) (xy 160.02 33.655))
+  (wire (pts (xy 83.185 68.58) (xy 104.14 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dbb0b3db-af9d-4e01-a0b6-1a29ce5caf6a)
   )
-  (wire (pts (xy 103.505 183.515) (xy 93.98 183.515))
+  (wire (pts (xy 236.22 54.61) (xy 226.695 54.61))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dcb3bc29-16ee-4d1d-8ee1-df0e4508b104)
   )
-  (wire (pts (xy 266.7 86.36) (xy 267.97 86.36))
+  (wire (pts (xy 50.165 78.74) (xy 49.53 78.74))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e18d553e-1b30-4a82-b96d-43f464829d88)
+    (uuid dddbd2e8-c8b2-4234-9bfb-e653d14bc67b)
   )
-  (wire (pts (xy 30.48 95.25) (xy 31.75 95.25))
+  (wire (pts (xy 19.05 130.175) (xy 20.32 130.175))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e2477454-efc8-49d2-a214-f2a345a42b2b)
   )
-  (wire (pts (xy 248.285 80.01) (xy 252.73 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e516bdf8-6133-4873-858b-b99f09e2f7b8)
-  )
-  (wire (pts (xy 252.73 66.04) (xy 263.525 66.04))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e560237b-b76d-4363-897d-d46f949a06da)
-  )
-  (wire (pts (xy 85.09 170.18) (xy 86.36 170.18))
+  (wire (pts (xy 217.805 41.275) (xy 219.075 41.275))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e572ccd4-8bc1-42a4-ac8d-a1a326da1ade)
   )
-  (wire (pts (xy 207.645 150.495) (xy 207.645 151.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e8e40e0a-d62f-480d-aa02-d37f6bb65e5c)
-  )
-  (wire (pts (xy 36.83 95.25) (xy 38.1 95.25))
+  (wire (pts (xy 25.4 130.175) (xy 26.67 130.175))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eb8276be-31d7-4e69-a8c3-f935393a95f0)
   )
-  (polyline (pts (xy 13.335 152.4) (xy 150.495 152.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ebb69b02-57a3-47ff-9659-ea957c40db25)
-  )
-
-  (wire (pts (xy 166.37 94.615) (xy 166.37 97.79))
+  (wire (pts (xy 90.17 111.125) (xy 90.17 121.285))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ecc23fb9-22fe-4a8f-9e75-671a836f698c)
   )
-  (wire (pts (xy 193.675 57.15) (xy 195.58 57.15))
+  (wire (pts (xy 118.11 92.075) (xy 120.015 92.075))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eccd461f-c7a8-4ac3-9762-e84ff9a9fc46)
   )
-  (wire (pts (xy 36.83 102.87) (xy 38.1 102.87))
+  (wire (pts (xy 25.4 137.795) (xy 26.67 137.795))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f0eba58b-483e-4c9f-8580-71f1ca305547)
   )
-  (wire (pts (xy 207.645 144.145) (xy 215.265 144.145))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f13971ab-f350-42ae-9726-4f420709e484)
-  )
-  (wire (pts (xy 63.5 55.88) (xy 63.5 55.245))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f2a3c2d0-cbca-4a2b-9266-92336f4a357e)
-  )
-  (wire (pts (xy 71.12 50.165) (xy 63.5 50.165))
+  (wire (pts (xy 64.77 85.09) (xy 55.88 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f57a372a-67cd-4b36-9227-68dd8d65f7d8)
   )
-  (wire (pts (xy 234.315 73.66) (xy 236.22 73.66))
+  (wire (pts (xy 158.75 108.585) (xy 160.655 108.585))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc6f6380-0757-4808-99ca-99b57d4f35c9)
   )
-  (wire (pts (xy 53.34 74.295) (xy 53.34 76.835))
+  (wire (pts (xy 41.91 109.22) (xy 41.91 111.76))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ff44c462-3f66-4a85-994a-761ab9716195)
   )
-  (wire (pts (xy 40.005 167.64) (xy 43.18 167.64))
+  (wire (pts (xy 163.83 38.735) (xy 175.895 38.735))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ff96671d-08b3-4088-83d4-76dc10257180)
   )
 
-  (text "Place cap near\nmeasurement pin" (at 207.01 154.305 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid 02dc5f29-093e-4bca-81fb-a2b4dff8b7e3)
-  )
-  (text "TODO: one big cap as well (maybe electrolytic)" (at 93.98 158.115 0)
+  (text "TODO: one big cap as well (maybe electrolytic)" (at 226.695 29.21 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 05f63078-df56-42f0-b00a-0b4b6790bea5)
   )
   (text "https://ecocell.com.au/product/lipo-1000-603450-3w/"
-    (at 281.94 132.08 0)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (at 167.005 75.565 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0f5b88e9-fa30-4ef0-af34-5f2ab169385c)
   )
-  (text "max 600mA" (at 111.76 166.37 0)
+  (text "max 600mA" (at 244.475 37.465 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 20d117c1-35dc-4b55-9149-a2924cdc1889)
   )
   (text "https://ww1.microchip.com/downloads/en/Appnotes/01260B.pdf"
-    (at 283.21 15.875 0)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (at 167.005 71.755 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3232c408-a11b-45a7-bcfe-0155deaffec7)
   )
-  (text "Battery Connector and Fuel Gauge" (at 178.435 123.825 0)
+  (text "Should be ~2V at full charge" (at 210.185 123.825 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 4dcbf521-202a-44d6-9e7e-5210649dffe4)
-  )
-  (text "Main 3V3 Rail\n(always on)" (at 13.97 156.845 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 587ed431-66cc-4feb-b7bb-f0315c98eccb)
-  )
-  (text "should be ~2V at full charge" (at 208.915 142.24 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6224b807-8fde-44af-9e2a-572462b9bbab)
   )
   (text "Much filtering to avoid EMI\nissues down the track."
-    (at 45.72 107.95 0)
+    (at 34.29 142.875 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 63193c83-807e-4fd4-8c79-47dd2a178194)
   )
-  (text "Battery Management\nIncludes switching between external power\nand battery power as needed."
-    (at 147.32 19.685 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 6956fb2f-e860-4cc9-9e4a-e0d4e16dc8c6)
-  )
-  (text "Keep VBUS_RAW <= 10uF" (at 52.705 30.48 0)
+  (text "Keep VBUS_RAW <= 10uF" (at 46.355 65.405 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bfecfbaf-2163-4150-8239-3d4b1c7a8322)
   )
-  (text "Keep VBUS_SWITCHED + VBUS_RAW <= 100uF" (at 86.995 30.48 0)
+  (text "Keep VBUS_SWITCHED + VBUS_RAW <= 100uF" (at 80.645 65.405 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c6e9802c-d15b-4780-b0d1-9b45b01a9c84)
   )
-  (text "select based on\nspecific battery" (at 165.1 106.68 180)
+  (text "select based on\nspecific battery" (at 88.9 130.175 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c9c44ed2-df23-4da5-8a66-7e6b99f026eb)
   )
   (text "Note USB capacitance limits on initial connection:"
-    (at 56.515 26.035 0)
+    (at 45.085 60.96 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid dd848609-fc16-4db3-831f-3ccaa22abffc)
   )
   (text "Alternative parts:\nTPS62021DGQ: pull mode high instead of low\nTPS62026DGQ: connect FB to SW via 0 ohm, ignore other FB resistor and caps"
-    (at 13.97 196.215 0)
+    (at 165.1 66.675 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e1251973-8dff-410c-b393-9763a6d1efe5)
   )
-  (text "BAT <= 5.5V at max charge\n(limited by 1V8 reg)" (at 245.11 140.335 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
+  (text "BAT <= 5.5V at max charge\n(limited by 1V8 reg)" (at 193.675 88.265 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ef19af50-3724-4ded-b526-480f2a5e9fa2)
   )
 
-  (label "VBUS_RAW" (at 75.565 33.655 180)
+  (label "SYS_POWER" (at 109.855 131.445 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 18c3a2ff-0d46-44ca-bb7d-bbb4b069d478)
+  )
+  (label "VBUS_RAW" (at 69.215 68.58 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 1c30f32f-7d7f-4719-9937-05317612e123)
   )
-  (label "VBUS_FUSED" (at 166.37 33.655 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 1edb7bda-7b99-4249-97e8-914afbed5a38)
+  (label "NTC" (at 122.555 121.285 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 22940588-cbb5-4cec-91d6-53a57f2d552c)
   )
-  (label "VBUS_SWITCHED" (at 86.995 33.655 0)
+  (label "USB.DP" (at 64.77 109.22 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 279329d6-2e09-4b81-a234-d862e05d9672)
+  )
+  (label "VBUS_SWITCHED" (at 80.645 68.58 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 41a3d60e-e64d-49f7-943d-f91eecdcb28d)
   )
+  (label "SYS_POWER" (at 109.855 113.665 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid 43e2b1ff-df81-4cda-8d49-232eddf0da62)
+  )
+  (label "SYS_POWER" (at 167.005 100.965 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid abd93a8e-7858-4231-a30c-fb919c412bd5)
+  )
+  (label "NTC" (at 197.485 92.075 270)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid b3372b80-beff-4f5f-bec4-81f89a9bc518)
+  )
+  (label "USB.DN" (at 64.77 106.68 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid bd8c61dc-36c4-4433-ab6b-143e72aef210)
+  )
+  (label "VBUS_FUSED" (at 118.11 68.58 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f70b7c5c-289c-4394-9a81-846ec8675ce1)
+  )
 
-  (global_label "~{3V3_MODE}" (shape input) (at 59.69 179.07 180) (fields_autoplaced)
+  (global_label "~{3V3_MODE}" (shape input) (at 192.405 50.165 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0083584a-0a62-4510-9e64-ccf8e7852321)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 47.6007 178.9906 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 180.3157 50.0856 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "~{CHG_PWR_OK}" (shape input) (at 247.015 88.9 0) (fields_autoplaced)
+  (global_label "~{CHG_PWR_OK}" (shape input) (at 181.61 121.285 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 049a3b8a-bb0e-4cd0-b6eb-054bd3bd2d7a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 261.8257 88.8206 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 196.4207 121.2056 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "BAT" (shape input) (at 254 147.955 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 08e221fc-3769-4d31-b895-e83a6b4ddc4c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 248.2607 148.0344 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "PROG3" (shape input) (at 170.18 94.615 90) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 0ea93475-a668-4daa-ab3a-8370c43c7727)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 170.2594 85.8519 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SYS_POWER" (shape input) (at 263.525 66.04 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 3c10233e-5f42-49fc-986a-f378d5aae71b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 276.8843 65.9606 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "CHG_STAT2" (shape input) (at 247.015 93.98 0) (fields_autoplaced)
+  (global_label "CHG_STAT2" (shape input) (at 181.61 128.905 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4229bce3-c83c-4616-847b-93935e2f6461)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 259.7091 93.9006 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 194.3041 128.8256 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "PROG3" (shape input) (at 198.755 81.28 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 449336a8-68fb-49bf-bf05-df630a7120ec)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 189.9919 81.2006 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "USB_TCC0" (shape input) (at 95.25 57.785 0) (fields_autoplaced)
+  (global_label "USB_TCC0" (shape input) (at 88.9 92.71 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4a5f5f31-fb9d-43c5-a08d-15b08c9d8fd7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 107.1579 57.7056 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 100.8079 92.6306 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "USB_TCC1" (shape input) (at 95.25 60.325 0) (fields_autoplaced)
+  (global_label "USB_TCC1" (shape input) (at 88.9 95.25 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 572e1a96-e8d9-42b5-8f8c-bcc1affc8aa1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 107.1579 60.2456 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 100.8079 95.1706 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "USB_DP" (shape input) (at 67.945 74.295 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 5debefe9-e2e7-4c77-9bd8-fa75c592684d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 77.6757 74.2156 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "PROG1" (shape input) (at 166.37 94.615 90) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 63c92b7b-7313-4814-926c-9ae8230855d8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 166.4494 85.8519 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SYS_POWER" (shape input) (at 40.005 167.64 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 75405229-cc1f-431e-9932-461a8c461822)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 26.6457 167.7194 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "CHG_SEL" (shape input) (at 198.755 71.12 180) (fields_autoplaced)
+  (global_label "CHG_SEL" (shape input) (at 123.19 106.045 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 823a9390-3947-429a-b937-74b470c7a980)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 188.1171 71.1994 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 112.5521 106.1244 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "NTC" (shape input) (at 198.12 86.36 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 834c1fc7-ff73-46f9-b757-72ab342a5864)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 192.1388 86.4394 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "BAT" (shape input) (at 215.265 135.89 90) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 8c242b44-0a98-4c1b-9bf8-e1c5e9d90ef8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 215.1856 130.1507 90)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "SYS_POWER" (shape input) (at 182.245 78.74 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid a5700781-6d26-4ca7-93f6-966d0a156c3f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 168.8857 78.8194 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "CHG_STAT1" (shape input) (at 247.015 91.44 0) (fields_autoplaced)
+  (global_label "CHG_STAT1" (shape input) (at 181.61 126.365 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid a9e1a8ab-8de0-42a1-a740-f52d64f7afe0)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 259.7091 91.3606 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 194.3041 126.2856 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "BAT" (shape input) (at 263.525 73.66 0) (fields_autoplaced)
+  (global_label "BAT_LEVEL" (shape input) (at 208.915 120.015 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid b64f1102-8404-44ce-8143-a43815673492)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 269.2643 73.5806 0)
-      (effects (font (size 1.27 1.27)) (justify left) hide)
-    )
-  )
-  (global_label "PROG1" (shape input) (at 198.755 76.2 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid bb581b74-1778-4147-852d-0cdfafdc029e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 189.9919 76.1206 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "BAT_LEVEL" (shape input) (at 202.565 144.145 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
     (uuid c648bcb8-4c6f-4e1c-9a86-6b13c0c75bf4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 190.4152 144.0656 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 221.0648 119.9356 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "NTC" (shape input) (at 254 142.875 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid c786f7e0-c6eb-469a-b8a5-a9e4cd62081e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 248.0188 142.9544 0)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-  )
-  (global_label "USB_DN" (shape input) (at 67.945 71.755 0) (fields_autoplaced)
+  (global_label "USB{USB}" (shape input) (at 67.31 114.935 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
-    (uuid e6560769-cf73-4e10-b385-9c1a2dfd50be)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 77.7362 71.6756 0)
+    (uuid db193f35-c810-413f-8a05-7e53dcdbf711)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 79.0364 114.8556 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
 
-  (symbol (lib_id "Device:R_Small") (at 215.265 147.955 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 202.565 123.825 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 06a044c4-6490-472d-b30c-63eb5b83d6ea)
-    (property "Reference" "R215" (id 0) (at 219.075 147.32 0))
-    (property "Value" "1M" (id 1) (at 219.075 149.225 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 215.265 147.955 0)
+    (property "Reference" "R215" (id 0) (at 206.375 123.19 0))
+    (property "Value" "1M" (id 1) (at 206.375 125.095 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 202.565 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 215.265 147.955 0)
+    (property "Datasheet" "~" (id 3) (at 202.565 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-131ML" (id 4) (at 215.265 147.955 0)
+    (property "PN" "AC0603FR-131ML" (id 4) (at 202.565 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2b7f216b-0ac0-4d2a-9569-601211c8c606))
     (pin "2" (uuid 43363ba5-9d57-4995-8c85-cde9278f16e2))
   )
 
-  (symbol (lib_id "symbols:BD91N01NUX") (at 86.36 57.785 0) (unit 1)
+  (symbol (lib_id "symbols:BD91N01NUX") (at 80.01 92.71 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 09348fc8-4c3f-471a-93e6-bac86eed2973)
-    (property "Reference" "U204" (id 0) (at 66.04 41.275 0)
+    (property "Reference" "U204" (id 0) (at 59.69 76.2 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BD91N01NUX" (id 1) (at 66.04 43.815 0)
+    (property "Value" "BD91N01NUX" (id 1) (at 59.69 78.74 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "footprints:BD91N01NUX-E2" (id 2) (at 86.36 57.785 0)
+    (property "Footprint" "footprints:BD91N01NUX-E2" (id 2) (at 80.01 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 57.785 0)
+    (property "Datasheet" "" (id 3) (at 80.01 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "BD91N01NUX" (id 4) (at 86.36 57.785 0)
+    (property "PN" "BD91N01NUX" (id 4) (at 80.01 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1e0f84ba-cc81-422e-b158-972613cab000))
@@ -2139,194 +1985,194 @@
     (pin "9" (uuid 210c4ea7-61dc-4638-b7ae-723961bee5a3))
   )
 
-  (symbol (lib_id "power:GND") (at 63.5 55.88 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 49.53 80.645 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0e655543-49e9-4c83-a417-68f60cd95f9b)
-    (property "Reference" "#PWR0210" (id 0) (at 63.5 62.23 0)
+    (property "Reference" "#PWR0210" (id 0) (at 49.53 86.995 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 63.5 59.69 0))
-    (property "Footprint" "" (id 2) (at 63.5 55.88 0)
+    (property "Value" "GND" (id 1) (at 49.53 84.455 0))
+    (property "Footprint" "" (id 2) (at 49.53 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 63.5 55.88 0)
+    (property "Datasheet" "" (id 3) (at 49.53 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 68f92731-8434-40f0-b4d7-b4377d7d94e8))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 114.3 171.45 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 247.015 42.545 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 118076bc-b824-414f-9136-c96f4a6aab57)
-    (property "Reference" "C206" (id 0) (at 118.745 170.815 0))
-    (property "Value" "22uF" (id 1) (at 118.745 172.72 0))
-    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 114.3 171.45 0)
+    (property "Reference" "C206" (id 0) (at 251.46 41.91 0))
+    (property "Value" "22uF" (id 1) (at 251.46 43.815 0))
+    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 247.015 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 114.3 171.45 0)
+    (property "Datasheet" "~" (id 3) (at 247.015 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "CL31A226MOCLNNC" (id 4) (at 114.3 171.45 90)
+    (property "PN" "CL31A226MOCLNNC" (id 4) (at 247.015 42.545 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c9328b03-08c4-4036-ac79-726ac88b6b34))
     (pin "2" (uuid 85a06a8b-e871-4664-bd27-270108c721be))
   )
 
-  (symbol (lib_id "power:+3V3") (at 139.7 165.1 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 272.415 36.195 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 18fde3d3-cea9-406b-9f4e-d46603f6493d)
-    (property "Reference" "#PWR0207" (id 0) (at 139.7 168.91 0)
+    (property "Reference" "#PWR0207" (id 0) (at 272.415 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 139.7 159.385 0))
-    (property "Footprint" "" (id 2) (at 139.7 165.1 0)
+    (property "Value" "+3V3" (id 1) (at 272.415 30.48 0))
+    (property "Footprint" "" (id 2) (at 272.415 36.195 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 139.7 165.1 0)
+    (property "Datasheet" "" (id 3) (at 272.415 36.195 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b437b181-1ecd-44ad-b1f5-c534000cc43a))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 43.18 170.815 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 175.895 41.91 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 21cdcb26-8c57-40c6-ab1a-c5d4468243cd)
-    (property "Reference" "C205" (id 0) (at 38.735 170.18 0))
-    (property "Value" "10uF" (id 1) (at 38.735 172.085 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 43.18 170.815 0)
+    (property "Reference" "C205" (id 0) (at 171.45 41.275 0))
+    (property "Value" "10uF" (id 1) (at 171.45 43.18 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 175.895 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 43.18 170.815 0)
+    (property "Datasheet" "~" (id 3) (at 175.895 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 43.18 170.815 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 175.895 41.91 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid add1d77d-4dab-409e-af4c-26f2af45834e))
     (pin "2" (uuid da93c344-2365-4c14-b8ff-1021139a03b8))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 187.325 96.52 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 114.935 131.445 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 22ff3976-23f9-4159-affc-28b05fd37239)
-    (property "Reference" "R208" (id 0) (at 187.325 94.615 90))
-    (property "Value" "100k" (id 1) (at 187.325 98.425 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 187.325 96.52 0)
+    (property "Reference" "R208" (id 0) (at 114.935 129.54 90))
+    (property "Value" "100k" (id 1) (at 114.935 133.35 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 114.935 131.445 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 187.325 96.52 0)
+    (property "Datasheet" "~" (id 3) (at 114.935 131.445 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 187.325 96.52 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 114.935 131.445 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fc49ecab-5a13-411f-990e-98c8e88163d6))
     (pin "2" (uuid 032e2c2f-6838-402c-b810-2b3662d8dd5e))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 264.16 86.36 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 175.895 117.475 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 27c24449-693f-4cef-b28f-5ee51abb4ae6)
-    (property "Reference" "R207" (id 0) (at 264.16 82.55 90))
-    (property "Value" "100k" (id 1) (at 264.16 84.455 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 264.16 86.36 0)
+    (property "Reference" "R207" (id 0) (at 179.705 116.84 0))
+    (property "Value" "100k" (id 1) (at 179.705 118.745 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 175.895 117.475 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 264.16 86.36 0)
+    (property "Datasheet" "~" (id 3) (at 175.895 117.475 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 264.16 86.36 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 175.895 117.475 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a5f74dc2-ed04-42e8-930b-816d68796639))
     (pin "2" (uuid a5f90dc6-d238-45ea-8441-a417be7cdbc1))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 93.98 167.64 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 226.695 38.735 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 29593bfe-4637-4c17-a201-318ce1ce2c76)
-    (property "Reference" "#FLG0102" (id 0) (at 93.98 165.735 0)
+    (property "Reference" "#FLG0102" (id 0) (at 226.695 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 96.52 166.3699 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 229.235 37.4649 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 93.98 167.64 0)
+    (property "Footprint" "" (id 2) (at 226.695 38.735 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 93.98 167.64 0)
+    (property "Datasheet" "~" (id 3) (at 226.695 38.735 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a6793fc6-3733-49f0-82a4-1eb2dcdca9b5))
   )
 
-  (symbol (lib_id "power:GND") (at 77.47 184.15 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 210.185 55.245 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 29b8f24c-be1e-427c-9c39-f682de00661f)
-    (property "Reference" "#PWR0212" (id 0) (at 77.47 190.5 0)
+    (property "Reference" "#PWR0212" (id 0) (at 210.185 61.595 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 77.47 188.595 0))
-    (property "Footprint" "" (id 2) (at 77.47 184.15 0)
+    (property "Value" "GND" (id 1) (at 210.185 59.69 0))
+    (property "Footprint" "" (id 2) (at 210.185 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 77.47 184.15 0)
+    (property "Datasheet" "" (id 3) (at 210.185 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 73eb2346-f77b-4e5e-91eb-317719ef59e3))
   )
 
-  (symbol (lib_id "power:GND") (at 246.38 149.225 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 200.025 92.075 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 2e4619a6-44a6-4f5c-917b-ee7e9f5fe3d2)
-    (property "Reference" "#PWR0211" (id 0) (at 246.38 155.575 0)
+    (property "Reference" "#PWR0211" (id 0) (at 200.025 98.425 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 246.38 153.035 0))
-    (property "Footprint" "" (id 2) (at 246.38 149.225 0)
+    (property "Value" "GND" (id 1) (at 200.025 95.885 0))
+    (property "Footprint" "" (id 2) (at 200.025 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 246.38 149.225 0)
+    (property "Datasheet" "" (id 3) (at 200.025 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9f4dfb32-6bb2-42e5-914f-84b2d091d0eb))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 248.285 77.47 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 165.735 112.395 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3495d530-c21f-4aed-b202-9135c5520827)
-    (property "Reference" "C202" (id 0) (at 243.84 76.835 0))
-    (property "Value" "10uF" (id 1) (at 243.84 78.74 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 248.285 77.47 0)
+    (property "Reference" "C202" (id 0) (at 170.18 111.76 0))
+    (property "Value" "10uF" (id 1) (at 170.18 113.665 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 165.735 112.395 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 248.285 77.47 0)
+    (property "Datasheet" "~" (id 3) (at 165.735 112.395 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 248.285 77.47 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 165.735 112.395 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7af7d36f-49a4-426d-8cdb-ff19b01ffd70))
     (pin "2" (uuid 7d56b773-6458-41b9-a6f8-8baa3015ee79))
   )
 
-  (symbol (lib_id "Device:D_Dual_CommonAnode_KKA_Parallel") (at 61.595 81.915 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:D_Dual_CommonAnode_KKA_Parallel") (at 50.165 116.84 90) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid 351287d1-77cd-41de-aaaa-3c6a40fe6e4f)
-    (property "Reference" "D201" (id 0) (at 66.675 80.5814 90)
+    (property "Reference" "D201" (id 0) (at 54.61 117.475 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "PESD2USB3UV-TR" (id 1) (at 66.675 83.1214 90)
+    (property "Value" "PESD2USB3UV-TR" (id 1) (at 54.61 120.015 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 61.595 83.185 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 50.165 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 61.595 83.185 0)
+    (property "Datasheet" "~" (id 3) (at 50.165 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PESD2USB3UV-TR" (id 4) (at 61.595 81.915 90)
+    (property "PN" "PESD2USB3UV-TR" (id 4) (at 50.165 116.84 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1b4b6dd4-a8c5-4928-9c09-12bbdda56f40))
@@ -2334,22 +2180,22 @@
     (pin "3" (uuid 18379718-f382-4f39-b487-2d8ffdcaf993))
   )
 
-  (symbol (lib_id "Battery_Management:MCP73871") (at 216.535 81.28 0) (unit 1)
+  (symbol (lib_id "Battery_Management:MCP73871") (at 140.97 116.205 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 37180eea-98ea-4098-b8e8-3c0c1ce47505)
-    (property "Reference" "U201" (id 0) (at 218.5544 55.245 0)
+    (property "Reference" "U201" (id 0) (at 142.9894 90.17 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "MCP73871" (id 1) (at 218.5544 57.785 0)
+    (property "Value" "MCP73871" (id 1) (at 142.9894 92.71 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.5x2.5mm_ThermalVias" (id 2) (at 221.615 104.14 0)
+    (property "Footprint" "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.5x2.5mm_ThermalVias" (id 2) (at 146.05 139.065 0)
       (effects (font (size 1.27 1.27) italic) (justify left) hide)
     )
-    (property "Datasheet" "http://www.mouser.com/ds/2/268/22090a-52174.pdf" (id 3) (at 212.725 67.31 0)
+    (property "Datasheet" "http://www.mouser.com/ds/2/268/22090a-52174.pdf" (id 3) (at 137.16 102.235 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "MCP73871" (id 4) (at 216.535 81.28 0)
+    (property "PN" "MCP73871" (id 4) (at 140.97 116.205 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid baeab90e-27ff-44b7-a58d-7f5971ceeb79))
@@ -2375,156 +2221,120 @@
     (pin "9" (uuid f3558420-0d19-424d-bc25-d1ea1b402e76))
   )
 
-  (symbol (lib_id "power:GND") (at 61.595 87.63 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 50.165 122.555 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3b9881b2-5a74-4010-8459-eccccc82c1c3)
-    (property "Reference" "#PWR0221" (id 0) (at 61.595 93.98 0)
+    (property "Reference" "#PWR0221" (id 0) (at 50.165 128.905 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 61.595 92.71 0))
-    (property "Footprint" "" (id 2) (at 61.595 87.63 0)
+    (property "Value" "GND" (id 1) (at 50.165 127.635 0))
+    (property "Footprint" "" (id 2) (at 50.165 122.555 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 61.595 87.63 0)
+    (property "Datasheet" "" (id 3) (at 50.165 122.555 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1780cb3a-7e73-4c1a-b149-188587d77dfd))
   )
 
-  (symbol (lib_id "power:GND") (at 38.1 104.14 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 26.67 139.065 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3d9cb61f-920b-49bf-89fe-713c2418bb5a)
-    (property "Reference" "#PWR0222" (id 0) (at 38.1 110.49 0)
+    (property "Reference" "#PWR0222" (id 0) (at 26.67 145.415 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 40.64 107.95 0))
-    (property "Footprint" "" (id 2) (at 38.1 104.14 0)
+    (property "Value" "GND" (id 1) (at 29.21 142.875 0))
+    (property "Footprint" "" (id 2) (at 26.67 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 38.1 104.14 0)
+    (property "Datasheet" "" (id 3) (at 26.67 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid dc7fdbad-fb9f-4353-b3f3-5ad57cab4560))
   )
 
-  (symbol (lib_id "power:GND") (at 195.58 91.44 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 120.65 126.365 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 43ead6c9-cfed-48e2-99fd-8256da0eb4c2)
-    (property "Reference" "#PWR0204" (id 0) (at 195.58 97.79 0)
+    (property "Reference" "#PWR0204" (id 0) (at 120.65 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 195.58 95.25 0))
-    (property "Footprint" "" (id 2) (at 195.58 91.44 0)
+    (property "Value" "GND" (id 1) (at 120.65 130.175 0))
+    (property "Footprint" "" (id 2) (at 120.65 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 195.58 91.44 0)
+    (property "Datasheet" "" (id 3) (at 120.65 126.365 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cb2830d3-4310-4a3d-8f79-83ca90aa21ff))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 215.265 140.335 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 202.565 116.205 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 44c7e560-7285-4d47-b343-6ad8f2cbdc19)
-    (property "Reference" "R212" (id 0) (at 219.075 139.7 0))
-    (property "Value" "1M" (id 1) (at 219.075 141.605 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 215.265 140.335 0)
+    (property "Reference" "R212" (id 0) (at 206.375 115.57 0))
+    (property "Value" "1M" (id 1) (at 206.375 117.475 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 202.565 116.205 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 215.265 140.335 0)
+    (property "Datasheet" "~" (id 3) (at 202.565 116.205 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-131ML" (id 4) (at 215.265 140.335 0)
+    (property "PN" "AC0603FR-131ML" (id 4) (at 202.565 116.205 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5d76fa90-b217-442d-8855-742c61dbbef9))
     (pin "2" (uuid 026f1703-78f8-4627-a225-3674360f8256))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 207.645 147.955 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 4850b59b-7705-4d9a-bf7b-0257046331af)
-    (property "Reference" "C209" (id 0) (at 201.93 146.685 0))
-    (property "Value" "1000pF" (id 1) (at 201.93 149.225 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 207.645 147.955 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 207.645 147.955 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "0805YD102KAT2A" (id 4) (at 207.645 147.955 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 878a77ec-1d54-4732-ad79-7100f16d75a8))
-    (pin "2" (uuid 61804dcb-01d6-4414-afda-bed78e55c5fb))
-  )
-
-  (symbol (lib_id "Device:C_Small") (at 103.505 170.18 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 236.22 41.275 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4dd05ecf-a9dc-49b2-9c81-f3995b481125)
-    (property "Reference" "C204" (id 0) (at 107.315 170.18 0))
-    (property "Value" "22pF" (id 1) (at 107.315 172.72 0))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 103.505 170.18 0)
+    (property "Reference" "C204" (id 0) (at 240.03 41.275 0))
+    (property "Value" "22pF" (id 1) (at 240.03 43.815 0))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 236.22 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 103.505 170.18 0)
+    (property "Datasheet" "~" (id 3) (at 236.22 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "C0603C220K4GACTU" (id 4) (at 103.505 170.18 0)
+    (property "PN" "C0603C220K4GACTU" (id 4) (at 236.22 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a1483ed2-6d5b-4a99-a621-a9586d621874))
     (pin "2" (uuid c30095f1-e41b-4f58-bd07-bbcc6bb8cb19))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 166.37 100.33 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 90.17 123.825 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 52da1068-fc49-4e26-9f89-b6181d7abdaf)
-    (property "Reference" "R205" (id 0) (at 162.56 99.695 0))
-    (property "Value" "2k" (id 1) (at 162.56 101.6 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 166.37 100.33 0)
+    (property "Reference" "R205" (id 0) (at 86.36 123.19 0))
+    (property "Value" "2k" (id 1) (at 86.36 125.095 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 90.17 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 166.37 100.33 0)
+    (property "Datasheet" "~" (id 3) (at 90.17 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AR0603JR-072KL" (id 4) (at 166.37 100.33 0)
+    (property "PN" "AR0603JR-072KL" (id 4) (at 90.17 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9c1ffc77-05c7-4f2f-9372-dca984af026c))
     (pin "2" (uuid 5207242a-cd32-4d22-9d50-2ca74e3c84ae))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 252.73 69.85 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 60c26122-0410-482b-8e1b-5611031f0bdf)
-    (property "Reference" "C203" (id 0) (at 257.175 69.215 0))
-    (property "Value" "10uF" (id 1) (at 257.175 71.12 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 252.73 69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 252.73 69.85 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 252.73 69.85 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e6959605-74de-4926-adfe-0f41cc909051))
-    (pin "2" (uuid 94e63532-8761-4ffe-987e-9f4f66e5a1b1))
-  )
-
-  (symbol (lib_id "symbols:TPS62026") (at 72.39 172.72 0) (unit 1)
+  (symbol (lib_id "symbols:TPS62026") (at 205.105 43.815 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 68b225fc-6cbf-499a-a0c3-d1992a13d6c6)
-    (property "Reference" "U202" (id 0) (at 72.39 160.02 0))
-    (property "Value" "TPS62020DGQ" (id 1) (at 72.39 162.56 0))
-    (property "Footprint" "Package_SO:MSOP-10-1EP_3x3mm_P0.5mm_EP1.68x1.88mm_ThermalVias" (id 2) (at 73.66 160.02 0)
+    (property "Reference" "U202" (id 0) (at 205.105 31.115 0))
+    (property "Value" "TPS62020DGQ" (id 1) (at 205.105 33.655 0))
+    (property "Footprint" "Package_SO:MSOP-10-1EP_3x3mm_P0.5mm_EP1.68x1.88mm_ThermalVias" (id 2) (at 206.375 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 73.66 160.02 0)
+    (property "Datasheet" "" (id 3) (at 206.375 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "TPS62020DGQ" (id 4) (at 72.39 172.72 0)
+    (property "PN" "TPS62020DGQ" (id 4) (at 205.105 43.815 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "10" (uuid 4314e9e3-95e9-422c-8ae1-aef3af67a2e7))
@@ -2540,144 +2350,144 @@
     (pin "9" (uuid 502cc68c-3579-4200-8c47-56e9d3575d37))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 212.09 45.085 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 136.525 80.01 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6ed67879-4bc3-48c3-a925-594c9c7a33c3)
-    (property "Reference" "C201" (id 0) (at 207.9625 44.1325 0))
-    (property "Value" "10uF" (id 1) (at 207.9625 46.0375 0))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 212.09 45.085 0)
+    (property "Reference" "C201" (id 0) (at 132.3975 79.0575 0))
+    (property "Value" "10uF" (id 1) (at 132.3975 80.9625 0))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 136.525 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 212.09 45.085 0)
+    (property "Datasheet" "~" (id 3) (at 136.525 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 212.09 45.085 90)
+    (property "PN" "EMK212ABJ106KG-T" (id 4) (at 136.525 80.01 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4287ce00-9fab-43cc-a39f-bb43106ea2f0))
     (pin "2" (uuid cce4851e-5b69-4a9d-9d81-5b2687439498))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 187.325 78.74 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 114.935 113.665 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8489395c-7173-4bf6-b6f9-c7e64c03dddc)
-    (property "Reference" "R204" (id 0) (at 187.325 76.835 90))
-    (property "Value" "100k" (id 1) (at 187.325 80.645 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 187.325 78.74 0)
+    (property "Reference" "R204" (id 0) (at 114.935 111.76 90))
+    (property "Value" "100k" (id 1) (at 114.935 115.57 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 114.935 113.665 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 187.325 78.74 0)
+    (property "Datasheet" "~" (id 3) (at 114.935 113.665 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0603JR-10100KL" (id 4) (at 187.325 78.74 0)
+    (property "PN" "RC0603JR-10100KL" (id 4) (at 114.935 113.665 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cbf5440d-af1e-4ac1-8f21-0a2c96d10774))
     (pin "2" (uuid 01ea804c-61b7-4bf8-899e-2383572b76e4))
   )
 
-  (symbol (lib_id "power:+3V3") (at 98.425 46.99 0) (unit 1)
+  (symbol (lib_id "power:+3V3") (at 92.075 81.915 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8e6c5dff-35f0-4d48-a300-df524690fde9)
-    (property "Reference" "#PWR?" (id 0) (at 98.425 50.8 0)
+    (property "Reference" "#PWR?" (id 0) (at 92.075 85.725 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 100.965 45.7199 0)
+    (property "Value" "+3V3" (id 1) (at 94.615 80.6449 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 98.425 46.99 0)
+    (property "Footprint" "" (id 2) (at 92.075 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 98.425 46.99 0)
+    (property "Datasheet" "" (id 3) (at 92.075 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7732f184-9d9f-4677-8240-fd26c4cfdb0d))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 191.135 57.15 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 115.57 92.075 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8f5ca0f9-5cb5-4746-bfcc-07c4840c4495)
-    (property "Reference" "R201" (id 0) (at 191.135 53.34 90))
-    (property "Value" "110k" (id 1) (at 191.135 55.245 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 191.135 57.15 0)
+    (property "Reference" "R201" (id 0) (at 115.57 88.265 90))
+    (property "Value" "110k" (id 1) (at 115.57 90.17 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 115.57 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 191.135 57.15 0)
+    (property "Datasheet" "~" (id 3) (at 115.57 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-07110KL" (id 4) (at 191.135 57.15 0)
+    (property "PN" "AC0603FR-07110KL" (id 4) (at 115.57 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e6592dd1-7a01-489e-8d9e-cc160bda5a15))
     (pin "2" (uuid 60e05763-c9ae-4257-903c-c4b405f921ba))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 123.825 171.45 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 256.54 42.545 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8ff101f4-e775-42cb-b6c9-108675eeb554)
-    (property "Reference" "C207" (id 0) (at 128.27 170.815 0))
-    (property "Value" "22uF" (id 1) (at 128.27 172.72 0))
-    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 123.825 171.45 0)
+    (property "Reference" "C207" (id 0) (at 260.985 41.91 0))
+    (property "Value" "22uF" (id 1) (at 260.985 43.815 0))
+    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 256.54 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 123.825 171.45 0)
+    (property "Datasheet" "~" (id 3) (at 256.54 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "CL31A226MOCLNNC" (id 4) (at 123.825 171.45 90)
+    (property "PN" "CL31A226MOCLNNC" (id 4) (at 256.54 42.545 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e71bfe20-96d7-49b1-b1cd-7810df6cbda3))
     (pin "2" (uuid 08464515-1dba-462f-97b7-02eb88f38adb))
   )
 
-  (symbol (lib_id "power:GND") (at 85.09 71.12 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 78.74 106.045 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9064bb72-b20d-4e83-8232-6c3a2f02a2b1)
-    (property "Reference" "#PWR0218" (id 0) (at 85.09 77.47 0)
+    (property "Reference" "#PWR0218" (id 0) (at 78.74 112.395 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 85.09 74.93 0))
-    (property "Footprint" "" (id 2) (at 85.09 71.12 0)
+    (property "Value" "GND" (id 1) (at 78.74 109.855 0))
+    (property "Footprint" "" (id 2) (at 78.74 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.09 71.12 0)
+    (property "Datasheet" "" (id 3) (at 78.74 106.045 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eb6ec54c-6b48-472e-9ce8-02e9cf82abc9))
   )
 
-  (symbol (lib_id "Device:L_Small") (at 90.17 167.64 90) (unit 1)
+  (symbol (lib_id "Device:L_Small") (at 222.885 38.735 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 97f34ec2-60a3-48b4-b6da-218b9c5374da)
-    (property "Reference" "L201" (id 0) (at 90.17 163.195 90))
-    (property "Value" "3.3uH" (id 1) (at 90.17 165.1 90))
-    (property "Footprint" "Inductor_SMD:L_Wuerth_MAPI-3012" (id 2) (at 90.17 167.64 0)
+    (property "Reference" "L201" (id 0) (at 222.885 34.29 90))
+    (property "Value" "3.3uH" (id 1) (at 222.885 36.195 90))
+    (property "Footprint" "Inductor_SMD:L_Wuerth_MAPI-3012" (id 2) (at 222.885 38.735 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 90.17 167.64 0)
+    (property "Datasheet" "~" (id 3) (at 222.885 38.735 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "NRH3012T3R3MN" (id 4) (at 90.17 167.64 90)
+    (property "PN" "NRH3012T3R3MN" (id 4) (at 222.885 38.735 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7bf82591-a2fd-410b-958b-ea10af4f66b7))
     (pin "2" (uuid 4ebb5d25-bc79-4328-bf86-4cd34d5aaddf))
   )
 
-  (symbol (lib_id "Device:Q_PMOS_GSD") (at 81.28 36.195 270) (mirror x) (unit 1)
+  (symbol (lib_id "Device:Q_PMOS_GSD") (at 74.93 71.12 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 9f890897-0f82-45a8-8346-61a2ec80004a)
-    (property "Reference" "Q201" (id 0) (at 81.28 29.845 90))
-    (property "Value" "PMV48XPA2R" (id 1) (at 81.28 29.845 90)
+    (property "Reference" "Q201" (id 0) (at 74.93 64.77 90))
+    (property "Value" "PMV48XPA2R" (id 1) (at 74.93 64.77 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "Package_TO_SOT_SMD:TSOT-23" (id 2) (at 83.82 31.115 0)
+    (property "Footprint" "Package_TO_SOT_SMD:TSOT-23" (id 2) (at 77.47 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 81.28 36.195 0)
+    (property "Datasheet" "~" (id 3) (at 74.93 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "PMV48XPA2R" (id 4) (at 81.28 36.195 90)
+    (property "PN" "PMV48XPA2R" (id 4) (at 74.93 71.12 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 03173098-9036-4ed4-a805-27732a1dbfa8))
@@ -2685,296 +2495,294 @@
     (pin "3" (uuid d3284d27-6ae0-4ce7-a44c-7fbf0463807f))
   )
 
-  (symbol (lib_id "power:GND") (at 170.18 107.95 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 94.615 131.445 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a5d7504d-3f79-4f5b-a5e3-4cafa5f87b94)
-    (property "Reference" "#PWR0205" (id 0) (at 170.18 114.3 0)
+    (property "Reference" "#PWR0205" (id 0) (at 94.615 137.795 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 170.18 111.76 0))
-    (property "Footprint" "" (id 2) (at 170.18 107.95 0)
+    (property "Value" "GND" (id 1) (at 94.615 135.255 0))
+    (property "Footprint" "" (id 2) (at 94.615 131.445 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 170.18 107.95 0)
+    (property "Datasheet" "" (id 3) (at 94.615 131.445 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 08f19431-5c7f-48d8-8a58-bbe06fb7add2))
   )
 
-  (symbol (lib_id "Device:Fuse_Small") (at 162.56 33.655 180) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Device:Fuse_Small") (at 106.68 68.58 180) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid a92cbbcb-7a11-44ff-87d5-ffe23ba198f4)
-    (property "Reference" "F201" (id 0) (at 162.56 27.94 0))
-    (property "Value" "2A" (id 1) (at 162.56 30.48 0))
-    (property "Footprint" "Fuse:Fuse_1210_3225Metric" (id 2) (at 162.56 33.655 0)
+    (property "Reference" "F201" (id 0) (at 106.68 71.12 0))
+    (property "Value" "2A" (id 1) (at 106.68 73.66 0))
+    (property "Footprint" "Fuse:Fuse_1210_3225Metric" (id 2) (at 106.68 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 162.56 33.655 0)
+    (property "Datasheet" "~" (id 3) (at 106.68 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" " MICROSMD200F-2" (id 4) (at 162.56 33.655 0)
+    (property "PN" " MICROSMD200F-2" (id 4) (at 106.68 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 46043b14-4e21-45a4-96d0-03d589b24a2f))
     (pin "2" (uuid c5c92aab-9063-4acf-ba9e-6fcf36cb6579))
   )
 
-  (symbol (lib_id "power:GND") (at 252.73 81.28 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 165.735 115.57 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid b0ec250c-27b0-4855-ade4-24f9b9c401ce)
-    (property "Reference" "#PWR0203" (id 0) (at 252.73 87.63 0)
+    (property "Reference" "#PWR0203" (id 0) (at 165.735 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 252.73 85.09 0))
-    (property "Footprint" "" (id 2) (at 252.73 81.28 0)
+    (property "Value" "GND" (id 1) (at 165.735 119.38 0))
+    (property "Footprint" "" (id 2) (at 165.735 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 252.73 81.28 0)
+    (property "Datasheet" "" (id 3) (at 165.735 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3ad8f58f-583c-42db-b5fa-c3fac984c330))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 55.245 52.705 90) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 43.815 87.63 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid b231a614-25c7-4ed6-b14a-9ab324ba4856)
-    (property "Reference" "#FLG0202" (id 0) (at 53.34 52.705 0)
+    (property "Reference" "#FLG0202" (id 0) (at 41.91 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 49.53 50.8 90))
-    (property "Footprint" "" (id 2) (at 55.245 52.705 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 38.1 85.725 90))
+    (property "Footprint" "" (id 2) (at 43.815 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 55.245 52.705 0)
+    (property "Datasheet" "~" (id 3) (at 43.815 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid da3867dd-f5bd-4b75-9a91-5de25a425505))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 34.29 95.25 90) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 22.86 130.175 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid bc76727b-0ada-4fa9-aebd-9877f53521a3)
-    (property "Reference" "C218" (id 0) (at 34.29 98.425 90))
-    (property "Value" "0.1uF" (id 1) (at 34.29 100.33 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 34.29 95.25 0)
+    (property "Reference" "C218" (id 0) (at 22.86 133.35 90))
+    (property "Value" "0.1uF" (id 1) (at 22.86 135.255 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 22.86 130.175 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 34.29 95.25 0)
+    (property "Datasheet" "~" (id 3) (at 22.86 130.175 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "0805YD104KAT2A" (id 4) (at 34.29 95.25 90)
+    (property "PN" "0805YD104KAT2A" (id 4) (at 22.86 130.175 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 16497168-f9bd-4d98-adaa-d9896d170062))
     (pin "2" (uuid badb96ea-7f82-4418-8d60-0740057f8b4c))
   )
 
-  (symbol (lib_id "power:PWR_FLAG") (at 89.535 33.655 180) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 83.185 68.58 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cac6def1-cbc5-44be-aa02-229177cffa9f)
-    (property "Reference" "#FLG0201" (id 0) (at 89.535 35.56 0)
+    (property "Reference" "#FLG0201" (id 0) (at 83.185 70.485 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 89.535 38.735 0))
-    (property "Footprint" "" (id 2) (at 89.535 33.655 0)
+    (property "Value" "PWR_FLAG" (id 1) (at 83.185 73.66 0))
+    (property "Footprint" "" (id 2) (at 83.185 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 89.535 33.655 0)
+    (property "Datasheet" "~" (id 3) (at 83.185 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 770ec1fa-7c2a-4e97-9cf3-2a91459ff2d0))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 63.5 52.705 0) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 52.705 78.74 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cb801278-213a-413d-84c4-caee9269f63b)
-    (property "Reference" "C216" (id 0) (at 68.58 55.245 90)
+    (property "Reference" "C216" (id 0) (at 55.245 73.66 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "1uF" (id 1) (at 66.675 54.61 90)
+    (property "Value" "1uF" (id 1) (at 54.61 75.565 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 63.5 52.705 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 52.705 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 63.5 52.705 0)
+    (property "Datasheet" "~" (id 3) (at 52.705 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "EMK212BJ105KG-T" (id 4) (at 63.5 52.705 90)
+    (property "PN" "EMK212BJ105KG-T" (id 4) (at 52.705 78.74 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 616850ee-7f79-4bdd-aa56-cea1d0de701f))
     (pin "2" (uuid d2ebbc65-be0f-4a70-8520-be0865f2e647))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 200.025 57.15 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 124.46 92.075 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ccbcb5bf-59dc-4ae3-adca-64fa38d83802)
-    (property "Reference" "R202" (id 0) (at 200.025 53.34 90))
-    (property "Value" "330k" (id 1) (at 200.025 55.245 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 200.025 57.15 0)
+    (property "Reference" "R202" (id 0) (at 124.46 88.265 90))
+    (property "Value" "330k" (id 1) (at 124.46 90.17 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 124.46 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 200.025 57.15 0)
+    (property "Datasheet" "~" (id 3) (at 124.46 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RT0603FRE07330KL" (id 4) (at 200.025 57.15 0)
+    (property "PN" "RT0603FRE07330KL" (id 4) (at 124.46 92.075 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ffa76a32-53c9-4a78-ac2a-18a29c9d2072))
     (pin "2" (uuid 24a003a3-4651-4442-a1bb-5eb2b3ff089b))
   )
 
-  (symbol (lib_id "power:GND") (at 186.055 59.055 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 110.49 93.98 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cd19a623-5ea4-43dc-b7a9-aeb4e1f9ba05)
-    (property "Reference" "#PWR0202" (id 0) (at 186.055 65.405 0)
+    (property "Reference" "#PWR0202" (id 0) (at 110.49 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 186.055 63.5 0))
-    (property "Footprint" "" (id 2) (at 186.055 59.055 0)
+    (property "Value" "GND" (id 1) (at 110.49 98.425 0))
+    (property "Footprint" "" (id 2) (at 110.49 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 186.055 59.055 0)
+    (property "Datasheet" "" (id 3) (at 110.49 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ac545b0a-1a61-48b9-8db1-6443d1f21895))
   )
 
-  (symbol (lib_id "power:GND") (at 123.825 175.26 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 256.54 46.355 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid cfc8d10e-b52d-4c49-a87e-b7c96f735cc9)
-    (property "Reference" "#PWR0209" (id 0) (at 123.825 181.61 0)
+    (property "Reference" "#PWR0209" (id 0) (at 256.54 52.705 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 123.825 179.07 0))
-    (property "Footprint" "" (id 2) (at 123.825 175.26 0)
+    (property "Value" "GND" (id 1) (at 256.54 50.165 0))
+    (property "Footprint" "" (id 2) (at 256.54 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 123.825 175.26 0)
+    (property "Datasheet" "" (id 3) (at 256.54 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b077fa04-e072-4a71-9f31-987f2627ea0a))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 34.29 102.87 90) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 22.86 137.795 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d1b2aef7-e7ee-4306-959b-5519609da3e0)
-    (property "Reference" "R210" (id 0) (at 34.29 105.41 90))
-    (property "Value" "330" (id 1) (at 34.29 107.315 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 34.29 102.87 0)
+    (property "Reference" "R210" (id 0) (at 22.86 140.335 90))
+    (property "Value" "330" (id 1) (at 22.86 142.24 90))
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 22.86 137.795 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 34.29 102.87 0)
+    (property "Datasheet" "~" (id 3) (at 22.86 137.795 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "RC0805FR-10330RL" (id 4) (at 34.29 102.87 0)
+    (property "PN" "RC0805FR-10330RL" (id 4) (at 22.86 137.795 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fe0f1731-af63-4c04-b330-3f10c7e01819))
     (pin "2" (uuid f2fc8a29-68ed-42e7-9665-8305a0150f8f))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 93.98 178.435 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 226.695 49.53 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e2f2cfbd-0e5e-4d39-91e7-f97ee8bdb73e)
-    (property "Reference" "R214" (id 0) (at 97.79 177.8 0))
-    (property "Value" "110k" (id 1) (at 97.79 179.705 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 93.98 178.435 0)
+    (property "Reference" "R214" (id 0) (at 230.505 48.895 0))
+    (property "Value" "110k" (id 1) (at 230.505 50.8 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 226.695 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 93.98 178.435 0)
+    (property "Datasheet" "~" (id 3) (at 226.695 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-07110KL" (id 4) (at 93.98 178.435 0)
+    (property "PN" "AC0603FR-07110KL" (id 4) (at 226.695 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5d664b59-9384-479d-8867-486a09dd89ac))
     (pin "2" (uuid 17c4ae07-3fdc-46cd-b51c-d869793a56fa))
   )
 
-  (symbol (lib_id "Device:C_Small") (at 103.505 178.435 180) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at 236.22 49.53 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e8f13ce8-10a0-4687-9a3c-1730fef6142c)
-    (property "Reference" "C208" (id 0) (at 107.315 178.435 0))
-    (property "Value" "150pF" (id 1) (at 107.315 180.975 0))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 103.505 178.435 0)
+    (property "Reference" "C208" (id 0) (at 240.03 49.53 0))
+    (property "Value" "150pF" (id 1) (at 240.03 52.07 0))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (id 2) (at 236.22 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 103.505 178.435 0)
+    (property "Datasheet" "~" (id 3) (at 236.22 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "CC0603JRX7R9BB151" (id 4) (at 103.505 178.435 0)
+    (property "PN" "CC0603JRX7R9BB151" (id 4) (at 236.22 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8aefb793-9f19-4c33-8724-734f44c37a47))
     (pin "2" (uuid ee8d598e-7693-4276-a68b-65905f66e67e))
   )
 
-  (symbol (lib_id "power:GND") (at 215.265 152.4 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 202.565 128.27 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e96b25da-9f22-418b-91da-b7188867fb85)
-    (property "Reference" "#PWR0213" (id 0) (at 215.265 158.75 0)
+    (property "Reference" "#PWR0213" (id 0) (at 202.565 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 215.265 156.21 0))
-    (property "Footprint" "" (id 2) (at 215.265 152.4 0)
+    (property "Value" "GND" (id 1) (at 202.565 132.08 0))
+    (property "Footprint" "" (id 2) (at 202.565 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 215.265 152.4 0)
+    (property "Datasheet" "" (id 3) (at 202.565 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0a9f4b09-5f01-4a79-a05a-1b4d7c11562b))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 93.98 170.815 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 226.695 41.91 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ea5c1087-a95e-483c-b481-e52fafa78dad)
-    (property "Reference" "R211" (id 0) (at 97.79 170.18 0))
-    (property "Value" "620k" (id 1) (at 97.79 172.085 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 93.98 170.815 0)
+    (property "Reference" "R211" (id 0) (at 230.505 41.275 0))
+    (property "Value" "620k" (id 1) (at 230.505 43.18 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 226.695 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 93.98 170.815 0)
+    (property "Datasheet" "~" (id 3) (at 226.695 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AC0603FR-07620KL" (id 4) (at 93.98 170.815 0)
+    (property "PN" "AC0603FR-07620KL" (id 4) (at 226.695 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9c589623-bc8f-47fb-acc7-9c082d2d9a40))
     (pin "2" (uuid d0963a8f-ae55-4d3e-aed7-8cf1dba1249a))
   )
 
-  (symbol (lib_id "power:+3V3") (at 267.97 86.36 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "power:+3V3") (at 175.895 114.3 0) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid ec7e1e80-a526-43e5-860b-06afa4aa50cb)
-    (property "Reference" "#PWR0121" (id 0) (at 264.16 86.36 0)
+    (property "Reference" "#PWR0121" (id 0) (at 175.895 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3V3" (id 1) (at 271.145 86.3599 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 267.97 86.36 0)
+    (property "Value" "+3V3" (id 1) (at 179.705 113.03 0))
+    (property "Footprint" "" (id 2) (at 175.895 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 267.97 86.36 0)
+    (property "Datasheet" "" (id 3) (at 175.895 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 68428053-ecb9-472f-85d7-a311b13ca1f5))
   )
 
-  (symbol (lib_id "Connector:USB_C_Receptacle_USB2.0") (at 38.1 71.755 0) (unit 1)
+  (symbol (lib_id "Connector:USB_C_Receptacle_USB2.0") (at 26.67 106.68 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ed3ceb62-4d56-4d0a-8f62-04a7bb3a6e80)
-    (property "Reference" "J202" (id 0) (at 29.845 50.165 0))
-    (property "Value" "USB" (id 1) (at 29.845 52.705 0))
-    (property "Footprint" "Connector_USB:USB_C_Receptacle_GCT_USB4085" (id 2) (at 41.91 71.755 0)
+    (property "Reference" "J202" (id 0) (at 18.415 85.09 0))
+    (property "Value" "USB" (id 1) (at 18.415 87.63 0))
+    (property "Footprint" "Connector_USB:USB_C_Receptacle_GCT_USB4085" (id 2) (at 30.48 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 41.91 71.755 0)
+    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 30.48 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" " USB4085-GF-A " (id 4) (at 38.1 71.755 0)
+    (property "PN" " USB4085-GF-A " (id 4) (at 26.67 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "A1" (uuid f2a76d36-1646-49fe-96ba-9812bc2f632e))
@@ -2996,54 +2804,54 @@
     (pin "S1" (uuid f527acde-0534-4b89-929e-43237738e7ae))
   )
 
-  (symbol (lib_id "power:GND") (at 216.535 104.775 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 140.97 139.7 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ee56385a-e104-4537-ada0-2d1d498398fd)
-    (property "Reference" "#PWR0206" (id 0) (at 216.535 111.125 0)
+    (property "Reference" "#PWR0206" (id 0) (at 140.97 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 216.535 109.22 0))
-    (property "Footprint" "" (id 2) (at 216.535 104.775 0)
+    (property "Value" "GND" (id 1) (at 140.97 144.145 0))
+    (property "Footprint" "" (id 2) (at 140.97 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 216.535 104.775 0)
+    (property "Datasheet" "" (id 3) (at 140.97 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0f040f67-bb3c-4e62-8a40-0686a9eaa695))
   )
 
-  (symbol (lib_id "power:GND") (at 212.09 49.53 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 136.525 84.455 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ee9564dd-4ea9-4962-b23b-9a9a5a41b369)
-    (property "Reference" "#PWR0201" (id 0) (at 212.09 55.88 0)
+    (property "Reference" "#PWR0201" (id 0) (at 136.525 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 212.09 53.975 0))
-    (property "Footprint" "" (id 2) (at 212.09 49.53 0)
+    (property "Value" "GND" (id 1) (at 136.525 88.9 0))
+    (property "Footprint" "" (id 2) (at 136.525 84.455 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 212.09 49.53 0)
+    (property "Datasheet" "" (id 3) (at 136.525 84.455 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f1d57097-ff67-402f-ad4c-be175a8582ad))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x03") (at 259.715 145.415 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+  (symbol (lib_id "Connector_Generic:Conn_01x03") (at 200.025 86.36 90) (unit 1)
+    (in_bom yes) (on_board yes)
     (uuid f72fe528-69f4-4c4b-8eec-5db4deb28b5b)
-    (property "Reference" "J201" (id 0) (at 262.89 144.1449 0)
+    (property "Reference" "J201" (id 0) (at 201.93 80.645 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Battery" (id 1) (at 262.89 146.6849 0)
+    (property "Value" "Battery" (id 1) (at 203.2 83.185 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Connector_JST:JST_PH_B3B-PH-K_1x03_P2.00mm_Vertical" (id 2) (at 259.715 145.415 0)
+    (property "Footprint" "Connector_JST:JST_PH_B3B-PH-K_1x03_P2.00mm_Vertical" (id 2) (at 200.025 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 259.715 145.415 0)
+    (property "Datasheet" "~" (id 3) (at 200.025 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "" (id 4) (at 259.715 145.415 0)
+    (property "PN" "" (id 4) (at 200.025 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9ef182b5-daa1-4f9b-a61c-6900b90ac9a2))
@@ -3051,35 +2859,35 @@
     (pin "3" (uuid f0652904-0b01-4923-b8f0-0c0dee89afc0))
   )
 
-  (symbol (lib_id "Device:R_Small") (at 170.18 100.33 0) (unit 1)
+  (symbol (lib_id "Device:R_Small") (at 94.615 123.825 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid fce2e5cd-713b-4778-b018-cafcb20def2c)
-    (property "Reference" "R206" (id 0) (at 173.99 99.695 0))
-    (property "Value" "25k" (id 1) (at 173.99 101.6 0))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 170.18 100.33 0)
+    (property "Reference" "R206" (id 0) (at 98.425 123.19 0))
+    (property "Value" "25k" (id 1) (at 98.425 125.095 0))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 94.615 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 170.18 100.33 0)
+    (property "Datasheet" "~" (id 3) (at 94.615 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "PN" "AR0603JR-0724KL" (id 4) (at 170.18 100.33 0)
+    (property "PN" "AR0603JR-0724KL" (id 4) (at 94.615 123.825 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cefd1260-e011-4bb9-bb07-4256d9dcce45))
     (pin "2" (uuid 255c2102-eaa6-4031-95af-880a142adb0d))
   )
 
-  (symbol (lib_id "power:GND") (at 43.18 173.355 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 175.895 44.45 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ffb754da-bd87-4cf5-89cc-1b9219133e1c)
-    (property "Reference" "#PWR0208" (id 0) (at 43.18 179.705 0)
+    (property "Reference" "#PWR0208" (id 0) (at 175.895 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 43.18 177.8 0))
-    (property "Footprint" "" (id 2) (at 43.18 173.355 0)
+    (property "Value" "GND" (id 1) (at 175.895 48.895 0))
+    (property "Footprint" "" (id 2) (at 175.895 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 43.18 173.355 0)
+    (property "Datasheet" "" (id 3) (at 175.895 44.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6e1e2555-79f3-4441-89eb-e4d27460539c))
diff --git a/mainboard/symbols.kicad_sym b/mainboard/symbols.kicad_sym
index 6f7b073..5c614de 100644
--- a/mainboard/symbols.kicad_sym
+++ b/mainboard/symbols.kicad_sym
@@ -353,7 +353,7 @@
     (property "Value" "ESP32-WROOM" (id 1) (at -3.81 34.29 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 0 -38.1 0)
+    (property "Footprint" "RF_Module:ESP32-WROOM-32U" (id 2) (at 0 -58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf" (id 3) (at 1.27 -50.8 0)
@@ -369,41 +369,41 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (symbol "ESP32-WROOM_0_1"
-      (rectangle (start -17.78 33.02) (end 19.05 -33.02)
+      (rectangle (start -17.78 33.02) (end 19.05 -55.88)
         (stroke (width 0.254) (type default) (color 0 0 0 0))
         (fill (type background))
       )
     )
     (symbol "ESP32-WROOM_1_1"
-      (pin power_in line (at 0 -35.56 90) (length 2.54)
+      (pin power_in line (at 0 -58.42 90) (length 2.54)
         (name "GND" (effects (font (size 1.27 1.27))))
         (number "1" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at -20.32 2.54 0) (length 2.54)
+      (pin bidirectional line (at -20.32 -10.16 0) (length 2.54)
         (name "IO25" (effects (font (size 1.27 1.27))))
         (number "10" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -26.67 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -50.8 180) (length 2.54)
         (name "I2S.BCK" (effects (font (size 1.27 1.27))))
         (number "11" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -29.21 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -53.34 180) (length 2.54)
         (name "I2S.LRCK" (effects (font (size 1.27 1.27))))
         (number "12" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at -20.32 -27.94 0) (length 2.54)
+      (pin bidirectional line (at -20.32 -50.8 0) (length 2.54)
         (name "JTAG.TMS" (effects (font (size 1.27 1.27))))
         (number "13" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at -20.32 -22.86 0) (length 2.54)
+      (pin bidirectional line (at -20.32 -45.72 0) (length 2.54)
         (name "JTAG.TDI" (effects (font (size 1.27 1.27))))
         (number "14" (effects (font (size 1.27 1.27))))
       )
-      (pin passive line (at 0 -35.56 90) (length 2.54) hide
+      (pin passive line (at 0 -58.42 90) (length 2.54) hide
         (name "GND" (effects (font (size 1.27 1.27))))
         (number "15" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at -20.32 -25.4 0) (length 2.54)
+      (pin bidirectional line (at -20.32 -48.26 0) (length 2.54)
         (name "JTAG.TCK" (effects (font (size 1.27 1.27))))
         (number "16" (effects (font (size 1.27 1.27))))
       )
@@ -435,19 +435,19 @@
         (name "SDI/SD1" (effects (font (size 1.27 1.27))))
         (number "22" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at -20.32 -30.48 0) (length 2.54)
+      (pin bidirectional line (at -20.32 -53.34 0) (length 2.54)
         (name "JTAG.TDO" (effects (font (size 1.27 1.27))))
         (number "23" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 11.43 180) (length 2.54)
+      (pin bidirectional line (at 21.59 5.08 180) (length 2.54)
         (name "I2C.SCL" (effects (font (size 1.27 1.27))))
         (number "24" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -21.59 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -45.72 180) (length 2.54)
         (name "BOOT/I2S.SCK" (effects (font (size 1.27 1.27))))
         (number "25" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 13.97 180) (length 2.54)
+      (pin bidirectional line (at 21.59 7.62 180) (length 2.54)
         (name "I2C.SDA" (effects (font (size 1.27 1.27))))
         (number "26" (effects (font (size 1.27 1.27))))
       )
@@ -459,7 +459,7 @@
         (name "IO17" (effects (font (size 1.27 1.27))))
         (number "28" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -24.13 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -48.26 180) (length 2.54)
         (name "I2S.DOUT" (effects (font (size 1.27 1.27))))
         (number "29" (effects (font (size 1.27 1.27))))
       )
@@ -467,11 +467,11 @@
         (name "EN" (effects (font (size 1.27 1.27))))
         (number "3" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 0 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -11.43 180) (length 2.54)
         (name "SPI.CLK" (effects (font (size 1.27 1.27))))
         (number "30" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -2.54 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -13.97 180) (length 2.54)
         (name "SPI.POCI" (effects (font (size 1.27 1.27))))
         (number "31" (effects (font (size 1.27 1.27))))
       )
@@ -479,7 +479,7 @@
         (name "NC" (effects (font (size 1.27 1.27))))
         (number "32" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -7.62 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -19.05 180) (length 2.54)
         (name "SPI.CS0" (effects (font (size 1.27 1.27))))
         (number "33" (effects (font (size 1.27 1.27))))
       )
@@ -491,35 +491,35 @@
         (name "UART.TX" (effects (font (size 1.27 1.27))))
         (number "35" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -10.16 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -21.59 180) (length 2.54)
         (name "SPI.CS1" (effects (font (size 1.27 1.27))))
         (number "36" (effects (font (size 1.27 1.27))))
       )
-      (pin bidirectional line (at 21.59 -5.08 180) (length 2.54)
+      (pin bidirectional line (at 21.59 -16.51 180) (length 2.54)
         (name "SPI.PICO" (effects (font (size 1.27 1.27))))
         (number "37" (effects (font (size 1.27 1.27))))
       )
-      (pin passive line (at 0 -35.56 90) (length 2.54) hide
+      (pin passive line (at 0 -58.42 90) (length 2.54) hide
         (name "GND" (effects (font (size 1.27 1.27))))
         (number "38" (effects (font (size 1.27 1.27))))
       )
-      (pin passive line (at 0 -35.56 90) (length 2.54) hide
+      (pin passive line (at 0 -58.42 90) (length 2.54) hide
         (name "GND" (effects (font (size 1.27 1.27))))
         (number "39" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -20.32 -10.16 0) (length 2.54)
+      (pin input line (at -20.32 -22.86 0) (length 2.54)
         (name "ADC1_CH0/NOINT" (effects (font (size 1.27 1.27))))
         (number "4" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -20.32 -5.08 0) (length 2.54)
+      (pin input line (at -20.32 -17.78 0) (length 2.54)
         (name "I39/NOINT" (effects (font (size 1.27 1.27))))
         (number "5" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -20.32 0 0) (length 2.54)
+      (pin input line (at -20.32 -12.7 0) (length 2.54)
         (name "I34" (effects (font (size 1.27 1.27))))
         (number "6" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -20.32 -2.54 0) (length 2.54)
+      (pin input line (at -20.32 -15.24 0) (length 2.54)
         (name "I35" (effects (font (size 1.27 1.27))))
         (number "7" (effects (font (size 1.27 1.27))))
       )
@@ -1087,6 +1087,145 @@
       )
     )
   )
+  (symbol "SD_Card" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+    (property "Reference" "J" (id 0) (at -16.51 13.97 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "SD_Card" (id 1) (at 15.24 -13.97 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (id 2) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://portal.fciconnect.com/Comergent//fci/drawing/10067847.pdf" (id 3) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "connector SD" (id 4) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "SD Card Reader" (id 5) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "SD*" (id 6) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "SD_Card_0_1"
+      (rectangle (start -8.89 -9.525) (end -6.35 -10.795)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 -6.985) (end -6.35 -8.255)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 -4.445) (end -6.35 -5.715)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 -1.905) (end -6.35 -3.175)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 0.635) (end -6.35 -0.635)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 3.175) (end -6.35 1.905)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 5.715) (end -6.35 4.445)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -8.89 8.255) (end -6.35 6.985)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (rectangle (start -7.62 10.795) (end -5.08 9.525)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type outline))
+      )
+      (polyline
+        (pts
+          (xy -10.16 8.89)
+          (xy -7.62 11.43)
+          (xy 20.32 11.43)
+          (xy 20.32 -11.43)
+          (xy -10.16 -11.43)
+          (xy -10.16 8.89)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type background))
+      )
+      (polyline
+        (pts
+          (xy 16.51 11.43)
+          (xy 16.51 12.7)
+          (xy -20.32 12.7)
+          (xy -20.32 -12.7)
+          (xy 16.51 -12.7)
+          (xy 16.51 -11.43)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+    )
+    (symbol "SD_Card_1_1"
+      (pin input line (at -22.86 3.81 0) (length 2.54)
+        (name "CD/DAT3" (effects (font (size 1.27 1.27))))
+        (number "1" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at 22.86 5.08 180) (length 2.54)
+        (name "CARD_DETECT" (effects (font (size 1.27 1.27))))
+        (number "10" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at 22.86 2.54 180) (length 2.54)
+        (name "WRITE_PROTECT" (effects (font (size 1.27 1.27))))
+        (number "11" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at 22.86 -2.54 180) (length 2.54)
+        (name "SHELL1" (effects (font (size 1.27 1.27))))
+        (number "12" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at 22.86 -5.08 180) (length 2.54)
+        (name "SHELL2" (effects (font (size 1.27 1.27))))
+        (number "13" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at -22.86 1.27 0) (length 2.54)
+        (name "CMD" (effects (font (size 1.27 1.27))))
+        (number "2" (effects (font (size 1.27 1.27))))
+      )
+      (pin power_in line (at 1.27 15.24 270) (length 2.54) hide
+        (name "VSS" (effects (font (size 1.27 1.27))))
+        (number "3" (effects (font (size 1.27 1.27))))
+      )
+      (pin power_in line (at 1.27 -15.24 90) (length 2.54)
+        (name "VDD" (effects (font (size 1.27 1.27))))
+        (number "4" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at -22.86 -1.27 0) (length 2.54)
+        (name "CLK" (effects (font (size 1.27 1.27))))
+        (number "5" (effects (font (size 1.27 1.27))))
+      )
+      (pin power_in line (at 1.27 15.24 270) (length 2.54)
+        (name "VSS" (effects (font (size 1.27 1.27))))
+        (number "6" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at -22.86 -3.81 0) (length 2.54)
+        (name "DAT0" (effects (font (size 1.27 1.27))))
+        (number "7" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at -22.86 -6.35 0) (length 2.54)
+        (name "DAT1" (effects (font (size 1.27 1.27))))
+        (number "8" (effects (font (size 1.27 1.27))))
+      )
+      (pin input line (at -22.86 6.35 0) (length 2.54)
+        (name "DAT2" (effects (font (size 1.27 1.27))))
+        (number "9" (effects (font (size 1.27 1.27))))
+      )
+    )
+  )
   (symbol "SJ-3566AN" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
     (property "Reference" "J" (id 0) (at -5.1054 5.7404 0)
       (effects (font (size 1.27 1.27)) (justify left bottom))