From d105c0596d9c1683c2212bce928568f0ec99e013 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Thu, 19 Jan 2023 07:37:21 +0100
Subject: Update schematic

---
 README-4m.md                          |    4 +-
 kicad-dart-70/anglian.kicad_sch       |  115 +-
 kicad-dart-70/baseband.kicad_sch      | 1857 ++++++++++++++++++++++++++++-----
 kicad-dart-70/control.kicad_sch       |  376 +------
 kicad-dart-70/kicad-dart-70.kicad_sch | 1031 +++++++++---------
 kicad-dart-70/lo_board.kicad_sch      |    6 +-
 6 files changed, 2255 insertions(+), 1134 deletions(-)

diff --git a/README-4m.md b/README-4m.md
index c963b76..7f52450 100644
--- a/README-4m.md
+++ b/README-4m.md
@@ -39,10 +39,12 @@ In 2023, the 70MHz band became accessible to amateurs in Switzerland. This offer
 
 ## To order
 
-* Adafruit 292 and an i2c display
 * Enclosure
 * Microphone MH34-B4B
 
+* Ordered:
+  * Adafruit 292 and 181
+
 ## TODO
 
 * Mixer termination
diff --git a/kicad-dart-70/anglian.kicad_sch b/kicad-dart-70/anglian.kicad_sch
index 1f8d98e..d7dcc25 100644
--- a/kicad-dart-70/anglian.kicad_sch
+++ b/kicad-dart-70/anglian.kicad_sch
@@ -6,7 +6,7 @@
 
   (title_block
     (title "DART-70 TRX")
-    (date "2023-01-15")
+    (date "2023-01-19")
     (rev "0")
     (company "HB9EGM")
     (comment 1 "A 4m Band SSB/CW Transceiver")
@@ -99,58 +99,60 @@
         )
       )
     )
-    (symbol "Device:CP1" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "C" (id 0) (at 0.635 2.54 0)
+    (symbol "Device:C_Polarized_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "C" (id 0) (at 0.254 1.778 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Device_CP1" (id 1) (at 0.635 -2.54 0)
+      (property "Value" "C_Polarized_Small" (id 1) (at 0.254 -2.032 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (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" "~" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "CP_*" (id 4) (at 0 0 0)
+      (property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "CP1_0_1"
-        (polyline
-          (pts
-            (xy -2.032 0.762)
-            (xy 2.032 0.762)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
+      (property "ki_description" "Polarized capacitor, small symbol" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "CP_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "C_Polarized_Small_0_1"
+        (rectangle (start -1.524 -0.3048) (end 1.524 -0.6858)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -1.524 0.6858) (end 1.524 0.3048)
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.778 2.286)
-            (xy -0.762 2.286)
+            (xy -1.27 1.524)
+            (xy -0.762 1.524)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.27 1.778)
-            (xy -1.27 2.794)
+            (xy -1.016 1.27)
+            (xy -1.016 1.778)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (arc (start 2.032 -1.27) (mid 0 -0.5572) (end -2.032 -1.27)
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
       )
-      (symbol "CP1_1_1"
-        (pin passive line (at 0 3.81 270) (length 2.794)
+      (symbol "C_Polarized_Small_1_1"
+        (pin passive line (at 0 2.54 270) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -3.81 90) (length 3.302)
+        (pin passive line (at 0 -2.54 90) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -1155,6 +1157,9 @@
   (junction (at 95.25 110.49) (diameter 0) (color 0 0 0 0)
     (uuid 0a2b5435-df6f-448f-96cd-9db62b5b9e70)
   )
+  (junction (at 50.8 81.28) (diameter 0) (color 0 0 0 0)
+    (uuid 0b25d221-9d72-4604-bf61-34d59b2fa091)
+  )
   (junction (at 172.72 74.93) (diameter 0) (color 0 0 0 0)
     (uuid 101131db-475d-4275-89d4-ac43ee9a25d5)
   )
@@ -1164,6 +1169,9 @@
   (junction (at 205.74 113.03) (diameter 0) (color 0 0 0 0)
     (uuid 12fc5fae-2589-481a-9c5c-1325ed3bb3b8)
   )
+  (junction (at 21.59 63.5) (diameter 0) (color 0 0 0 0)
+    (uuid 1475a7ba-e90f-4f27-b3da-978bb1abed03)
+  )
   (junction (at 251.46 120.65) (diameter 0) (color 0 0 0 0)
     (uuid 160dcd9c-7158-438b-b560-f70c0dcf13b1)
   )
@@ -1209,9 +1217,6 @@
   (junction (at 127 181.61) (diameter 0) (color 0 0 0 0)
     (uuid 4a87f15b-276a-46e9-af2c-bd6c86b489d7)
   )
-  (junction (at 62.23 180.34) (diameter 0) (color 0 0 0 0)
-    (uuid 54ce500e-2e6a-4454-858c-a16838109e49)
-  )
   (junction (at 215.9 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 6228b587-c759-4f5a-aee2-44d44c696a08)
   )
@@ -1695,7 +1700,7 @@
     (uuid 67f80db7-ac30-4dde-8bf8-915428d171ed)
   )
 
-  (wire (pts (xy 59.69 180.34) (xy 62.23 180.34))
+  (wire (pts (xy 59.69 180.34) (xy 73.66 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a784a31-50b5-4176-9ee4-0ad6fc9a1083)
   )
@@ -1719,6 +1724,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6d259b3b-196b-4e6b-acdf-fc3e09319776)
   )
+  (wire (pts (xy 50.8 63.5) (xy 50.8 81.28))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6d427db4-6e25-49e4-a454-3db69763ffde)
+  )
   (wire (pts (xy 163.83 194.31) (xy 156.21 194.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6f374e2b-ea34-4806-a08a-b249048582fa)
@@ -2057,6 +2066,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ce536418-0469-43d5-9a1a-c3f749bdbad3)
   )
+  (wire (pts (xy 39.37 63.5) (xy 50.8 63.5))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ce8c4757-2c8c-4ab0-a0b9-a8da9e671aec)
+  )
   (wire (pts (xy 95.25 119.38) (xy 95.25 128.27))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d32ff0d3-6db2-4544-ab69-6c0b14790da2)
@@ -2197,6 +2210,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc7f576b-4666-4925-9b9b-593266bd6324)
   )
+  (wire (pts (xy 21.59 63.5) (xy 31.75 63.5))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fd53ffa7-4582-4859-8124-9ad05ba5c66e)
+  )
   (wire (pts (xy 25.4 140.97) (xy 25.4 142.24))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fd71d7ce-19f7-411b-9f95-5e5cb5d86d98)
@@ -2210,10 +2227,6 @@
     (uuid fdc927f3-9ea5-4abb-b957-1dbde7dca836)
   )
 
-  (wire (pts (xy 62.23 180.34) (xy 73.66 180.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ff6ea876-d0b7-4ddc-9a97-0e89f95e4d56)
-  )
   (wire (pts (xy 201.93 138.43) (xy 209.55 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ffadf13e-d327-4e72-a129-20b1a691d829)
@@ -4850,7 +4863,25 @@
     (pin "1" (uuid d9e06877-b0dc-4557-b386-858bf93a9c86))
   )
 
-  (symbol (lib_id "Device:CP1") (at 62.23 184.15 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 35.56 63.5 270) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 432e492c-0aac-4bc0-9e78-77ecc2e45463)
+    (property "Reference" "R?" (id 0) (at 35.56 57.15 90))
+    (property "Value" "DNF" (id 1) (at 35.56 59.69 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 35.56 61.722 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 35.56 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 35.56 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3035f704-c453-435e-9ec7-d1505aa26334))
+    (pin "2" (uuid 6791f041-afe9-4be7-8fcd-49d490dfd757))
+  )
+
+  (symbol (lib_id "Device:C_Polarized_Small") (at 62.23 184.15 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 581ef64e-068b-4be4-ade9-b9089c2cda0c)
     (property "Reference" "C?" (id 0) (at 65.151 182.9816 0)
@@ -5065,7 +5096,7 @@
     (pin "2" (uuid 23ef2b99-ad62-416a-9c38-9b6384f2e044))
   )
 
-  (symbol (lib_id "Device:CP1") (at 38.1 184.15 0) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 38.1 184.15 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 87a067de-fc4f-4687-bc0c-0b29075ee579)
     (property "Reference" "C?" (id 0) (at 41.021 182.9816 0)
@@ -5107,10 +5138,10 @@
     (property "Need_order" "1" (id 4) (at 127 176.53 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f191))
-    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702855))
-    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bb))
-    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f3))
+    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f192))
+    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702856))
+    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bc))
+    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f4))
     (pin "3" (uuid 9b925fef-487b-459e-9052-7ed52b246e00))
     (pin "4" (uuid 4dd8d222-278c-4ba8-bb99-ec3b286ddab6))
     (pin "5" (uuid aad8939c-a20d-4e45-a7dd-c89c64f6681f))
@@ -5293,10 +5324,10 @@
     (pin "2" (uuid 5dabd4b7-2bde-4cfc-bcc3-4c5174956ab9))
     (pin "7" (uuid 54769d81-8d4a-408c-8dbe-4eb9a520d457))
     (pin "8" (uuid 003279c6-b168-48c8-a141-55ed3fc1441b))
-    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d57))
-    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797024))
-    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b5))
-    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f7))
+    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d58))
+    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797025))
+    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b6))
+    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f8))
   )
 
   (symbol (lib_id "RF_Amplifier:BGA2869") (at 55.88 140.97 0) (unit 1)
diff --git a/kicad-dart-70/baseband.kicad_sch b/kicad-dart-70/baseband.kicad_sch
index 191e1c1..2a2207f 100644
--- a/kicad-dart-70/baseband.kicad_sch
+++ b/kicad-dart-70/baseband.kicad_sch
@@ -6,7 +6,7 @@
 
   (title_block
     (title "DART-70 TRX")
-    (date "2023-01-15")
+    (date "2023-01-19")
     (rev "0")
     (company "HB9EGM")
     (comment 1 "A 4m Band SSB/CW Transceiver")
@@ -1252,6 +1252,57 @@
         )
       )
     )
+    (symbol "Device:L" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "L" (id 0) (at -1.27 0 90)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "L" (id 1) (at 1.905 0 90)
+        (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" "inductor choke coil reactor magnetic" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Inductor" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Choke_* *Coil* Inductor_* L_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "L_0_1"
+        (arc (start 0 -2.54) (mid 0.635 -1.905) (end 0 -1.27)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0 -1.27) (mid 0.635 -0.635) (end 0 0)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0 0) (mid 0.635 0.635) (end 0 1.27)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (arc (start 0 1.27) (mid 0.635 1.905) (end 0 2.54)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "L_1_1"
+        (pin passive line (at 0 3.81 270) (length 1.27)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -3.81 90) (length 1.27)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Device:L_Core_Ferrite" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
       (property "Reference" "L" (id 0) (at -1.27 0 90)
         (effects (font (size 1.27 1.27)))
@@ -2110,6 +2161,135 @@
         )
       )
     )
+    (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "LD1117S33TR_SOT223" (id 1) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "REGULATOR LDO 3.3V" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT-223" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "LD1117S33TR_SOT223_0_1"
+        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "LD1117S33TR_SOT223_1_1"
+        (pin power_in line (at 0 -7.62 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_out line (at 7.62 0 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at -7.62 0 0) (length 2.54)
+          (name "VI" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Regulator_Linear:LD1117S50TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "LD1117S50TR_SOT223" (id 1) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "REGULATOR LDO 5.0V" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 5.0V, SOT-223" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "LD1117S50TR_SOT223_0_1"
+        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "LD1117S50TR_SOT223_1_1"
+        (pin power_in line (at 0 -7.62 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_out line (at 7.62 0 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at -7.62 0 0) (length 2.54)
+          (name "VI" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Regulator_Linear:LM1117-ADJ" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "LM1117-ADJ" (id 1) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "" (id 2) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm1117.pdf" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "linear regulator ldo adjustable positive" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "800mA Low-Dropout Linear Regulator, adjustable output, TO-220/TO-252/TO-263/SOT-223" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?223* TO?263* TO?252* TO?220*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "LM1117-ADJ_0_1"
+        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "LM1117-ADJ_1_1"
+        (pin input line (at 0 -7.62 90) (length 2.54)
+          (name "ADJ" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_out line (at 7.62 0 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at -7.62 0 0) (length 2.54)
+          (name "VI" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Transistor_BJT:BC856" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -2270,6 +2450,206 @@
         )
       )
     )
+    (symbol "Transistor_FET:IRF7309IPBF" (pin_names hide) (in_bom yes) (on_board yes)
+      (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "IRF7309IPBF" (id 1) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 5.08 -1.905 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 2.54 0 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
+      )
+      (property "ki_keywords" "Dual HEXFET N-Channel P-Channel MOSFET" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "3A Id, 30V Vds, Dual HEXFET MOSFET, SO-8" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOIC*3.9x4.9mm*P1.27mm*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "IRF7309IPBF_0_1"
+        (polyline
+          (pts
+            (xy 0.254 0)
+            (xy -2.54 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.254 1.905)
+            (xy 0.254 -1.905)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.762 -1.27)
+            (xy 0.762 -2.286)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.762 0.508)
+            (xy 0.762 -0.508)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.762 2.286)
+            (xy 0.762 1.27)
+          )
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 2.54)
+            (xy 2.54 1.778)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 -2.54)
+            (xy 2.54 0)
+            (xy 0.762 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.762 -1.778)
+            (xy 3.302 -1.778)
+            (xy 3.302 1.778)
+            (xy 0.762 1.778)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 1.651 0) (radius 2.794)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (circle (center 2.54 -1.778) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (circle (center 2.54 1.778) (radius 0.254)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+      )
+      (symbol "IRF7309IPBF_1_1"
+        (polyline
+          (pts
+            (xy 1.016 0)
+            (xy 2.032 0.381)
+            (xy 2.032 -0.381)
+            (xy 1.016 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (polyline
+          (pts
+            (xy 2.794 0.508)
+            (xy 2.921 0.381)
+            (xy 3.683 0.381)
+            (xy 3.81 0.254)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.302 0.381)
+            (xy 2.921 -0.254)
+            (xy 3.683 -0.254)
+            (xy 3.302 0.381)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (pin passive line (at 2.54 -5.08 90) (length 2.54)
+          (name "S" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -5.08 0 0) (length 2.54)
+          (name "G" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54) hide
+          (name "D" (effects (font (size 1.27 1.27))))
+          (number "7" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54)
+          (name "D" (effects (font (size 1.27 1.27))))
+          (number "8" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "IRF7309IPBF_2_1"
+        (polyline
+          (pts
+            (xy 2.286 0)
+            (xy 1.27 0.381)
+            (xy 1.27 -0.381)
+            (xy 2.286 0)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (polyline
+          (pts
+            (xy 2.794 -0.508)
+            (xy 2.921 -0.381)
+            (xy 3.683 -0.381)
+            (xy 3.81 -0.254)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.302 -0.381)
+            (xy 2.921 0.254)
+            (xy 3.683 0.254)
+            (xy 3.302 -0.381)
+          )
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (pin passive line (at 2.54 -5.08 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin input line (at -5.08 0 0) (length 2.54)
+          (name "G" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 5.08 270) (length 2.54) hide
+          (name "D" (effects (font (size 1.27 1.27))))
+          (number "5" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 2.54 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 "Transistor_FET:MMBFJ113" (pin_names hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -2804,11 +3184,11 @@
         )
       )
     )
-    (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "power:+12V" (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)
       )
-      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
+      (property "Value" "+12V" (id 1) (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -2817,13 +3197,13 @@
       (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)
+      (property "ki_keywords" "global power" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+12V\"" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "+3.3V_0_1"
+      (symbol "+12V_0_1"
         (polyline
           (pts
             (xy -0.762 1.27)
@@ -2849,9 +3229,9 @@
           (fill (type none))
         )
       )
-      (symbol "+3.3V_1_1"
+      (symbol "+12V_1_1"
         (pin power_in line (at 0 0 90) (length 0) hide
-          (name "+3V3" (effects (font (size 1.27 1.27))))
+          (name "+12V" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
       )
@@ -2904,6 +3284,9 @@
   (junction (at 160.02 52.07) (diameter 0) (color 0 0 0 0)
     (uuid 00fc8e1e-afda-4f91-b2e2-9d2566fc305b)
   )
+  (junction (at 264.16 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 011a436e-0946-41fa-b91c-55c2b65df974)
+  )
   (junction (at 171.45 200.66) (diameter 0) (color 0 0 0 0)
     (uuid 027f19f3-a3d5-4daa-a96e-c5d9a71c1df8)
   )
@@ -2922,6 +3305,9 @@
   (junction (at 389.89 212.09) (diameter 0) (color 0 0 0 0)
     (uuid 0964d962-846f-4609-b657-83d8fae25141)
   )
+  (junction (at 220.98 260.35) (diameter 0) (color 0 0 0 0)
+    (uuid 09793875-04e4-42e7-a807-bec9f1bbc62c)
+  )
   (junction (at 139.7 166.37) (diameter 0) (color 0 0 0 0)
     (uuid 0a639b6c-6bcd-49c1-9a6e-7344d47860d2)
   )
@@ -2934,6 +3320,9 @@
   (junction (at 254 195.58) (diameter 0) (color 0 0 0 0)
     (uuid 14ec63df-7ba1-4b31-a4a0-7e767d727f16)
   )
+  (junction (at 168.91 260.35) (diameter 0) (color 0 0 0 0)
+    (uuid 156e2b24-f0a1-4973-a068-7f546ffbe564)
+  )
   (junction (at 38.1 78.74) (diameter 0) (color 0 0 0 0)
     (uuid 173f5655-a774-48b9-985b-3b9523888334)
   )
@@ -2946,6 +3335,9 @@
   (junction (at 176.53 154.305) (diameter 0) (color 0 0 0 0)
     (uuid 1901071a-701e-48b3-9650-22696abf77c4)
   )
+  (junction (at 226.06 280.67) (diameter 0) (color 0 0 0 0)
+    (uuid 19f74eef-445e-4a84-994a-96eca02b0f00)
+  )
   (junction (at 46.99 26.67) (diameter 0) (color 0 0 0 0)
     (uuid 1a164a1f-45a6-43b7-9b64-349463c23d37)
   )
@@ -2958,6 +3350,9 @@
   (junction (at 185.42 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 1c038126-c738-4381-b698-5c33c4341ae8)
   )
+  (junction (at 287.02 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 1c46c841-ad1d-4718-b844-a412bf398725)
+  )
   (junction (at 152.4 139.7) (diameter 0) (color 0 0 0 0)
     (uuid 1cfd82c6-a842-46ad-8b6f-e039805269e2)
   )
@@ -2967,12 +3362,18 @@
   (junction (at 68.58 138.43) (diameter 0) (color 0 0 0 0)
     (uuid 1df28245-4758-4aa6-85a4-669f880421f4)
   )
+  (junction (at 254 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 20363219-4404-4716-af4a-18fba058c6ec)
+  )
   (junction (at 105.41 278.13) (diameter 0) (color 0 0 0 0)
     (uuid 210630ed-a720-499f-8ec9-3630627e1e05)
   )
   (junction (at 149.86 170.18) (diameter 0) (color 0 0 0 0)
     (uuid 222d63d3-68ff-4a04-b7c3-6efd5c4ab9e1)
   )
+  (junction (at 218.44 257.81) (diameter 0) (color 0 0 0 0)
+    (uuid 22999b9a-4a23-42e3-adce-20d0d27a4153)
+  )
   (junction (at 44.45 68.58) (diameter 0) (color 0 0 0 0)
     (uuid 22f086a0-4e36-4832-8e1e-3bdb65f5c3f2)
   )
@@ -2988,6 +3389,9 @@
   (junction (at 83.82 128.27) (diameter 0) (color 0 0 0 0)
     (uuid 27eaad48-6f2d-40af-b26c-f1f52c055ea8)
   )
+  (junction (at 190.5 267.97) (diameter 0) (color 0 0 0 0)
+    (uuid 2867345a-2f06-474b-a035-5c5ed9cef1f3)
+  )
   (junction (at 281.94 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 29679519-0074-4244-8bb1-857f21221a1a)
   )
@@ -3003,14 +3407,17 @@
   (junction (at 317.5 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 2ee50ef4-e14b-4cdd-b277-09dbc703d671)
   )
+  (junction (at 331.47 114.3) (diameter 0) (color 0 0 0 0)
+    (uuid 2f5a9a75-f401-4282-94e9-6b82722ef2fb)
+  )
   (junction (at 300.99 100.33) (diameter 0) (color 0 0 0 0)
     (uuid 335263d3-7e35-4a9c-83c2-cd71d45f0688)
   )
   (junction (at 55.88 107.95) (diameter 0) (color 0 0 0 0)
     (uuid 33db3197-3c0b-42f2-b18d-c5f4fadafecf)
   )
-  (junction (at 354.33 212.09) (diameter 0) (color 0 0 0 0)
-    (uuid 3b2c73f9-53a3-4765-953c-46e211379622)
+  (junction (at 180.34 276.86) (diameter 0) (color 0 0 0 0)
+    (uuid 37d317e8-e78c-475a-81f1-fe8568d6df88)
   )
   (junction (at 170.18 170.18) (diameter 0) (color 0 0 0 0)
     (uuid 3bd6009a-f48b-4c66-92de-4d24549b4c7d)
@@ -3018,9 +3425,6 @@
   (junction (at 194.31 59.69) (diameter 0) (color 0 0 0 0)
     (uuid 3bf0f30a-4c02-4011-9e56-5268cd9a18bc)
   )
-  (junction (at 271.78 66.04) (diameter 0) (color 0 0 0 0)
-    (uuid 3c3ec9ea-2f3e-4d19-9e10-895079fd0f3f)
-  )
   (junction (at 146.05 20.32) (diameter 0) (color 0 0 0 0)
     (uuid 3e9deac2-8e86-484c-b76a-a334d0715f66)
   )
@@ -3036,6 +3440,9 @@
   (junction (at 71.12 267.97) (diameter 0) (color 0 0 0 0)
     (uuid 460147d8-e4b6-4910-88e9-07d1ddd6c2df)
   )
+  (junction (at 180.34 267.97) (diameter 0) (color 0 0 0 0)
+    (uuid 47f9999a-c332-45e0-8094-3e1c321e7041)
+  )
   (junction (at 76.2 138.43) (diameter 0) (color 0 0 0 0)
     (uuid 49cc8c43-5c55-4202-ae4f-37f234578cb7)
   )
@@ -3051,6 +3458,9 @@
   (junction (at 143.51 -16.51) (diameter 0) (color 0 0 0 0)
     (uuid 578f33ff-8d12-4136-bb61-e55b7655fa5b)
   )
+  (junction (at 259.08 267.97) (diameter 0) (color 0 0 0 0)
+    (uuid 57f87f8b-2a84-4bc0-bc49-8f95c5b3f805)
+  )
   (junction (at 161.29 154.305) (diameter 0) (color 0 0 0 0)
     (uuid 5823e780-c4ed-4da5-be38-6b405f0da66a)
   )
@@ -3078,6 +3488,9 @@
   (junction (at 146.05 72.39) (diameter 0) (color 0 0 0 0)
     (uuid 611c0051-64b3-4ff6-b51a-6ea814324060)
   )
+  (junction (at 251.46 273.05) (diameter 0) (color 0 0 0 0)
+    (uuid 6135248d-3e4b-4db3-9848-78637d8559e5)
+  )
   (junction (at 317.5 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 62cd3edc-a5f4-4820-bbe7-c3279ef20997)
   )
@@ -3087,13 +3500,16 @@
   (junction (at 243.84 195.58) (diameter 0) (color 0 0 0 0)
     (uuid 666e4a05-1237-4554-b21f-427292bd8e37)
   )
+  (junction (at 294.64 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 6f51e825-b7ea-4002-9a08-5309e9da082d)
+  )
   (junction (at 375.92 194.31) (diameter 0) (color 0 0 0 0)
     (uuid 707b1436-6255-4e74-ac3c-e365f258d4c7)
   )
   (junction (at 72.39 85.09) (diameter 0) (color 0 0 0 0)
     (uuid 711716b4-cb3c-40a8-915f-7a9cd1c1a345)
   )
-  (junction (at -55.88 204.47) (diameter 0) (color 0 0 0 0)
+  (junction (at -22.225 118.11) (diameter 0) (color 0 0 0 0)
     (uuid 7167e0fb-15b0-446d-969c-ecf63e50097d)
   )
   (junction (at 43.18 46.99) (diameter 0) (color 0 0 0 0)
@@ -3120,6 +3536,9 @@
   (junction (at 375.92 167.64) (diameter 0) (color 0 0 0 0)
     (uuid 87de6167-efcd-419e-8646-4ba5a69ecc7b)
   )
+  (junction (at 180.34 243.84) (diameter 0) (color 0 0 0 0)
+    (uuid 89247f47-3cb7-4830-ae32-df6510d5ee3d)
+  )
   (junction (at 138.43 20.32) (diameter 0) (color 0 0 0 0)
     (uuid 89924c9d-894c-4783-bb98-91fe4fffc426)
   )
@@ -3129,9 +3548,15 @@
   (junction (at 387.35 222.25) (diameter 0) (color 0 0 0 0)
     (uuid 8d612602-5cc8-45dd-a943-2a29be4b9ede)
   )
+  (junction (at 273.05 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 8ef9c464-a7ef-4d6e-a5b3-7519626359b8)
+  )
   (junction (at 337.82 203.2) (diameter 0) (color 0 0 0 0)
     (uuid 8f57152a-781e-4e8e-b36c-e81f9a864e3b)
   )
+  (junction (at 312.42 100.33) (diameter 0) (color 0 0 0 0)
+    (uuid 8fd35ceb-d608-4169-ae56-e892681304a9)
+  )
   (junction (at 252.73 207.01) (diameter 0) (color 0 0 0 0)
     (uuid 900aee6e-8ffc-4f8c-8a6e-d8e7689e7086)
   )
@@ -3141,6 +3566,12 @@
   (junction (at 33.02 63.5) (diameter 0) (color 0 0 0 0)
     (uuid 9134413a-edf3-40ce-9ec2-93a536746842)
   )
+  (junction (at 323.85 107.95) (diameter 0) (color 0 0 0 0)
+    (uuid 91457257-a033-494c-9a78-37438f01d7e6)
+  )
+  (junction (at 254 260.35) (diameter 0) (color 0 0 0 0)
+    (uuid 91e8115a-7736-40ac-9e97-e04f02b557b4)
+  )
   (junction (at 325.12 48.26) (diameter 0) (color 0 0 0 0)
     (uuid 92648d78-a89e-450a-9d5a-f375414e510f)
   )
@@ -3159,6 +3590,9 @@
   (junction (at 72.39 26.67) (diameter 0) (color 0 0 0 0)
     (uuid 994aaeb0-a945-4297-8f22-64b15ec2470b)
   )
+  (junction (at 218.44 273.05) (diameter 0) (color 0 0 0 0)
+    (uuid 9d896c5e-b976-408e-b134-f2c82b8bc7d8)
+  )
   (junction (at 146.05 34.29) (diameter 0) (color 0 0 0 0)
     (uuid a4ec02e9-e140-4dcc-958f-47f7624526cb)
   )
@@ -3168,6 +3602,9 @@
   (junction (at 351.79 93.98) (diameter 0) (color 0 0 0 0)
     (uuid a65cad0c-0ef1-4ea5-a965-4eae7ac1f6af)
   )
+  (junction (at 326.39 214.63) (diameter 0) (color 0 0 0 0)
+    (uuid a69f72c8-ce0f-4293-bf44-c6832495c836)
+  )
   (junction (at 349.25 167.64) (diameter 0) (color 0 0 0 0)
     (uuid a7cad282-51c3-4f24-be5e-311c2c5e959b)
   )
@@ -3204,6 +3641,9 @@
   (junction (at 146.05 59.69) (diameter 0) (color 0 0 0 0)
     (uuid b0bd599f-5320-4de4-9844-b1248597f45d)
   )
+  (junction (at 170.18 236.22) (diameter 0) (color 0 0 0 0)
+    (uuid b281e7d4-7e97-4f4d-9e21-25051359c6dd)
+  )
   (junction (at 354.33 208.28) (diameter 0) (color 0 0 0 0)
     (uuid b2c93e47-1b35-4bce-b217-c95c59af9fea)
   )
@@ -3222,6 +3662,9 @@
   (junction (at 175.26 154.305) (diameter 0) (color 0 0 0 0)
     (uuid b7b19b43-333b-4f4a-a3cd-98293e66d1bd)
   )
+  (junction (at 255.27 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid b974b18d-6aad-4744-a147-c191f944f8b5)
+  )
   (junction (at 363.22 167.64) (diameter 0) (color 0 0 0 0)
     (uuid b9f8b708-1745-43ec-9646-59495cbc6e07)
   )
@@ -3240,6 +3683,12 @@
   (junction (at 72.39 36.83) (diameter 0) (color 0 0 0 0)
     (uuid bdd38f4a-d1f5-49ea-86a0-7074369f7406)
   )
+  (junction (at 190.5 260.35) (diameter 0) (color 0 0 0 0)
+    (uuid be592d1e-8ffd-4836-a215-bf64f6c90c25)
+  )
+  (junction (at 335.28 214.63) (diameter 0) (color 0 0 0 0)
+    (uuid beaa9122-a0f4-4e99-96b3-048878d69672)
+  )
   (junction (at 389.89 245.11) (diameter 0) (color 0 0 0 0)
     (uuid bff74fb8-2e53-4140-9d30-8bb9b336dda4)
   )
@@ -3324,8 +3773,8 @@
   (junction (at 218.44 36.83) (diameter 0) (color 0 0 0 0)
     (uuid ecba702e-9fb5-4bd7-9b08-5197492ec54b)
   )
-  (junction (at 264.16 66.04) (diameter 0) (color 0 0 0 0)
-    (uuid f056ea50-55b1-41e7-b494-b5d2ecc55c1b)
+  (junction (at 259.08 280.67) (diameter 0) (color 0 0 0 0)
+    (uuid f0c9e29f-2093-40f8-ad83-65950690bff8)
   )
   (junction (at 358.14 129.54) (diameter 0) (color 0 0 0 0)
     (uuid f0f3907b-44e3-4106-9f24-d8ce836b6bb0)
@@ -3333,6 +3782,9 @@
   (junction (at 200.66 20.32) (diameter 0) (color 0 0 0 0)
     (uuid f1a9e2a2-6347-4852-b335-cf8402c433a4)
   )
+  (junction (at 226.06 267.97) (diameter 0) (color 0 0 0 0)
+    (uuid f2675a33-3eb0-43f0-a7ad-d9a72da20dfd)
+  )
   (junction (at 311.15 57.15) (diameter 0) (color 0 0 0 0)
     (uuid f3285ed9-855d-4b3c-9145-ed9dbda7a1d9)
   )
@@ -3362,11 +3814,7 @@
   )
 
   (no_connect (at 107.95 231.14) (uuid 2b99a1e6-5f67-436f-9ed5-38e8bfd4c142))
-  (no_connect (at 80.01 238.76) (uuid 382f6523-39c3-438d-a8ea-2e19bf34dd0b))
-  (no_connect (at 138.43 238.76) (uuid 6233d005-eb70-4c19-96e7-6812a42d8ac4))
-  (no_connect (at 80.01 248.92) (uuid 6b3a4c26-900d-494c-ad91-86b75f9a6237))
   (no_connect (at 115.57 43.18) (uuid afdb3662-3196-4d9d-b0e8-7f416bb5cd4f))
-  (no_connect (at 138.43 248.92) (uuid e98f509c-3ea1-4963-8ff6-1a9fffffbcb3))
   (no_connect (at 110.49 231.14) (uuid ee08a6c2-528a-478b-9089-08fe9a37ec7e))
 
   (wire (pts (xy 138.43 20.32) (xy 138.43 25.4))
@@ -3393,6 +3841,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 027fc545-8a42-4646-8424-467711418116)
   )
+  (wire (pts (xy 168.91 260.35) (xy 168.91 261.62))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0296200c-3bc7-4fee-847e-68ee39738c3c)
+  )
   (wire (pts (xy 170.18 200.66) (xy 157.48 200.66))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 035d062f-f875-4853-8ca1-a348c3967bb1)
@@ -3421,6 +3873,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 082d865b-0a4e-49c3-b18b-be47fd4a465a)
   )
+  (wire (pts (xy 218.44 257.81) (xy 218.44 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 0910a9d6-8d2a-4d96-a8df-8a28ac240ef0)
+  )
   (wire (pts (xy 373.38 111.76) (xy 373.38 121.92))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 09321bf4-1ea1-49b5-b1f9-ac29d6606a74)
@@ -3497,6 +3953,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 18723066-b973-43bf-8bbf-4c210121a928)
   )
+  (wire (pts (xy 180.34 274.32) (xy 180.34 276.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 18c820d5-32a9-457f-9915-e42ed0717894)
+  )
   (wire (pts (xy 157.48 191.77) (xy 149.86 191.77))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 19a56892-f9d5-4508-ab75-59721c555275)
@@ -3513,10 +3973,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1a9f0d73-6986-450b-8da5-dca8d718cd0d)
   )
+  (wire (pts (xy 307.34 114.3) (xy 314.96 114.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1ba95a3c-564d-4bb8-9f37-02aa1152af73)
+  )
   (wire (pts (xy 27.94 87.63) (xy 33.02 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1bc5b33c-8495-490e-9374-d1f85e319858)
   )
+  (wire (pts (xy 254 76.2) (xy 255.27 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1bc9344c-cee8-4e6e-b589-3c38ff897525)
+  )
+  (wire (pts (xy 168.91 266.7) (xy 168.91 276.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 1c617e69-04d5-47df-9392-70db7da3169f)
+  )
   (wire (pts (xy 134.62 278.13) (xy 147.32 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1d8cbdb8-b0d5-4f06-84c8-05770b7e9555)
@@ -3549,6 +4021,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2163a967-be2d-4344-a94d-f1b8da3dc3a3)
   )
+  (wire (pts (xy 316.23 100.33) (xy 312.42 100.33))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 219ed590-c887-4a37-b8cf-2c9225c6d07e)
+  )
   (wire (pts (xy 139.7 177.8) (xy 139.7 166.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 21a5d817-fc98-4bb3-9855-c8710ef862db)
@@ -3593,6 +4069,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 261eb6dc-d5dd-4e47-8bce-04c77069621a)
   )
+  (wire (pts (xy 168.91 276.86) (xy 180.34 276.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2708eeeb-a398-40be-9450-48b9683d9993)
+  )
   (wire (pts (xy 46.99 22.86) (xy 46.99 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 27937394-9bb7-48f6-a154-02c32eca1c67)
@@ -3609,6 +4089,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 29752e1f-ceb1-496b-a11e-902d7342a59b)
   )
+  (wire (pts (xy 326.39 214.63) (xy 335.28 214.63))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 29b8b23a-e7ee-4dc9-92e7-c3cadb119379)
+  )
   (wire (pts (xy 138.43 38.1) (xy 138.43 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2a63233b-a7a2-4c59-82c8-58a12efecada)
@@ -3633,6 +4117,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ba6a5e2-be81-4fda-a558-a7c1489b8584)
   )
+  (wire (pts (xy 100.33 232.41) (xy 100.33 238.76))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2bb91631-ebd1-41f4-8f02-7d20cea9a1ea)
+  )
   (wire (pts (xy 147.32 273.05) (xy 147.32 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2e6b1f7e-e4c3-43a1-ae90-c85aa40696d5)
@@ -3685,6 +4173,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 32d50c10-a20b-414f-afaf-7821cceaf33a)
   )
+  (wire (pts (xy 220.98 267.97) (xy 226.06 267.97))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 33538216-f790-439e-9526-a87a1495da39)
+  )
+  (wire (pts (xy 170.18 236.22) (xy 172.72 236.22))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 335b7472-6447-4c02-836d-5fe60e9b7c96)
+  )
   (wire (pts (xy 317.5 241.3) (xy 317.5 242.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 33891c62-a79f-4243-b776-6be292690ac3)
@@ -3729,9 +4225,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 36696ac6-2db1-4b52-ae3d-9f3c89d2042f)
   )
-  (wire (pts (xy 118.11 243.84) (xy 115.57 243.84))
+  (wire (pts (xy 398.78 245.11) (xy 403.86 245.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 375d04a8-729d-413e-9e4b-c6d3e964ed5f)
+    (uuid 37f9ff9e-4ac0-495a-8616-d843451c132e)
   )
   (wire (pts (xy 168.91 154.305) (xy 175.26 154.305))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -3758,10 +4254,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3c11bba2-1b60-442e-87b9-29fc89c74881)
   )
-  (wire (pts (xy 353.06 212.09) (xy 354.33 212.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 3cb9e3f7-2481-4b06-b1c0-7c25e9a55f54)
-  )
   (wire (pts (xy 24.13 53.34) (xy 25.4 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3ccaef01-74e6-4115-959d-fbd093047018)
@@ -3802,6 +4294,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 421e1cc2-36a4-4dea-b009-97c228e970dc)
   )
+  (wire (pts (xy 331.47 114.3) (xy 331.47 139.7))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 42283845-0e2f-427a-8c2c-6038060b03f2)
+  )
   (wire (pts (xy 72.39 46.99) (xy 72.39 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 426d408a-ed40-43b4-b8c5-0e2c5087c1f6)
@@ -3815,10 +4311,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 437cfd94-f586-4649-a4a7-54b6265ccf76)
   )
+  (wire (pts (xy 251.46 257.81) (xy 218.44 257.81))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 43e3cf72-6616-4aee-b799-f1624c5c9d0b)
+  )
   (wire (pts (xy 161.29 124.46) (xy 176.53 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 43f8ddbb-496d-432f-bf80-5425934c5b4a)
   )
+  (wire (pts (xy 254 267.97) (xy 259.08 267.97))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 446ed599-1255-448b-8f5f-1d5167e0101e)
+  )
   (wire (pts (xy 102.87 68.58) (xy 113.03 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 44df90bf-029f-4262-a166-22df8e216390)
@@ -3888,6 +4392,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4d49a0aa-f132-4d9a-8008-eb3731d0492a)
   )
+  (wire (pts (xy 180.34 276.86) (xy 190.5 276.86))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 4d8ec885-8c89-49c3-9ed8-3855ea185705)
+  )
   (wire (pts (xy 143.51 259.08) (xy 147.32 259.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 4e43689e-9cf0-4146-b69d-54896ee090d3)
@@ -3920,6 +4428,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 51294bad-a7d2-4fff-a653-b88def9fe12f)
   )
+  (wire (pts (xy 170.18 242.57) (xy 170.18 243.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 51590549-759a-4651-9186-44083dde7bc5)
+  )
   (wire (pts (xy 189.23 146.05) (xy 189.23 146.685))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 52052045-87ef-4086-81c8-2654d194b061)
@@ -4036,6 +4548,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6239967a-77bd-4ec9-89cd-e04efd8dbe26)
   )
+  (wire (pts (xy 248.92 273.05) (xy 251.46 273.05))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 63c8dfdf-4f33-4313-848f-7145ef2a1b7b)
+  )
   (polyline (pts (xy 222.25 16.51) (xy 222.25 15.24))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6441305e-3590-44d5-9ead-1c464ec62f7b)
@@ -4097,6 +4613,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6a3aff19-5e5c-466c-80b5-82ab994aaee1)
   )
+  (wire (pts (xy 180.34 267.97) (xy 180.34 269.24))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6b106e5c-70b7-4b68-995d-e382ed6fef7d)
+  )
   (wire (pts (xy 287.02 52.07) (xy 287.02 41.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6c86afcb-7177-47f2-8064-ed3be1ff755e)
@@ -4121,7 +4641,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6d53261f-b0db-4380-8d8d-078f89f10106)
   )
-  (wire (pts (xy 100.33 248.92) (xy 100.33 251.46))
+  (wire (pts (xy 100.33 246.38) (xy 100.33 251.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6de42070-f906-4f60-b26b-662ced81e4ea)
   )
@@ -4203,6 +4723,10 @@
     (uuid 77f63278-dd6a-44ad-be59-60e72c5a32f1)
   )
 
+  (wire (pts (xy 252.73 68.58) (xy 252.73 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7856e4af-4d0a-4b5b-94c2-377adae2ca75)
+  )
   (wire (pts (xy 135.89 48.26) (xy 167.64 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78e23870-9b05-480d-b825-f65c8269c89f)
@@ -4211,6 +4735,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 78fe6eb8-dca7-4226-852e-a2bfdac2f5c0)
   )
+  (wire (pts (xy 312.42 107.95) (xy 323.85 107.95))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7914d38b-5514-44ce-975e-317f89a52510)
+  )
   (wire (pts (xy 146.05 34.29) (xy 146.05 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 799a648d-a74f-4b59-8a8b-0e0f39382bba)
@@ -4227,6 +4755,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b75907b-b2ae-4362-89fa-d520339aaa5c)
   )
+  (wire (pts (xy 226.06 278.13) (xy 226.06 280.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 7bedf657-1467-440c-87df-09869c6b93a5)
+  )
   (wire (pts (xy 71.12 278.13) (xy 83.82 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7ce4aab5-8271-4432-a4b1-bff168293b45)
@@ -4243,6 +4775,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7f4b7c2c-9af8-4317-9338-c2a6d8990ded)
   )
+  (wire (pts (xy 252.73 66.04) (xy 255.27 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 805d85ad-98dd-43c2-b00f-c26005d39ef0)
+  )
   (wire (pts (xy 254 195.58) (xy 254 199.39))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 81033d98-1f01-43a2-bc17-f652715c6f6a)
@@ -4268,6 +4804,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 84315919-677c-4909-a747-2c92c96d5870)
   )
+  (wire (pts (xy 255.27 68.58) (xy 255.27 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 854d550d-32d3-47de-8c9b-d95bbb02f934)
+  )
   (wire (pts (xy 176.53 137.16) (xy 176.53 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 861d7de6-c9a6-4659-9603-ced588e84d17)
@@ -4321,6 +4861,10 @@
     (uuid 8a7f6552-d973-4f66-ba3a-dcd1ac0b119b)
   )
 
+  (wire (pts (xy 312.42 100.33) (xy 312.42 101.6))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 8bca5a24-0ffc-4d70-a218-cf5f004c16a9)
+  )
   (wire (pts (xy 317.5 46.99) (xy 317.5 48.26))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8c79c192-9f0e-4699-b9ba-2a8c6ba42712)
@@ -4361,6 +4905,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 924c390e-5803-4e82-8c1f-965993be53ba)
   )
+  (wire (pts (xy 190.5 267.97) (xy 190.5 269.24))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 92f5db95-d96c-4b78-aca1-4f0d76b9eba9)
+  )
+  (wire (pts (xy 314.96 114.3) (xy 331.47 114.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 93353994-48ea-495f-a15c-fd0818284554)
+  )
+  (wire (pts (xy 335.28 214.63) (xy 335.28 226.06))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 94015603-4c45-4e6f-857d-4641ab93cf7a)
+  )
   (polyline (pts (xy 222.25 16.51) (xy 222.25 71.12))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 944ed010-3de8-4cfe-831a-67ef38347180)
@@ -4370,6 +4926,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9466b2ad-bfe1-4ba3-940d-c7a4a7d0a89c)
   )
+  (wire (pts (xy 252.73 76.2) (xy 254 76.2))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 948477d6-f4ac-4978-a082-37fca96bc463)
+  )
   (wire (pts (xy 389.89 229.87) (xy 389.89 245.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9487770c-99b5-4716-99c4-4feb3cd37d3a)
@@ -4378,9 +4938,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 94e25012-d552-4148-9f26-d6096e3e0d16)
   )
-  (wire (pts (xy 102.87 243.84) (xy 102.87 231.14))
+  (wire (pts (xy 325.12 214.63) (xy 326.39 214.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9597bbc3-b09f-4bf0-9ed1-29b070d42b00)
+    (uuid 95f92d66-83b6-41f0-bf51-19ba94f13c27)
   )
   (wire (pts (xy 105.41 278.13) (xy 109.22 278.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -4394,10 +4954,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 986467b0-d1bf-47a1-a37e-86028f8e433e)
   )
-  (wire (pts (xy 100.33 243.84) (xy 102.87 243.84))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 989dd327-6425-4d60-9a69-dd59ee9f6f4c)
-  )
   (wire (pts (xy 63.5 60.96) (xy 63.5 63.5))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 98cb7198-8cdb-49b4-a229-90ca976d9604)
@@ -4430,11 +4986,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9b6c8d39-1c77-41a7-a65d-fd2dcab9608a)
   )
+  (wire (pts (xy 312.42 106.68) (xy 312.42 107.95))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 9bfaea3d-a45d-403f-a105-3a63453d5c92)
+  )
   (wire (pts (xy 71.12 267.97) (xy 74.93 267.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c0314b1-f82f-432d-95a0-65e191202552)
   )
-  (wire (pts (xy -55.88 195.58) (xy -55.88 196.85))
+  (wire (pts (xy -22.225 109.22) (xy -22.225 110.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9caefee8-6dcd-4815-b6e5-c75999fb9c90)
   )
@@ -4463,7 +5023,7 @@
     (uuid 9fd6d098-1128-4ceb-8d9e-00657ad9af26)
   )
 
-  (wire (pts (xy 118.11 251.46) (xy 118.11 248.92))
+  (wire (pts (xy 118.11 246.38) (xy 118.11 251.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9fd9c729-afbc-4d06-ad60-5dc91e23575e)
   )
@@ -4471,7 +5031,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a0cd6991-c54b-4b6c-adfc-0ca1b9236b7f)
   )
-  (wire (pts (xy 271.78 66.04) (xy 279.4 66.04))
+  (wire (pts (xy 294.64 66.04) (xy 302.26 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a115dc3b-1187-43e9-add5-00afa518554a)
   )
@@ -4496,10 +5056,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a20de0e7-dd28-42c8-b29a-5ac1168820dd)
   )
-  (wire (pts (xy 335.28 208.28) (xy 335.28 226.06))
+  (wire (pts (xy 335.28 208.28) (xy 335.28 214.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2e1f699-3a0b-465c-97ba-ad3dfae15c7a)
   )
+  (wire (pts (xy 115.57 241.3) (xy 115.57 231.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a2f5cea9-c4de-4e4c-b325-6a79612418d9)
+  )
   (wire (pts (xy 161.29 132.08) (xy 161.29 134.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a36ad366-0975-497f-b659-ecb398df4a05)
@@ -4512,6 +5076,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a3f168bf-fdef-4cd9-9a64-7266a3fb4fb1)
   )
+  (wire (pts (xy 190.5 257.81) (xy 190.5 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a41dda7b-b73f-4cbd-8925-77299e94d401)
+  )
   (wire (pts (xy 300.99 106.68) (xy 300.99 100.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a43f2e19-4e11-4e86-a12a-58a691d6df28)
@@ -4532,7 +5100,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a61d144c-677f-4293-ba9f-55e94b5186d6)
   )
-  (wire (pts (xy 354.33 212.09) (xy 354.33 214.63))
+  (wire (pts (xy 354.33 208.28) (xy 354.33 214.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a648e3ca-3bf9-4b8e-a5d4-83d111cd670f)
   )
@@ -4548,6 +5116,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a89ccff9-7439-4dcf-b5f8-bc9a867190cb)
   )
+  (wire (pts (xy 187.96 260.35) (xy 190.5 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a8c256d8-505f-4ddb-9968-c2d0742bbcbe)
+  )
   (wire (pts (xy 200.66 29.21) (xy 200.66 30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a96a2390-ef86-4195-bd41-db6c7129d162)
@@ -4580,14 +5152,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ab3efb7a-dd19-4e73-a69b-e9444687bdfc)
   )
-  (wire (pts (xy 100.33 232.41) (xy 100.33 238.76))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ab8a7200-1897-4c62-9c11-e0b3db1b1513)
-  )
   (wire (pts (xy 153.67 -16.51) (xy 152.4 -16.51))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid acb025c1-3784-47d1-b5e9-772bcda8c549)
   )
+  (wire (pts (xy 102.87 231.14) (xy 102.87 241.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ad67e606-86e4-4cf0-bde9-20a68b439d15)
+  )
   (wire (pts (xy 99.06 123.19) (xy 102.87 123.19))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ad69ac79-69ba-4e8b-902f-8779fa9808d0)
@@ -4650,6 +5222,10 @@
     (uuid b3e0b8c5-3cc5-4c64-a59d-7c4c52613b61)
   )
 
+  (wire (pts (xy 251.46 257.81) (xy 251.46 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b40641bd-5ffa-4b85-acd5-f26ee479a5f1)
+  )
   (wire (pts (xy 184.15 59.69) (xy 185.42 59.69))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4539792-8a34-4396-bc51-71446ff68c05)
@@ -4702,6 +5278,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b8e6eb49-83e5-473d-bc54-730e78dd5555)
   )
+  (wire (pts (xy 264.16 66.04) (xy 265.43 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid b8f1a4b9-8438-406e-8c65-626844907d15)
+  )
   (wire (pts (xy 72.39 29.21) (xy 72.39 26.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b974ed7e-d581-4d99-941f-e2d2b55029a9)
@@ -4742,13 +5322,13 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid be030c62-e776-405f-97d8-4a4c1aa2e428)
   )
-  (wire (pts (xy 196.85 121.92) (xy 196.85 124.46))
+  (wire (pts (xy 403.86 245.11) (xy 403.86 208.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid be587039-6e36-4e34-8702-3350f5fccd9f)
+    (uuid be499584-c258-47b6-b0e2-9526861ecef0)
   )
-  (wire (pts (xy 354.33 208.28) (xy 354.33 212.09))
+  (wire (pts (xy 196.85 121.92) (xy 196.85 124.46))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bf3d9004-c3bc-4f6d-8e38-d8893e8ea61d)
+    (uuid be587039-6e36-4e34-8702-3350f5fccd9f)
   )
   (wire (pts (xy 115.57 166.37) (xy 139.7 166.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -4802,10 +5382,14 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c201acc2-4657-4953-8314-8005b01e8999)
   )
-  (wire (pts (xy -55.88 204.47) (xy -45.72 204.47))
+  (wire (pts (xy -22.225 118.11) (xy -12.065 118.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c25b90aa-c787-46a1-8b80-e5b9fd45039a)
   )
+  (wire (pts (xy 259.08 278.13) (xy 259.08 280.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid c2d894c3-853c-4fd1-b569-a8d17341f4fe)
+  )
   (wire (pts (xy 162.56 144.78) (xy 161.29 144.78))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c339b7f7-fe73-4c78-92da-a2470bc8db79)
@@ -4826,10 +5410,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c6aa42b3-b911-4e5f-bedc-027557e7363b)
   )
-  (wire (pts (xy 331.47 114.3) (xy 331.47 139.7))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c6d0e6be-376d-4beb-9794-508920a2265a)
-  )
   (polyline (pts (xy 156.21 224.79) (xy 223.52 224.79))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c7305559-6527-4880-a1ea-8a5bed4c454a)
@@ -4843,14 +5423,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c7be7ce7-19ce-4a48-ae04-71b6b7b179dd)
   )
-  (wire (pts (xy 115.57 243.84) (xy 115.57 231.14))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c8289006-9b17-4a2b-bde7-de5b9a34c143)
-  )
-  (wire (pts (xy 314.96 114.3) (xy 331.47 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid ca2c6135-06b9-49ec-b90b-71e52fd66fd1)
-  )
   (wire (pts (xy 342.9 227.33) (xy 342.9 245.11))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ca6d9fd6-ee72-49d3-8ab2-ceb8842a871d)
@@ -4872,10 +5444,18 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cb6d1d3f-bcc0-4d03-a875-5bd1e3150e40)
   )
+  (wire (pts (xy 170.18 236.22) (xy 170.18 237.49))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cc3b3f4d-2cd5-4f43-a16b-ec940014d256)
+  )
   (wire (pts (xy 326.39 248.92) (xy 326.39 247.65))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc5561df-9d20-4574-af60-64f10025a0ed)
   )
+  (wire (pts (xy 215.9 273.05) (xy 218.44 273.05))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cc785fcf-6a94-4b39-95cf-a3f48b9eb59d)
+  )
   (wire (pts (xy 92.71 138.43) (xy 83.82 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cccb8dbc-521e-487e-a976-6ff7623e716a)
@@ -4924,6 +5504,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d017347c-cbb9-4df4-89ab-31f58a831157)
   )
+  (wire (pts (xy 180.34 267.97) (xy 190.5 267.97))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d0c48818-bcdc-4044-b83a-0739a9ebd1af)
+  )
   (wire (pts (xy 55.88 129.54) (xy 48.895 129.54))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d1750f94-6a37-49dc-b92e-66b81e0abbfa)
@@ -4956,11 +5540,15 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3db736b-0e33-4126-b950-5488923df40e)
   )
+  (wire (pts (xy 251.46 260.35) (xy 254 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d3f6a643-8a49-4a41-acd6-9b731566ee83)
+  )
   (wire (pts (xy 251.46 207.01) (xy 252.73 207.01))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d3fd96c3-0379-403f-99e1-e3d6e8baf4a6)
   )
-  (wire (pts (xy 356.87 208.28) (xy 354.33 208.28))
+  (wire (pts (xy 354.33 208.28) (xy 403.86 208.28))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d49d33a5-c0cd-4f05-819d-be9284b21a2e)
   )
@@ -4989,6 +5577,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d7de2887-c7b2-4bb7-a339-632f4f906224)
   )
+  (wire (pts (xy 170.18 243.84) (xy 180.34 243.84))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d91614f9-dcfa-46ef-b7e0-17f0e7b63757)
+  )
   (wire (pts (xy 364.49 227.33) (xy 372.11 227.33))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d9608da2-7b1f-4cc7-9967-bc764c4d1413)
@@ -5009,6 +5601,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc628a9d-67e8-4a03-b99f-8cc7a42af6ef)
   )
+  (wire (pts (xy 259.08 280.67) (xy 251.46 280.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid de0ccdf1-0c92-4039-bbb9-5f5c4011e873)
+  )
   (wire (pts (xy 175.26 154.305) (xy 176.53 154.305))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid df658d01-23b7-464c-a7fd-0e2850c0269f)
@@ -5041,6 +5637,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e315fb88-f764-4ec7-a92b-006692d5e26f)
   )
+  (wire (pts (xy 331.47 100.33) (xy 331.47 114.3))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e32bc01d-c124-4c23-91a5-4dff65a66e6b)
+  )
   (wire (pts (xy 43.18 68.58) (xy 44.45 68.58))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e3ee4c2d-8661-4b61-ab65-82613aa7516b)
@@ -5081,6 +5681,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e8e23712-f080-4685-ae22-9028780f7b13)
   )
+  (wire (pts (xy 218.44 257.81) (xy 190.5 257.81))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e95d2c3e-eb60-4348-a367-399438d2a3a3)
+  )
   (wire (pts (xy 266.7 57.15) (xy 266.7 52.07))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e9b9f6ca-b237-4bc6-befc-b08e2e73e1cf)
@@ -5089,6 +5693,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ea1db4a7-5abc-4c20-bc41-3709ee10916a)
   )
+  (wire (pts (xy 273.05 66.04) (xy 287.02 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid eae9bba3-1f17-4843-b087-a3f6bed03974)
+  )
   (wire (pts (xy 69.85 138.43) (xy 68.58 138.43))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eaffb089-acb7-48ee-a554-a6598bed3730)
@@ -5126,10 +5734,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ef74ecf3-988c-4f9b-b0d6-ab7b4dcf0ca0)
   )
-  (wire (pts (xy 307.34 114.3) (xy 314.96 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid efd79052-e146-4d61-9e0a-ba764a5a966b)
-  )
   (wire (pts (xy 160.02 27.94) (xy 160.02 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f033ea30-6ab8-4647-bfcd-8d41996ca1c8)
@@ -5166,6 +5770,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f4e70907-a1c3-46fd-9030-53a024452733)
   )
+  (wire (pts (xy 226.06 280.67) (xy 218.44 280.67))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f4ec20e2-4bad-4ce5-a96f-1d796ad3804a)
+  )
   (wire (pts (xy 297.18 139.7) (xy 292.1 139.7))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f5a54919-b960-48fc-8517-e9e32dce0bf0)
@@ -5178,9 +5786,17 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6b67fe8-cddc-463a-a9ee-225a85050a7f)
   )
+  (wire (pts (xy 172.72 260.35) (xy 168.91 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f78182c3-ea6c-4b31-a2d5-767a11aaabc9)
+  )
   (wire (pts (xy 152.4 154.305) (xy 161.29 154.305))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f78d3937-ee36-4321-858c-6da3d0c15cca)
+    (uuid f78d3937-ee36-4321-858c-6da3d0c15cca)
+  )
+  (wire (pts (xy 262.89 66.04) (xy 264.16 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid f7af03d3-e511-46bb-a87e-3f15adda81a7)
   )
   (wire (pts (xy 204.47 163.83) (xy 204.47 185.42))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -5215,6 +5831,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fb57d6ef-0554-4ce0-b3f0-a807b2bfd312)
   )
+  (wire (pts (xy 218.44 260.35) (xy 220.98 260.35))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fbbff3b4-9f25-4a3b-a8a8-5a9af7ce7714)
+  )
   (wire (pts (xy 212.09 163.83) (xy 204.47 163.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid fc57543f-533e-4006-b5b1-c734f93bf449)
@@ -5244,6 +5864,10 @@
     (uuid fe9130c2-6b56-4e7f-a82b-4f0c77013a03)
   )
 
+  (text "AF" (at 262.89 171.45 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 1933e5d3-79b3-43c6-a89a-0574e5a779e2)
+  )
   (text "In case the balance upsetting\nLO leakage trick doesn't work"
     (at -156.21 -21.59 0)
     (effects (font (size 0.9906 0.9906)) (justify left bottom))
@@ -5253,6 +5877,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3afae848-3ba1-40f3-a73d-cfa98c2ff8b2)
   )
+  (text "11.0592MHz" (at 233.68 54.61 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 3f454bf9-ae2c-4347-bdf0-3c7e952e3c85)
+  )
   (text "-4dB" (at 231.14 160.02 90)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 53c52b88-9076-4c97-ba49-4fe5c6aebbb8)
@@ -5265,16 +5893,20 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 673b2826-2598-46b3-8be9-1e7d41ba8534)
   )
-  (text "TODO\nXTAL filter match\nCalculate overall gain\nRecalculate all filters, make Chebychev\nDefine how to do CW\nAdditional switching for IF needed?\nVoltage reg for IF amps (hybrid cascode: 9V)\nMixer termination\nGain stage on 28MHz?\n\nDone\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
+  (text "TODO\nXTAL filter match\nCalculate overall gain.\nRecalculate all filters, make Chebychev\nDefine how to do CW\nAdditional switching for IF needed?\nMixer termination\n\n\nDone\nVoltage reg for IF amps (hybrid cascode: 9V)\nReplace mixers\nMic muting on RX\nLess clicky SPK muting\nRethink IF chain\nQER XTAL filter\nMove XTAL filter to header\nSeparate XTAL filter in/out better"
     (at -104.14 -41.91 0)
     (effects (font (size 3 3) bold) (justify left bottom))
     (uuid 74c68bd1-c5af-4a14-af9a-5d066dace5fa)
   )
+  (text "L-match at 11MHz\n50Ohms to 3.3k\nL=5.8uH\nC=35pF" (at 13.97 78.74 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 7618e653-e728-4f13-b1d9-72d4cf97951e)
+  )
   (text "2N3906?" (at 149.225 47.625 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 7d0468c4-cbd6-4dab-82cc-c1cf22a9ebe9)
   )
-  (text "Handle CW like the uBitx, in the 2nd mixer:\n The BFO as disabled\n The first oscillator is moved to the actual transmit frequency\n A DC bias is fed to the first mixer to upset the balance and allow the first oscillator to leak to the RF power chain.\n The CW sidetone is generated from the microcontroller and injected into the audio amplifier\n"
+  (text "Handle CW like the uBitx, in the 2nd mixer:\n The BFO as disabled\n The first oscillator is moved to the actual transmit frequency\n A DC bias is fed to the first mixer to upset the balance and allow the first oscillator to leak to the RF power chain.\n The CW sidetone is generated from the microcontroller and injected into the audio amplifier\n (On Picardy 2020, CW sidetone injection didn't work, used separate buzzer on STATUS LED instead)\n"
     (at -128.27 -16.51 0)
     (effects (font (size 1.1938 1.1938)) (justify left bottom))
     (uuid 9fbabfd5-5316-4dcb-8d99-3c53b9c69880)
@@ -5283,6 +5915,18 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid a7631389-fdfe-419d-a660-bf2d393960ca)
   )
+  (text "28MHz" (at 276.86 66.04 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid aa954f92-0020-477d-9dff-f0475813903a)
+  )
+  (text "11.0592MHz" (at 250.19 161.29 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid cb91052f-e5d9-4d7e-b787-f6cb22274e04)
+  )
+  (text "Diplexer" (at 261.62 69.85 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid d9381164-03df-4a08-9066-17eab5b599b1)
+  )
   (text "DNF if AGC derived from IF" (at 337.82 90.17 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e585d784-353a-431f-a9dd-c149d56c618e)
@@ -5308,17 +5952,21 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 3d8f631b-465f-4bf8-bace-c932576e1e42)
   )
-  (label "VAFAmp" (at 398.78 245.11 0)
+  (label "+9VA" (at 198.12 257.81 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 473257dd-231a-4c36-bf3d-e08cdead5ee6)
+  )
+  (label "+5VA" (at 187.96 236.22 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 4ca9c3f6-f02c-4a77-9ea4-558dd06a5507)
+    (uuid 73aa88f6-759d-4e4f-aec9-7db8ab3a547d)
   )
   (label "VAGC_IF" (at 203.2 93.98 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 9e024dbe-1421-41a3-ab2f-90ea3d932004)
   )
-  (label "VAFAmp" (at 339.09 208.28 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid da2cf79d-f7eb-4b89-a0b8-142f170ffdbc)
+  (label "+5VA" (at 317.5 214.63 180)
+    (effects (font (size 1.27 1.27)) (justify right bottom))
+    (uuid b82ebf0f-f109-4c62-b80f-28a8b49d5ffc)
   )
   (label "AGC_AF" (at 392.43 105.41 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
@@ -5339,18 +5987,11 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
-  (global_label "+8VRX" (shape input) (at 350.52 93.98 180) (fields_autoplaced)
+  (global_label "+VRX" (shape input) (at 350.52 93.98 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 478afa34-e0e2-4584-885c-121c8a802996)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 118.11 78.74 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-  (global_label "+5VA" (shape output) (at 364.49 208.28 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 68eeba0f-e40f-4bee-998c-386a9b77f9ea)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 135.89 187.96 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 342.9664 93.9006 0)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "+VRX_IF" (shape input) (at 44.45 22.86 180) (fields_autoplaced)
@@ -5367,6 +6008,13 @@
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
+  (global_label "+VTX" (shape output) (at 264.16 260.35 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 799485ec-781b-44d4-8de4-2ab569edbe93)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 271.4112 260.2706 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "+VTX_IF" (shape input) (at 217.17 99.06 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7e14b054-c309-47af-8c91-1312856253de)
@@ -5388,6 +6036,13 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
+  (global_label "+VRX" (shape output) (at 231.14 260.35 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 8ae8572e-43c9-4289-9ee2-4927f5ac45f2)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 238.6936 260.2706 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "+VRX_IF" (shape input) (at 123.19 20.32 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 95cc86a1-4e15-4231-b963-eac2c36fa688)
@@ -5395,10 +6050,10 @@
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
-  (global_label "+8VRX" (shape input) (at -55.88 195.58 0) (fields_autoplaced)
+  (global_label "+8VRX" (shape input) (at -22.225 109.22 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 9e2ad25e-29e1-4c10-8e33-16d30c4ff9b9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -247.65 87.63 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -213.995 1.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -5465,6 +6120,10 @@
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 51320c8c-9c4a-48b8-a7b8-e2c8d1f2e5ad)
   )
+  (hierarchical_label "EN_VTX" (shape input) (at 248.92 273.05 180)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid 6eac4e27-ce42-4863-92ee-64c39c8490ac)
+  )
   (hierarchical_label "MUTE_SPKR" (shape input) (at 317.5 231.14 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7147b342-4ca8-4694-a1ec-b615c151a5d0)
@@ -5473,7 +6132,11 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9a88d63d-f7e5-416d-9807-a8e942aef287)
   )
-  (hierarchical_label "HF" (shape bidirectional) (at 279.4 66.04 0)
+  (hierarchical_label "EN_VRX" (shape input) (at 215.9 273.05 180)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid a3040a93-9886-4bcd-884d-844f3af2f21e)
+  )
+  (hierarchical_label "HF" (shape bidirectional) (at 302.26 66.04 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid db86850d-044a-454c-9934-3c394c2264e6)
   )
@@ -5739,31 +6402,31 @@
     (pin "1" (uuid 8c98fed0-59cf-439c-9da3-211c5b1353e2))
   )
 
-  (symbol (lib_id "mpb:L_tapped") (at -38.1 180.34 0) (mirror y) (unit 1)
+  (symbol (lib_id "mpb:L_tapped") (at -4.445 93.98 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3ac9c4)
-    (property "Reference" "L?" (id 0) (at -39.4462 179.1716 0)
+    (property "Reference" "L?" (id 0) (at -5.7912 92.8116 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4.3uH" (id 1) (at -39.37 181.61 0)
+    (property "Value" "4.3uH" (id 1) (at -5.715 95.25 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37" (id 2) (at -38.1 180.34 0)
+    (property "Footprint" "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37" (id 2) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at -38.1 180.34 0)
+    (property "Datasheet" "~" (id 3) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Description" "38 loops on T37-6, 244pF, 132 Ohm, 54cm, tap at 19th" (id 4) (at -38.1 180.34 0)
+    (property "Description" "38 loops on T37-6, 244pF, 132 Ohm, 54cm, tap at 19th" (id 4) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "T37-6" (id 5) (at -38.1 180.34 0)
+    (property "MPN" "T37-6" (id 5) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 6) (at -38.1 180.34 0)
+    (property "Need_order" "" (id 6) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "OriginalValue" "" (id 7) (at -38.1 180.34 0)
+    (property "OriginalValue" "" (id 7) (at -4.445 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 44542c12-5049-4f9c-9ea6-fc7bc3291298))
@@ -5771,83 +6434,83 @@
     (pin "3" (uuid c5f7546f-3d61-4fdc-89c5-626dc23e29a6))
   )
 
-  (symbol (lib_id "Device:C_Trim_Small") (at -50.165 180.34 0) (mirror y) (unit 1)
+  (symbol (lib_id "Device:C_Trim_Small") (at -16.51 93.98 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3c1d83)
-    (property "Reference" "C?" (id 0) (at -52.4764 179.1716 0)
+    (property "Reference" "C?" (id 0) (at -18.8214 92.8116 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "60pF" (id 1) (at -52.4764 181.483 0)
+    (property "Value" "60pF" (id 1) (at -18.8214 95.123 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "picardy:C_trimmer_60pF" (id 2) (at -50.165 180.34 0)
+    (property "Footprint" "picardy:C_trimmer_60pF" (id 2) (at -16.51 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at -50.165 180.34 0)
+    (property "Datasheet" "~" (id 3) (at -16.51 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at -50.165 180.34 0)
+    (property "Need_order" "" (id 4) (at -16.51 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 91f42828-e21b-4428-97b0-17adf0fb7834))
     (pin "2" (uuid 9d8a1a98-caac-4a6c-b050-223399ba02d0))
   )
 
-  (symbol (lib_id "Device:R") (at -55.88 200.66 180) (unit 1)
+  (symbol (lib_id "Device:R") (at -22.225 114.3 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3d3887)
-    (property "Reference" "R?" (id 0) (at -54.102 199.4916 0)
+    (property "Reference" "R?" (id 0) (at -20.447 113.1316 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1k" (id 1) (at -54.102 201.803 0)
+    (property "Value" "1k" (id 1) (at -20.447 115.443 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at -54.102 200.66 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at -20.447 114.3 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at -55.88 200.66 0)
+    (property "Datasheet" "~" (id 3) (at -22.225 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at -55.88 200.66 0)
+    (property "Need_order" "" (id 4) (at -22.225 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8e2473dc-4259-4edf-ab8b-e6394fc237e0))
     (pin "2" (uuid 954b714a-913e-4a4f-ae77-4098665d5599))
   )
 
-  (symbol (lib_id "power:GNDA") (at -55.88 212.09 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at -22.225 125.73 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3d3ff0)
-    (property "Reference" "#PWR?" (id 0) (at -55.88 218.44 0)
+    (property "Reference" "#PWR?" (id 0) (at -22.225 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at -55.753 215.3158 90)
+    (property "Value" "GNDA" (id 1) (at -22.098 128.9558 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at -55.88 212.09 0)
+    (property "Footprint" "" (id 2) (at -22.225 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at -55.88 212.09 0)
+    (property "Datasheet" "" (id 3) (at -22.225 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4473ff63-4032-4263-ac4b-2570e6aee8fd))
   )
 
-  (symbol (lib_id "Device:C_Small") (at -43.18 204.47 270) (unit 1)
+  (symbol (lib_id "Device:C_Small") (at -9.525 118.11 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e3daff4)
-    (property "Reference" "C?" (id 0) (at -43.18 198.6534 90))
-    (property "Value" "10nF" (id 1) (at -43.18 200.9648 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at -43.18 204.47 0)
+    (property "Reference" "C?" (id 0) (at -9.525 112.2934 90))
+    (property "Value" "10nF" (id 1) (at -9.525 114.6048 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at -9.525 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at -43.18 204.47 0)
+    (property "Datasheet" "~" (id 3) (at -9.525 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at -43.18 204.47 0)
+    (property "MPN" "VJ0805A103KXJTBC" (id 4) (at -9.525 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at -43.18 204.47 0)
+    (property "Need_order" "" (id 5) (at -9.525 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5240f987-e4af-4679-94cb-4dec9fdc171e))
@@ -5943,7 +6606,7 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GNDA" (id 1) (at 304.2412 100.203 90)
-      (effects (font (size 1.27 1.27)) (justify right))
+      (effects (font (size 1.27 1.27)) (justify right) hide)
     )
     (property "Footprint" "" (id 2) (at 300.99 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -6331,10 +6994,14 @@
   )
 
   (symbol (lib_id "Device:C_Polarized_Small") (at 375.92 191.77 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 00000000-0000-0000-0000-00005e518d0f)
-    (property "Reference" "C?" (id 0) (at 381.635 191.77 90))
-    (property "Value" "1uF" (id 1) (at 379.3236 191.77 90))
+    (property "Reference" "C?" (id 0) (at 378.46 191.046 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "1uF" (id 1) (at 378.46 193.586 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
     (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 375.92 191.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -7199,22 +7866,22 @@
     (pin "1" (uuid e46d3258-4ce2-4c8c-9bbb-fda59079e226))
   )
 
-  (symbol (lib_id "mpb:BAT18") (at -55.88 208.28 90) (unit 1)
+  (symbol (lib_id "mpb:BAT18") (at -22.225 121.92 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9b8b08)
-    (property "Reference" "D?" (id 0) (at -53.8734 207.1116 90)
+    (property "Reference" "D?" (id 0) (at -20.2184 120.7516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "BAT18" (id 1) (at -53.8734 209.423 90)
+    (property "Value" "BAT18" (id 1) (at -20.2184 123.063 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at -57.15 208.28 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23_Handsoldering" (id 2) (at -23.495 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at -55.88 208.28 0)
+    (property "Datasheet" "~" (id 3) (at -22.225 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at -55.88 208.28 0)
+    (property "Need_order" "" (id 4) (at -22.225 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 72198350-e568-45e5-a76f-453ce4d49e73))
@@ -7322,22 +7989,6 @@
     (pin "1" (uuid cb1847cd-f860-493e-9675-0ebb968f12d9))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 307.34 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f0402fb)
-    (property "Reference" "#PWR?" (id 0) (at 307.34 118.11 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 307.721 109.9058 0))
-    (property "Footprint" "" (id 2) (at 307.34 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 307.34 114.3 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid eca3c34c-2693-4881-981f-5f8ecac6050b))
-  )
-
   (symbol (lib_id "Device:Crystal_Small") (at 128.27 267.97 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f098134)
@@ -7426,6 +8077,22 @@
     (pin "1" (uuid 8fe6fd81-b97e-4f91-89cc-5e1824c9f4e9))
   )
 
+  (symbol (lib_id "power:+12V") (at 170.18 236.22 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 03272278-e3db-4be6-8479-99758255fb4d)
+    (property "Reference" "#PWR?" (id 0) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+12V" (id 1) (at 170.18 231.14 0))
+    (property "Footprint" "" (id 2) (at 170.18 236.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 170.18 236.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 7919cee0-9a57-4b8e-81ee-6213341be0ff))
+  )
+
   (symbol (lib_id "power:GNDA") (at 209.55 64.77 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 05290e23-4b5d-4968-ab99-eef25ec0f2e2)
@@ -7491,6 +8158,31 @@
     (pin "2" (uuid cb71aa6a-dce7-4ae5-b1ab-7adcf3c2aa65))
   )
 
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 256.54 273.05 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 0af7ceb8-79f5-40d6-80a5-080f0b2b9e91)
+    (property "Reference" "Q?" (id 0) (at 262.89 273.0499 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "IRF7309IPBF" (id 1) (at 262.89 274.3199 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 261.62 274.955 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 259.08 273.05 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (pin "1" (uuid fa2c314d-b000-40a4-9210-b8c9ae296fd0))
+    (pin "2" (uuid 1d6c7775-5c7e-4aee-a347-054daeaff873))
+    (pin "7" (uuid 48281c26-0697-4656-b82e-809599b54164))
+    (pin "8" (uuid c19a46d2-e6db-4d0b-90a7-ffcc1da7234a))
+    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d57))
+    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797024))
+    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b5))
+    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f7))
+  )
+
   (symbol (lib_id "Device:R") (at 387.35 215.9 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0dd7dc15-3697-4cfb-b558-5c14c4701014)
@@ -7604,6 +8296,22 @@
     (pin "2" (uuid 833dbded-0b81-4655-9b7a-816815f21b74))
   )
 
+  (symbol (lib_id "power:+12V") (at 168.91 260.35 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 13f9cf6a-28ed-4a40-a578-742db0146f85)
+    (property "Reference" "#PWR?" (id 0) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+12V" (id 1) (at 168.91 255.27 0))
+    (property "Footprint" "" (id 2) (at 168.91 260.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 168.91 260.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fd44b571-f1aa-49c4-a617-82f845041f9f))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 80.01 55.88 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 143520c8-bae5-4a8c-98c7-9633bc8152fd)
@@ -7663,6 +8371,28 @@
     (pin "2" (uuid 830030d8-ad0e-48c4-a35c-5fe14717a1ac))
   )
 
+  (symbol (lib_id "Device:R") (at 220.98 264.16 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 14b1e175-dc82-4d81-b685-f4322b88a4e2)
+    (property "Reference" "R?" (id 0) (at 218.44 262.8899 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "12k" (id 1) (at 218.44 265.4299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 219.202 264.16 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 220.98 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 220.98 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a64717d7-d313-4173-aa05-beac5b55153c))
+    (pin "2" (uuid c548c963-5c91-4a12-b65d-6aefe39a4422))
+  )
+
   (symbol (lib_id "Device:R") (at 127 20.32 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 158d9815-0e3d-4623-8a00-b0d0b263d33d)
@@ -7685,7 +8415,7 @@
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 168ee993-6a85-48af-b8f8-0d87ada9138a)
     (property "Reference" "T?" (id 0) (at 251.4727 41.91 0))
-    (property "Value" "10t tri, 43" (id 1) (at 251.4727 44.45 0))
+    (property "Value" "10t tri, 43, or MABA-009488" (id 1) (at 251.4727 44.45 0))
     (property "Footprint" "" (id 2) (at 251.46 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -8042,6 +8772,24 @@
     (pin "2" (uuid f775ec71-a649-473c-ba87-e1810d29acd8))
   )
 
+  (symbol (lib_id "power:GNDA") (at 180.34 276.86 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 24628b06-bcd7-4b16-a566-041852aee771)
+    (property "Reference" "#PWR?" (id 0) (at 180.34 283.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 182.88 278.1299 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 180.34 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 180.34 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9807b2de-0f17-4a21-aeb1-91e78468899e))
+  )
+
   (symbol (lib_id "Device:L_Iron") (at 146.05 67.31 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 266a70f6-e26f-44e8-a4e7-a27fdea8bc85)
@@ -8101,29 +8849,6 @@
     (pin "2" (uuid b301063c-d8d2-45dd-9062-ffb31bfcfd70))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 128.27 243.84 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 2759d25b-2b4f-44e4-b729-9eee6231471c)
-    (property "Reference" "T?" (id 0) (at 128.2573 236.22 0))
-    (property "Value" "P: 16T S:2T on 43 or MABA-009488" (id 1) (at 128.2573 236.22 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 128.27 243.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 128.27 243.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "" (id 4) (at 128.27 243.84 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid bc12b182-face-436b-bff7-c5ff6374f969))
-    (pin "2" (uuid 2311217b-365d-4796-950a-4c12d1ce5d14))
-    (pin "3" (uuid a552c692-3c9b-4fd1-b93c-e1f2dff3384d))
-    (pin "4" (uuid cbe82e36-2d82-4a91-a5af-6ca30e0a5544))
-    (pin "5" (uuid af472163-95bd-41cd-9d65-9fa72815a62e))
-  )
-
   (symbol (lib_id "Device:R") (at 83.82 134.62 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 27b2c022-8e6d-4bc4-b68f-aed962065bfe)
@@ -8164,22 +8889,22 @@
     (pin "1" (uuid 44dfcb39-4f4b-434b-9044-05361d4bdeeb))
   )
 
-  (symbol (lib_id "Device:R") (at 264.16 69.85 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 287.02 69.85 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 2c4d679d-68ef-46f3-b0bc-ef543fc52489)
-    (property "Reference" "R?" (id 0) (at 266.7 68.5799 0)
+    (property "Reference" "R?" (id 0) (at 289.56 68.5799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 266.7 71.1199 0)
+    (property "Value" "DNF" (id 1) (at 289.56 71.1199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 262.382 69.85 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 285.242 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 264.16 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 287.02 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 264.16 69.85 0)
+    (property "Need_order" "" (id 4) (at 287.02 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 568fd184-43de-4cc3-9986-a2d3c46543ce))
@@ -8565,6 +9290,28 @@
     (pin "2" (uuid 5eb0f73f-0035-4e81-b697-47456844b968))
   )
 
+  (symbol (lib_id "Device:R") (at 254 264.16 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 3ab3dc5c-b7cb-4af0-8b30-4ec3f542819c)
+    (property "Reference" "R?" (id 0) (at 251.46 262.8899 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "12k" (id 1) (at 251.46 265.4299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 252.222 264.16 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 254 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 254 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ff93a658-99ef-48cc-897a-ee131c5ebf79))
+    (pin "2" (uuid be15e84c-ffaf-45fa-827d-76f1f1b82361))
+  )
+
   (symbol (lib_id "Device:R") (at 76.2 134.62 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3ad97cd4-848d-4958-82ce-eba5e46fdd47)
@@ -8650,6 +9397,38 @@
     (pin "3" (uuid 1d80bd91-a5ad-4b70-b75d-6a72f71b7508))
   )
 
+  (symbol (lib_id "mpb:L_tapped") (at 118.11 242.57 0) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 3d728ab5-fe34-49e0-983a-a52237626250)
+    (property "Reference" "L?" (id 0) (at 119.4562 243.7384 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10t tri on 43 or MABA-009488" (id 1) (at 119.38 241.3 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37" (id 2) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Description" "" (id 4) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 5) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 6) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 7) (at 118.11 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid cad6d4e0-0213-4e49-8862-6a99cfd59e44))
+    (pin "2" (uuid ba5c4d39-69b5-4e48-9a0f-9ab182d634cb))
+    (pin "3" (uuid 3a2b25bf-5495-4d48-a8ac-c4fbe007095b))
+  )
+
   (symbol (lib_id "power:GNDA") (at 217.17 109.22 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 3e32c33f-8845-49b2-ae9b-f2376c859a6b)
@@ -8845,7 +9624,7 @@
     (property "Reference" "T?" (id 0) (at 255.27 184.1372 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "10t tri, 43" (id 1) (at 255.27 186.6772 90)
+    (property "Value" "10t tri, 43, or MABA-009488" (id 1) (at 255.27 186.6772 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Footprint" "" (id 2) (at 248.92 185.42 0)
@@ -9082,19 +9861,19 @@
     (pin "2" (uuid e8685192-8790-4358-b208-d1706cdc2b4b))
   )
 
-  (symbol (lib_id "power:GNDA") (at 347.98 212.09 270) (unit 1)
-    (in_bom yes) (on_board yes)
+  (symbol (lib_id "power:GNDA") (at 326.39 219.71 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5428513b-9d99-4885-98b6-82fde890fffa)
-    (property "Reference" "#PWR?" (id 0) (at 341.63 212.09 0)
+    (property "Reference" "#PWR?" (id 0) (at 326.39 226.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 343.5858 212.217 0)
+    (property "Value" "GNDA" (id 1) (at 326.517 224.1042 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 347.98 212.09 0)
+    (property "Footprint" "" (id 2) (at 326.39 219.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 347.98 212.09 0)
+    (property "Datasheet" "" (id 3) (at 326.39 219.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a0a70ade-64b8-45fc-afd6-602001920adc))
@@ -9122,19 +9901,19 @@
     (pin "2" (uuid 6071c656-ca66-47cc-b106-2160c2ab6009))
   )
 
-  (symbol (lib_id "power:GNDA") (at 271.78 73.66 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 294.64 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5461d9bb-9179-420e-bf46-2682a2c1b304)
-    (property "Reference" "#PWR?" (id 0) (at 271.78 80.01 0)
+    (property "Reference" "#PWR?" (id 0) (at 294.64 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 271.907 78.0542 0)
+    (property "Value" "GNDA" (id 1) (at 294.767 78.0542 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 271.78 73.66 0)
+    (property "Footprint" "" (id 2) (at 294.64 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 271.78 73.66 0)
+    (property "Datasheet" "" (id 3) (at 294.64 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ac827f58-0d63-4b3b-8d7b-b185d2b387aa))
@@ -9204,6 +9983,22 @@
     (pin "2" (uuid afbaf5d8-021d-4830-be0b-0829b8d3b9f9))
   )
 
+  (symbol (lib_id "power:+12V") (at 312.42 100.33 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 58ba88e3-2644-409b-bf93-a97d876b43f5)
+    (property "Reference" "#PWR?" (id 0) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+12V" (id 1) (at 312.42 95.25 0))
+    (property "Footprint" "" (id 2) (at 312.42 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 312.42 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a79e5917-a5a3-4893-b1c7-fc4fc8203373))
+  )
+
   (symbol (lib_id "power:GNDA") (at 290.83 52.07 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5a4791ba-491f-4432-961f-1b249da54e4f)
@@ -9290,6 +10085,34 @@
     (pin "2" (uuid 930f5fe7-f6d6-4a4f-b401-b01dadde361b))
   )
 
+  (symbol (lib_id "Device:C_Polarized_Small") (at 312.42 104.14 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 623947b0-76f8-478f-8077-454a3c3d3059)
+    (property "Reference" "C?" (id 0) (at 309.88 102.3238 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10uF" (id 1) (at 309.88 104.8638 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 312.42 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 97c20009-7cfb-4777-836a-e06c4496f11b))
+    (pin "2" (uuid 3cd32883-f4c3-4c2c-b540-eb2878ec9f0a))
+  )
+
   (symbol (lib_id "power:GNDA") (at 217.17 104.14 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 62705d66-23c5-42a8-9f45-f37dec3cb101)
@@ -9308,6 +10131,28 @@
     (pin "1" (uuid 3ee00a87-0805-4070-8d96-381a581899c5))
   )
 
+  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 323.85 100.33 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 62e9ed49-1c7c-4949-ac10-4469b493ace4)
+    (property "Reference" "U?" (id 0) (at 323.85 94.1832 0))
+    (property "Value" "LD1117S33" (id 1) (at 323.85 96.4946 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 323.85 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 326.39 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 323.85 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "LD1117S33CTR" (id 5) (at 323.85 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 12579261-ae7a-4143-91a1-398782ce86be))
+    (pin "2" (uuid 25780e6b-379c-454c-ba25-e59dc39cc490))
+    (pin "3" (uuid 47c42c43-cbcd-41f4-95ef-ffc927f6280f))
+  )
+
   (symbol (lib_id "power:GNDA") (at 82.55 74.93 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 63c3ceb2-524d-4509-b556-94ef8d45f3da)
@@ -9368,19 +10213,19 @@
     (pin "2" (uuid 3f2af811-2ea0-433c-bf67-f820e2a27f60))
   )
 
-  (symbol (lib_id "power:GNDA") (at 264.16 73.66 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 287.02 73.66 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 646d3e54-9093-4252-b307-92e0d00f0257)
-    (property "Reference" "#PWR?" (id 0) (at 264.16 80.01 0)
+    (property "Reference" "#PWR?" (id 0) (at 287.02 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 264.287 78.0542 0)
+    (property "Value" "GNDA" (id 1) (at 287.147 78.0542 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 264.16 73.66 0)
+    (property "Footprint" "" (id 2) (at 287.02 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 264.16 73.66 0)
+    (property "Datasheet" "" (id 3) (at 287.02 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ba758faa-b4d3-4e40-9bf2-38eb2fa25222))
@@ -9613,6 +10458,34 @@
     (pin "1" (uuid 68bc4174-c4ee-4ab0-88e8-b576d1a533d9))
   )
 
+  (symbol (lib_id "Device:C_Polarized_Small") (at 170.18 240.03 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 7256d241-c551-4211-a37c-383301b27340)
+    (property "Reference" "C?" (id 0) (at 167.64 238.2138 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10uF" (id 1) (at 167.64 240.7538 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 170.18 240.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ee62c975-e076-40d3-bf99-cf8ed23ebd67))
+    (pin "2" (uuid ba1ed178-cfb5-484f-b005-71a9a437594d))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 27.94 53.34 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7266f3d7-99c1-41a2-afd6-517570504a61)
@@ -9883,6 +10756,53 @@
     (pin "2" (uuid 1f6e5264-f71d-493f-913a-cdb6564c86bf))
   )
 
+  (symbol (lib_id "Device:R") (at 251.46 276.86 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 83ca7711-0d72-41d7-9213-756b7722072f)
+    (property "Reference" "R?" (id 0) (at 248.92 275.5899 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 248.92 278.1299 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 253.238 276.86 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 251.46 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 251.46 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 5dd42fba-a5bf-41f7-9b97-b82ee4c5215d))
+    (pin "2" (uuid 88f3ce54-7bf3-46a8-8be1-9a2f2e7949c0))
+  )
+
+  (symbol (lib_id "Device:L") (at 255.27 72.39 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 8554cc98-0cbb-4f6a-b636-f2917076a214)
+    (property "Reference" "L?" (id 0) (at 256.54 71.1199 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "TBD" (id 1) (at 256.54 73.6599 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 255.27 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 255.27 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 255.27 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 255.27 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2abe157e-5f10-4bb4-8db4-f0c08e8422d0))
+    (pin "2" (uuid 4a354fa1-d2b2-4da7-9f22-077eee24f03e))
+  )
+
   (symbol (lib_id "Device:Transformer_1P_SS") (at 125.73 43.18 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 863eb863-4675-4f95-81b6-2b036db3d5eb)
@@ -9940,6 +10860,24 @@
     (pin "1" (uuid 1b21bb65-6d04-4d66-8c5f-d6905fe6b063))
   )
 
+  (symbol (lib_id "power:GNDA") (at 323.85 107.95 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 876b2743-4d0f-4dbc-9633-63f78538646b)
+    (property "Reference" "#PWR?" (id 0) (at 323.85 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 323.977 111.2012 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 323.85 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 323.85 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d681f133-d991-4ace-a244-16ebfa919f5a))
+  )
+
   (symbol (lib_id "power:GNDA") (at 196.85 129.54 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 87b73833-1cad-43ad-ae9c-a4e38027942e)
@@ -10021,8 +10959,33 @@
     (property "Need_order" "" (id 4) (at 325.12 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 2adc0e8f-2e3a-4906-88b1-092f214393c7))
-    (pin "2" (uuid 7a0bca56-ecd7-4bbb-901d-b86b219adc5d))
+    (pin "1" (uuid 2adc0e8f-2e3a-4906-88b1-092f214393c7))
+    (pin "2" (uuid 7a0bca56-ecd7-4bbb-901d-b86b219adc5d))
+  )
+
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 223.52 273.05 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 89b16023-240b-46a9-aaf9-b94321e890ad)
+    (property "Reference" "Q?" (id 0) (at 229.87 273.0499 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "IRF7309IPBF" (id 1) (at 229.87 274.3199 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 228.6 274.955 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 226.06 273.05 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (pin "1" (uuid fed29336-9986-4886-89db-645f373b9277))
+    (pin "2" (uuid 956804b6-1992-4b3d-a661-0c461da0af84))
+    (pin "7" (uuid 8836ea3a-aeef-4943-aa33-9f7bd38aa027))
+    (pin "8" (uuid fed50820-75be-456b-8645-52e4bbc7890f))
+    (pin "3" (uuid ba8cc049-c105-4de1-878b-b1dbe6de7d58))
+    (pin "4" (uuid 4e37fb9e-80ab-4142-a214-915c8a797025))
+    (pin "5" (uuid d21acb24-22d5-4f00-99de-a550b2e303b6))
+    (pin "6" (uuid 97974bf9-8a18-4bae-af65-2a4432a530f8))
   )
 
   (symbol (lib_id "power:GNDA") (at 218.44 59.69 0) (unit 1)
@@ -10043,27 +11006,47 @@
     (pin "1" (uuid 1eb3d903-6622-451b-9788-cc6032b8e2aa))
   )
 
-  (symbol (lib_id "Device:C_Polarized_Small") (at 350.52 212.09 270) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 326.39 217.17 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8c60766a-0061-4110-9308-decf03c894ba)
-    (property "Reference" "C?" (id 0) (at 351.0661 204.47 90))
-    (property "Value" "1uF" (id 1) (at 351.0661 207.01 90))
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 350.52 212.09 0)
+    (property "Reference" "C?" (id 0) (at 328.93 215.3538 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "1uF" (id 1) (at 328.93 217.8938 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 326.39 217.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 350.52 212.09 0)
+    (property "Datasheet" "~" (id 3) (at 326.39 217.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "08055C105JAT2A" (id 4) (at 350.52 212.09 0)
+    (property "MPN" "08055C105JAT2A" (id 4) (at 326.39 217.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 350.52 212.09 0)
+    (property "Need_order" "" (id 5) (at 326.39 217.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aa67e0b1-3223-488e-9f3c-da865695f275))
     (pin "2" (uuid b1b19630-059a-496a-87ab-eb041c4d6c3c))
   )
 
+  (symbol (lib_id "Regulator_Linear:LM1117-ADJ") (at 180.34 260.35 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 8d6fba61-7575-4242-8f53-552540adc73f)
+    (property "Reference" "U?" (id 0) (at 180.34 252.73 0))
+    (property "Value" "LM1117-ADJ 9V" (id 1) (at 180.34 255.27 0))
+    (property "Footprint" "" (id 2) (at 180.34 260.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm1117.pdf" (id 3) (at 180.34 260.35 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9499c3f5-7a1d-4b2e-9a56-b990293fc4af))
+    (pin "2" (uuid e80f8a44-b738-4c71-9293-bc2f4427a099))
+    (pin "3" (uuid ecd6a568-5f82-4270-b875-728f9d765255))
+  )
+
   (symbol (lib_id "power:GNDA") (at 229.87 81.28 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 91318dee-2866-4619-95b1-4ff6847df4c4)
@@ -10104,29 +11087,6 @@
     (pin "2" (uuid 060b50cc-dfb0-4051-bf14-860fe9cdb674))
   )
 
-  (symbol (lib_id "Device:Transformer_1P_SS") (at 90.17 243.84 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 9277186f-df56-4035-8841-9ab6cc89b1e8)
-    (property "Reference" "T?" (id 0) (at 90.1827 236.22 0))
-    (property "Value" "P: 16T S:2T on 43 or MABA-009488" (id 1) (at 90.1827 251.46 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Footprint" "" (id 2) (at 90.17 243.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "/home/bram/Sync/Doc/Datasheet/5943004901 fair-rite toroid.pdf" (id 3) (at 90.17 243.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "" (id 4) (at 90.17 243.84 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 952a091e-e084-4b33-a2bb-654bea339c9c))
-    (pin "2" (uuid 04e64678-779a-41a6-b193-9efd97fa2460))
-    (pin "3" (uuid acaee7ff-425f-4af7-8994-ca731a63a007))
-    (pin "4" (uuid 00d5a397-c990-47b8-a1a8-eec862126a67))
-    (pin "5" (uuid 55257368-4dbe-43c2-b0f9-68ee504ca3b2))
-  )
-
   (symbol (lib_id "Device:L_Iron") (at 248.92 153.67 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 92f28f5a-680c-4bd4-83b0-0fad8e359da8)
@@ -10146,6 +11106,24 @@
     (pin "2" (uuid 316ffbd7-24aa-46bc-acbc-b421f3733ebd))
   )
 
+  (symbol (lib_id "power:GNDA") (at 254 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 942acf4b-8a96-4c46-ac34-0486d093be57)
+    (property "Reference" "#PWR?" (id 0) (at 254 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 254.127 80.5942 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 254 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 254 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 3bbb210a-5efd-4f87-a973-41c11d7503c9))
+  )
+
   (symbol (lib_id "power:GNDA") (at 38.1 78.74 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 94a0256b-3533-4ef4-82a8-5a55804c7f98)
@@ -10164,6 +11142,27 @@
     (pin "1" (uuid 535dce54-0bf0-4925-a459-8e52925a4685))
   )
 
+  (symbol (lib_id "Device:C") (at 259.08 66.04 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 9578d03f-4ecf-4253-ab7c-8492982a3872)
+    (property "Reference" "C?" (id 0) (at 259.08 59.6392 90))
+    (property "Value" "TBD" (id 1) (at 259.08 61.9506 90))
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 262.89 65.0748 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 259.08 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 259.08 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 259.08 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 543c7552-2762-4627-a0e8-75474b87a740))
+    (pin "2" (uuid d067e7e9-01b4-49ee-a160-a8026cc911c7))
+  )
+
   (symbol (lib_id "power:GNDA") (at 185.42 64.77 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9580f0cd-8660-4337-b02a-fbff6da105a6)
@@ -10320,18 +11319,18 @@
     (pin "3" (uuid 2054609f-2885-4c69-9ac5-280aca0b165b))
   )
 
-  (symbol (lib_id "Device:R") (at 267.97 66.04 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 290.83 66.04 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9d4d862f-edd7-413b-88ca-c626e42c914f)
-    (property "Reference" "R?" (id 0) (at 267.97 59.69 90))
-    (property "Value" "0" (id 1) (at 267.97 62.23 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 267.97 67.818 90)
+    (property "Reference" "R?" (id 0) (at 290.83 59.69 90))
+    (property "Value" "0" (id 1) (at 290.83 62.23 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 290.83 67.818 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 267.97 66.04 0)
+    (property "Datasheet" "~" (id 3) (at 290.83 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 267.97 66.04 0)
+    (property "Need_order" "" (id 4) (at 290.83 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1968c5d6-b539-49f5-89b9-87891578a513))
@@ -10593,6 +11592,24 @@
     (pin "2" (uuid a62e8657-787d-49e5-bb38-c80d5e591836))
   )
 
+  (symbol (lib_id "power:GNDA") (at 180.34 243.84 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a8c9eac3-af1d-4c0f-9b95-28ebab57f749)
+    (property "Reference" "#PWR?" (id 0) (at 180.34 250.19 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 182.88 245.1099 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "" (id 2) (at 180.34 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 180.34 243.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 91e7fb08-3b7b-4f51-b74a-a3b7b1b229f8))
+  )
+
   (symbol (lib_id "mpb:BAT68-04W") (at 248.92 167.64 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid a8d07f79-5786-4154-a198-ea13a112fb97)
@@ -10634,6 +11651,59 @@
     (pin "2" (uuid 26c39743-2990-450a-9610-65a52205b0bd))
   )
 
+  (symbol (lib_id "Device:L") (at 269.24 66.04 90) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a94ee8cd-c574-40c4-8eda-7a181fc1dac0)
+    (property "Reference" "L?" (id 0) (at 269.24 59.69 90))
+    (property "Value" "TBD" (id 1) (at 269.24 62.23 90))
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 269.24 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 269.24 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 269.24 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 269.24 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b2f33f2b-f13d-4a2d-bcbb-c7e3b6a3bd7a))
+    (pin "2" (uuid c104bf03-d34c-460c-8e25-50631f1d0682))
+  )
+
+  (symbol (lib_id "mpb:L_tapped") (at 100.33 242.57 180) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid aa5b705c-c07d-4496-86b4-061b7508dbb5)
+    (property "Reference" "L?" (id 0) (at 98.9838 243.7384 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10t tri on 43 or MABA-009488" (id 1) (at 99.06 241.3 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37" (id 2) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Description" "" (id 4) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 5) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 6) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 7) (at 100.33 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 743686d1-3df8-48dd-b032-a325ad851ef7))
+    (pin "2" (uuid ddd5aa7c-8b4f-488c-bde5-45e2c47fdaa2))
+    (pin "3" (uuid 06dcbbfd-d009-4fdd-a0d8-1a94bb595121))
+  )
+
   (symbol (lib_id "Device:R") (at 257.81 207.01 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid aabcea53-19b9-48cb-9a33-114b22561afa)
@@ -10837,6 +11907,33 @@
     (pin "1" (uuid 63ee6559-8ea0-4fbd-bed2-14ed7722f66e))
   )
 
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 259.08 262.89 270) (mirror x) (unit 2)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b33779f2-9ef5-4a4b-b90d-f6a47f55c204)
+    (property "Reference" "Q?" (id 0) (at 259.08 252.73 90))
+    (property "Value" "IRF7309" (id 1) (at 259.08 255.27 90))
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 257.175 257.81 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 259.08 260.35 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "MPN" "IRF7309IPBF" (id 5) (at 259.08 262.89 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "1" (id 4) (at 259.08 262.89 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f191))
+    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702855))
+    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bb))
+    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f3))
+    (pin "3" (uuid 02f3e511-7805-4e23-a074-6fe49bd1f506))
+    (pin "4" (uuid 662fe0e8-780b-42e3-a31d-e99cc4c5b321))
+    (pin "5" (uuid e6914438-3810-48dd-932d-81d4ab8c81df))
+    (pin "6" (uuid a1d56e9a-0f2a-402b-96d4-52b2cb93f3ed))
+  )
+
   (symbol (lib_id "Device:R") (at 54.61 105.41 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b35816f8-8b02-444a-9eae-77cb7e8979bd)
@@ -10923,6 +12020,28 @@
     (pin "2" (uuid 3ae5cef9-19f2-48aa-a2a7-422992386a6d))
   )
 
+  (symbol (lib_id "Device:R") (at 218.44 276.86 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid b7841085-84fa-4fcb-9d23-eea011876c07)
+    (property "Reference" "R?" (id 0) (at 215.9 275.5899 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10k" (id 1) (at 215.9 278.1299 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 220.218 276.86 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 218.44 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 218.44 276.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid da12326f-ebff-4d32-a9f1-c446aa4659ad))
+    (pin "2" (uuid a0f1f7f3-7754-419e-8925-7e7ab980e365))
+  )
+
   (symbol (lib_id "Transistor_FET:MMBFJ113") (at 100.33 63.5 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b7f9f23f-60e3-4c4e-853f-947cb2a713bf)
@@ -10980,6 +12099,9 @@
     (property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm4865.pdf" (id 3) (at 354.33 224.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "MPN" "LM4865MX/NOPB" (id 4) (at 354.33 227.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid becc4925-d868-41cb-88d5-e1bdb50838d4))
     (pin "2" (uuid a01c0e4e-b0e7-4e0b-a424-588f3bff6808))
     (pin "3" (uuid 45bfc330-638a-417c-a574-b38889ffdb12))
@@ -11106,24 +12228,64 @@
     (pin "3" (uuid 26a859f3-cc0c-4261-b97c-eaaad45bf88c))
   )
 
-  (symbol (lib_id "Device:R") (at 360.68 208.28 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 190.5 264.16 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid be3ff52f-2a1a-479d-b416-ff15318b7ee2)
+    (property "Reference" "R?" (id 0) (at 193.04 262.8899 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "1.2k" (id 1) (at 193.04 265.4299 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 192.278 264.16 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 190.5 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 190.5 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d5f6d670-55a1-4256-a602-9a8db6641ac7))
+    (pin "2" (uuid 6c21aefc-e51d-4c41-9338-5d87f60cdb13))
+  )
+
+  (symbol (lib_id "Device:R") (at 321.31 214.63 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bee5eed0-1297-4684-b7a0-ed7af5f2116c)
-    (property "Reference" "R?" (id 0) (at 360.68 201.93 90))
-    (property "Value" "0" (id 1) (at 360.68 204.47 90))
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 360.68 210.058 90)
+    (property "Reference" "R?" (id 0) (at 321.31 220.98 90))
+    (property "Value" "0" (id 1) (at 321.31 218.44 90))
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 321.31 212.852 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 360.68 208.28 0)
+    (property "Datasheet" "~" (id 3) (at 321.31 214.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 360.68 208.28 0)
+    (property "Need_order" "" (id 4) (at 321.31 214.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid afec3d15-a43e-473b-8fdd-b8c0ab5ecff7))
     (pin "2" (uuid 1b61ba61-46ad-4041-af32-45c276e5f07d))
   )
 
+  (symbol (lib_id "power:GNDA") (at 259.08 280.67 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid befa6780-5c05-4352-b06a-3531a39e8bf5)
+    (property "Reference" "#PWR?" (id 0) (at 259.08 287.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 259.207 283.8958 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 259.08 280.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 259.08 280.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 2570258a-b869-4c69-bd72-e3595702eeb9))
+  )
+
   (symbol (lib_id "Device:R") (at 185.42 173.99 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf141795-5440-4e86-b9aa-4eccd6a51b87)
@@ -11150,14 +12312,17 @@
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf6ddafd-bcb1-4e32-aa73-c13d871e7f3b)
     (property "Reference" "L?" (id 0) (at 24.13 81.28 90))
-    (property "Value" "TBD" (id 1) (at 24.13 83.82 90))
+    (property "Value" "6uH" (id 1) (at 24.13 83.82 90))
     (property "Footprint" "" (id 2) (at 24.13 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Description" "9MHz: 7.1uH: 42T on T50-6" (id 4) (at 24.13 87.63 90)
+    (property "Description" "37T on T44-6, Wire length 61cm" (id 4) (at 24.13 87.63 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "T44-6" (id 5) (at 24.13 87.63 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9c063b79-fa73-4e48-9ce8-bd1a324c7271))
@@ -11208,11 +12373,51 @@
     (pin "2" (uuid 12b07c79-53a4-46db-b367-986682af072a))
   )
 
+  (symbol (lib_id "Device:R") (at 190.5 273.05 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid c23d781c-363a-4d85-8171-fd97e7299b5c)
+    (property "Reference" "R?" (id 0) (at 193.04 271.7799 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "2.3k" (id 1) (at 193.04 274.3199 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 192.278 273.05 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 190.5 273.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 190.5 273.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid fc73d9dd-844c-4a65-882e-b668ede5e780))
+    (pin "2" (uuid 3d713398-fd5e-45f4-8b22-088c8c7bfde9))
+  )
+
+  (symbol (lib_id "power:GNDA") (at 226.06 280.67 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c2df5cf9-b8d5-4372-a132-9c4be7ddf003)
+    (property "Reference" "#PWR?" (id 0) (at 226.06 287.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 226.187 283.8958 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+    (property "Footprint" "" (id 2) (at 226.06 280.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 226.06 280.67 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0de7877a-45de-4a42-9204-a4abc753abe7))
+  )
+
   (symbol (lib_id "Device:Transformer_1P_SS") (at 300.99 52.07 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c36f262a-d5d7-4c06-9442-d6dd1470d26d)
     (property "Reference" "T?" (id 0) (at 300.99 36.83 0))
-    (property "Value" "10t tri, 43" (id 1) (at 300.99 39.37 0))
+    (property "Value" "10t tri, 43, or MABA-009488" (id 1) (at 300.99 39.37 0))
     (property "Footprint" "" (id 2) (at 300.99 52.07 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -11485,22 +12690,22 @@
     (pin "3" (uuid cef5ee17-9839-4164-8d7d-e647f9ddb39a))
   )
 
-  (symbol (lib_id "Device:R") (at 271.78 69.85 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 294.64 69.85 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d048f85a-e298-40d5-b96d-4dc1c1a1815f)
-    (property "Reference" "R?" (id 0) (at 274.32 68.5799 0)
+    (property "Reference" "R?" (id 0) (at 297.18 68.5799 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "DNF" (id 1) (at 274.32 71.1199 0)
+    (property "Value" "DNF" (id 1) (at 297.18 71.1199 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 270.002 69.85 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 292.862 69.85 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 271.78 69.85 0)
+    (property "Datasheet" "~" (id 3) (at 294.64 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 271.78 69.85 0)
+    (property "Need_order" "" (id 4) (at 294.64 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8ab1c3b7-c0d7-4051-a72f-52e4df652ce2))
@@ -11548,6 +12753,33 @@
     (pin "2" (uuid d842820f-f948-4324-8594-30f4988f9279))
   )
 
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 226.06 262.89 270) (mirror x) (unit 2)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid d2fa343c-741f-409b-b691-e1583a96f0db)
+    (property "Reference" "Q?" (id 0) (at 226.06 252.73 90))
+    (property "Value" "IRF7309" (id 1) (at 226.06 255.27 90))
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 224.155 257.81 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 226.06 260.35 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "MPN" "IRF7309IPBF" (id 5) (at 226.06 262.89 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "1" (id 4) (at 226.06 262.89 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f192))
+    (pin "2" (uuid bdee35fb-588c-4510-94fc-9a9ca1702856))
+    (pin "7" (uuid 4c5df834-caa7-40ab-8e75-6d6bbfd257bc))
+    (pin "8" (uuid c1dec542-6b7e-4205-9ad8-759154cc29f4))
+    (pin "3" (uuid ccef1140-63db-473d-b50b-a8c6e3b77c1f))
+    (pin "4" (uuid 8e81dab4-867f-45db-b011-2c42b2a9b48e))
+    (pin "5" (uuid a3a640df-1d1e-4139-80ec-b731b60f37dc))
+    (pin "6" (uuid a03f530b-10a8-40e7-826b-46483661c416))
+  )
+
   (symbol (lib_id "Transistor_BJT:MMBT3904") (at 160.02 185.42 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d3db8efd-22e4-499e-a4b4-ccabfe8a199e)
@@ -11806,6 +13038,22 @@
     (pin "1" (uuid e99d6ed1-2f17-4f7f-a19d-2964c1ee0852))
   )
 
+  (symbol (lib_id "Regulator_Linear:LD1117S50TR_SOT223") (at 180.34 236.22 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e34ad77f-821b-481e-89c5-cb7566a5eafd)
+    (property "Reference" "U?" (id 0) (at 180.34 228.6 0))
+    (property "Value" "LD1117S50" (id 1) (at 180.34 231.14 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 180.34 231.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 182.88 242.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a99fc694-939b-4f8f-8cd6-80809c8199a9))
+    (pin "2" (uuid da87c3e6-2d49-4cea-9c45-7de8bd1a1370))
+    (pin "3" (uuid ce0bd0eb-50de-4cf4-92d4-4543c548222e))
+  )
+
   (symbol (lib_id "Device:C_Small") (at 242.57 161.29 90) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e3dced21-eb35-4151-91e7-971aaeb5c614)
@@ -11888,6 +13136,34 @@
     (pin "2" (uuid b0261c92-6727-4375-9ebb-76d97d992570))
   )
 
+  (symbol (lib_id "Device:C_Polarized_Small") (at 168.91 264.16 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid e9497301-9b60-4bc7-94e0-5a0820a55a4c)
+    (property "Reference" "C?" (id 0) (at 166.37 262.3438 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10uF" (id 1) (at 166.37 264.8838 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 168.91 264.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 9ff2385e-7090-4fc9-82cb-47b38c884dc0))
+    (pin "2" (uuid 3acbcf3c-75f6-4b0b-8ac0-9b6c4fa9239a))
+  )
+
   (symbol (lib_id "Transistor_BJT:MMBT3904") (at 173.99 132.08 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid ea0d44a9-4dc1-4715-a58c-cf7746f1d5e1)
@@ -12050,6 +13326,59 @@
     (pin "2" (uuid 536029be-e781-4928-adb2-e133cf4884bc))
   )
 
+  (symbol (lib_id "Device:C") (at 273.05 69.85 180) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f098ce67-0336-4914-9677-9b654f4c37f1)
+    (property "Reference" "C?" (id 0) (at 276.86 68.5799 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "TBD" (id 1) (at 276.86 71.1199 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 272.0848 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 273.05 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "" (id 4) (at 273.05 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 273.05 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 05c74720-3deb-4e23-b209-a3512229317a))
+    (pin "2" (uuid b72e3b8e-ee01-43ce-8df3-720f51b50c1f))
+  )
+
+  (symbol (lib_id "Device:C_Polarized_Small") (at 180.34 271.78 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid f192297e-69ff-4fa3-bd49-f6b30525fc4f)
+    (property "Reference" "C?" (id 0) (at 177.8 269.9638 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10uF" (id 1) (at 177.8 272.5038 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 180.34 271.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 180.34 271.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 180.34 271.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 180.34 271.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 180.34 271.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 92048890-9e7a-4684-8236-f92731bed42c))
+    (pin "2" (uuid a63816d4-1435-4205-94b8-349143fa1330))
+  )
+
   (symbol (lib_id "power:GNDA") (at 365.76 237.49 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f35243ea-70a8-4861-b1e5-87022345fc08)
@@ -12240,6 +13569,24 @@
     (pin "1" (uuid 38cfaa5b-c2df-4546-bc9a-1ba460007dc9))
   )
 
+  (symbol (lib_id "power:GNDA") (at 273.05 73.66 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid fbed3405-f96f-4256-ba81-51be4d6cb88b)
+    (property "Reference" "#PWR?" (id 0) (at 273.05 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDA" (id 1) (at 273.177 78.0542 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Footprint" "" (id 2) (at 273.05 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 273.05 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 10d97ef5-c52f-4f6f-b88c-ef4972529927))
+  )
+
   (symbol (lib_id "Device:R") (at 189.23 150.495 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fc99c902-8c01-49d5-bf81-5a16edff9cd4)
@@ -12262,6 +13609,28 @@
     (pin "2" (uuid 83547aae-95a4-4dd6-aea2-35d2dc4fe1f7))
   )
 
+  (symbol (lib_id "Device:R") (at 252.73 72.39 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid fdbd7fff-86a6-4aac-a458-e736136c8e38)
+    (property "Reference" "R?" (id 0) (at 250.19 71.1199 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "47" (id 1) (at 250.19 73.6599 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 250.952 72.39 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 252.73 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 252.73 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 920d5a5a-c060-4efd-aaa4-52e704f882f5))
+    (pin "2" (uuid 6b29fcad-c7d2-4b02-bc91-2072194edb57))
+  )
+
   (symbol (lib_id "Diode:1N4148W") (at 72.39 90.17 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ff685770-fb1b-4e72-b8d3-5b5f54435f89)
diff --git a/kicad-dart-70/control.kicad_sch b/kicad-dart-70/control.kicad_sch
index f72d417..1b986de 100644
--- a/kicad-dart-70/control.kicad_sch
+++ b/kicad-dart-70/control.kicad_sch
@@ -6,7 +6,7 @@
 
   (title_block
     (title "DART-70 TRX")
-    (date "2023-01-15")
+    (date "2023-01-19")
     (rev "0")
     (company "HB9EGM")
     (comment 1 "A 4m Band SSB/CW Transceiver")
@@ -142,41 +142,6 @@
         )
       )
     )
-    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "TP" (id 0) (at 0 6.858 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "test point" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "TestPoint_0_1"
-        (circle (center 0 3.302) (radius 0.762)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "TestPoint_1_1"
-        (pin passive line (at 0 0 90) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Connector:USB_B_Micro" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at -5.08 11.43 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -788,58 +753,60 @@
         )
       )
     )
-    (symbol "Device:CP1" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "C" (id 0) (at 0.635 2.54 0)
+    (symbol "Device:C_Polarized_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "C" (id 0) (at 0.254 1.778 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Device_CP1" (id 1) (at 0.635 -2.54 0)
+      (property "Value" "C_Polarized_Small" (id 1) (at 0.254 -2.032 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (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" "~" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "CP_*" (id 4) (at 0 0 0)
+      (property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "CP1_0_1"
-        (polyline
-          (pts
-            (xy -2.032 0.762)
-            (xy 2.032 0.762)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
+      (property "ki_description" "Polarized capacitor, small symbol" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "CP_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "C_Polarized_Small_0_1"
+        (rectangle (start -1.524 -0.3048) (end 1.524 -0.6858)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -1.524 0.6858) (end 1.524 0.3048)
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.778 2.286)
-            (xy -0.762 2.286)
+            (xy -1.27 1.524)
+            (xy -0.762 1.524)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.27 1.778)
-            (xy -1.27 2.794)
+            (xy -1.016 1.27)
+            (xy -1.016 1.778)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (arc (start 2.032 -1.27) (mid 0 -0.5572) (end -2.032 -1.27)
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
       )
-      (symbol "CP1_1_1"
-        (pin passive line (at 0 3.81 270) (length 2.794)
+      (symbol "C_Polarized_Small_1_1"
+        (pin passive line (at 0 2.54 270) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -3.81 90) (length 3.302)
+        (pin passive line (at 0 -2.54 90) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -1297,49 +1264,6 @@
         )
       )
     )
-    (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "LD1117S33TR_SOT223" (id 1) (at 0 3.175 0)
-        (effects (font (size 1.27 1.27)) (justify left))
-      )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "REGULATOR LDO 3.3V" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT-223" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "LD1117S33TR_SOT223_0_1"
-        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-      )
-      (symbol "LD1117S33TR_SOT223_1_1"
-        (pin power_in line (at 0 -7.62 90) (length 2.54)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_out line (at 7.62 0 180) (length 2.54)
-          (name "VO" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin power_in line (at -7.62 0 0) (length 2.54)
-          (name "VI" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Transistor_BJT:MMBT3904" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1786,58 +1710,6 @@
         )
       )
     )
-    (symbol "power:+12V" (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)
-      )
-      (property "Value" "+12V" (id 1) (at 0 3.556 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" "global power" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Power symbol creates a global label with name \"+12V\"" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "+12V_0_1"
-        (polyline
-          (pts
-            (xy -0.762 1.27)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 0)
-            (xy 0 2.54)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 2.54)
-            (xy 0.762 1.27)
-          )
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "+12V_1_1"
-        (pin power_in line (at 0 0 90) (length 0) hide
-          (name "+12V" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "power:+3.3V" (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)
@@ -1938,12 +1810,6 @@
   (junction (at 43.18 96.52) (diameter 0) (color 0 0 0 0)
     (uuid 21443f6e-c9cb-43b6-9145-0fe007529b00)
   )
-  (junction (at 110.49 49.53) (diameter 0) (color 0 0 0 0)
-    (uuid 26aff78d-1dc4-4822-8817-49ee707b8453)
-  )
-  (junction (at 260.35 160.02) (diameter 0) (color 0 0 0 0)
-    (uuid 28c0e82b-3883-497d-9334-7cc885f67489)
-  )
   (junction (at 223.52 133.35) (diameter 0) (color 0 0 0 0)
     (uuid 2a891096-042c-4004-b161-8bd2c0b59fd7)
   )
@@ -1983,9 +1849,6 @@
   (junction (at 120.65 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 752fa345-d8be-4e99-aad1-e88671f99643)
   )
-  (junction (at 274.32 152.4) (diameter 0) (color 0 0 0 0)
-    (uuid 75dbcfe0-f366-4024-b305-83af061644a9)
-  )
   (junction (at 160.02 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 77b09fa1-fbbb-49ab-94c4-069660b694ff)
   )
@@ -2013,9 +1876,6 @@
   (junction (at 93.98 85.09) (diameter 0) (color 0 0 0 0)
     (uuid 8c497335-9f19-4d8f-81b9-d3f6e5560190)
   )
-  (junction (at 271.78 152.4) (diameter 0) (color 0 0 0 0)
-    (uuid 904b6cc6-f2cb-4a57-986a-40544b1effa3)
-  )
   (junction (at 247.65 91.44) (diameter 0) (color 0 0 0 0)
     (uuid 9098a6bf-eae0-4636-90c3-6c2f5d9401fd)
   )
@@ -2028,9 +1888,6 @@
   (junction (at 140.97 49.53) (diameter 0) (color 0 0 0 0)
     (uuid 9cb0289b-897f-4a33-9575-6ead0989832a)
   )
-  (junction (at 246.38 152.4) (diameter 0) (color 0 0 0 0)
-    (uuid a155b72a-309d-445b-864b-7401b5efb849)
-  )
   (junction (at 60.96 171.45) (diameter 0) (color 0 0 0 0)
     (uuid ae10c814-dedf-4335-9619-5afa1682dcac)
   )
@@ -2195,10 +2052,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 37e843e9-2538-4a91-9a9b-f536fa0a9e84)
   )
-  (wire (pts (xy 252.73 152.4) (xy 246.38 152.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 397629c6-64f0-4a95-bdb9-6c0573e2fbac)
-  )
   (wire (pts (xy 110.49 49.53) (xy 120.65 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3a013e8f-5b12-499b-8d2d-0ad49966db1a)
@@ -2383,18 +2236,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9f7b3295-d16c-467f-88f6-2ab8ee650e3a)
   )
-  (wire (pts (xy 280.67 152.4) (xy 274.32 152.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a16dacb5-adb4-45ea-b079-1c4b5b8c866f)
-  )
   (wire (pts (xy 35.56 168.91) (xy 36.195 168.91))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a2873055-b8ab-487a-9485-446d15b62f90)
   )
-  (wire (pts (xy 246.38 160.02) (xy 260.35 160.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid a2c55b32-380d-46e9-bf43-659c0e4e5d28)
-  )
   (wire (pts (xy 149.86 69.85) (xy 147.32 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a32fe8ab-5810-40f6-8eab-48332c0ee5a0)
@@ -2447,10 +2292,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4d405a4-25a6-44ef-96e1-b56b6b5ce995)
   )
-  (wire (pts (xy 274.32 152.4) (xy 271.78 152.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b4eb7a15-65f1-4c0f-8e2a-3fb89452f015)
-  )
   (wire (pts (xy 49.53 153.67) (xy 60.96 153.67))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b506d6e3-f5de-46c8-8eaa-ee5b62c6abd9)
@@ -2619,10 +2460,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f1353e9e-7eae-44e9-872c-ec11c41e5657)
   )
-  (wire (pts (xy 260.35 160.02) (xy 271.78 160.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f2f87eda-dd48-4c1e-99e5-858009a4dcd7)
-  )
   (wire (pts (xy 149.86 146.05) (xy 147.32 146.05))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f46f4b86-daf6-4869-98cb-928039f00f5f)
@@ -2635,16 +2472,12 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f6c96c0d-4cf7-4e5a-ad96-cb52e5fda138)
   )
-  (wire (pts (xy 267.97 152.4) (xy 271.78 152.4))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid f868ee9f-7a80-4920-b7ba-f4ae995e8fed)
-  )
 
   (text "Yaesu documents\nhave reversed\nnumbering" (at 30.48 152.4 0)
     (effects (font (size 1.1938 1.1938)) (justify left bottom))
     (uuid 00d22a94-4415-4f7c-bba5-9ac8913c5f96)
   )
-  (text "TODO\nDecide VMIC\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020"
+  (text "TODO\nDecide VMIC (8V on MH-42)\nReplace connector by footprints for buttons, encoder and display\nCheck how I finally did CW on Picardy 2020"
     (at 1.27 -15.24 0)
     (effects (font (size 3 3)) (justify left bottom))
     (uuid 1154c567-1e30-4104-a3b9-6b57e1efe0f8)
@@ -2940,11 +2773,11 @@
     (uuid fd2d066c-2ff9-43c4-ab8e-a65d2b71b5c1)
   )
 
-  (global_label "+8V" (shape input) (at 67.31 118.11 0) (fields_autoplaced)
+  (global_label "+VMIC" (shape input) (at 67.31 118.11 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 126f84ae-523c-4569-b046-7ee124f46a5a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 -1.27 0)
-      (effects (font (size 1.27 1.27)) hide)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 75.7102 118.0306 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SDA" (shape input) (at 260.35 100.33 0) (fields_autoplaced)
@@ -3665,7 +3498,7 @@
     (pin "1" (uuid e07747b5-ad95-44e7-a60f-1d6d0397861e))
   )
 
-  (symbol (lib_id "Device:CP1") (at 110.49 53.34 0) (unit 1)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 110.49 53.34 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005e9a0781)
     (property "Reference" "C?" (id 0) (at 107.5944 52.1716 0)
@@ -3674,7 +3507,7 @@
     (property "Value" "6.8uF" (id 1) (at 107.5944 54.483 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 111.4552 57.15 0)
+    (property "Footprint" "Capacitor_SMD:C_1206_3216Metric" (id 2) (at 110.49 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 110.49 53.34 0)
@@ -4871,34 +4704,6 @@
     (pin "2" (uuid bad3e2d1-a4ab-4609-bf8a-97fb15de6e81))
   )
 
-  (symbol (lib_id "Device:CP1") (at 271.78 156.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 2fb0ff3e-af89-4cd7-a2e5-ab2cf92b7b45)
-    (property "Reference" "C?" (id 0) (at 274.701 155.0416 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "22uF" (id 1) (at 274.701 157.353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 271.78 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 271.78 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "stash tantalum" (id 4) (at 271.78 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 271.78 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 271.78 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b5f01f69-9b73-4289-b1be-bb7021465129))
-    (pin "2" (uuid f1e56858-9940-45de-8080-d36eb52d9502))
-  )
-
   (symbol (lib_id "Device:R") (at 40.005 168.91 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 333e6c20-1755-4453-855a-6fc389cf46d5)
@@ -4917,22 +4722,6 @@
     (pin "2" (uuid 45d7b931-6a8e-493c-b879-d8893a361b82))
   )
 
-  (symbol (lib_id "power:+12V") (at 246.38 152.4 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 34bb6928-de57-492c-a2d9-2a938f6d5aeb)
-    (property "Reference" "#PWR?" (id 0) (at 246.38 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+12V" (id 1) (at 246.38 147.32 0))
-    (property "Footprint" "" (id 2) (at 246.38 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 246.38 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6768fa4a-3cd6-444c-b486-95bc5f2f8c6d))
-  )
-
   (symbol (lib_id "Device:R") (at 63.5 161.29 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3a6f2379-28e7-4737-a8e7-34dc79ea3973)
@@ -5092,39 +4881,6 @@
     (pin "2" (uuid c844cd40-45ca-4a7d-a124-240672186065))
   )
 
-  (symbol (lib_id "power:+3.3V") (at 280.67 152.4 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 730eaf99-2c9a-47f3-ab3a-31b1f0c9d99f)
-    (property "Reference" "#PWR?" (id 0) (at 280.67 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "+3.3V" (id 1) (at 281.051 148.0058 0))
-    (property "Footprint" "" (id 2) (at 280.67 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 280.67 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f7806ca2-d531-41e8-b132-09db595e195b))
-  )
-
-  (symbol (lib_id "Connector:TestPoint") (at 274.32 152.4 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 789dddc8-7ee8-4c3a-a944-77a67f1a5074)
-    (property "Reference" "TP?" (id 0) (at 274.32 144.145 0))
-    (property "Value" "+3V3" (id 1) (at 274.32 146.4564 0))
-    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 279.4 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 279.4 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 274.32 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid ef6e2524-b694-475d-ae82-6db1998f2ac1))
-  )
-
   (symbol (lib_id "power:GND") (at 48.26 118.11 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 8760b43f-eb45-4ac6-a7b1-63d847f10a11)
@@ -5276,28 +5032,6 @@
     (pin "1" (uuid 92d1c498-221a-4636-885f-eb0d77940378))
   )
 
-  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 260.35 152.4 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid d15c4a9e-b254-4358-8e09-a37deff555ae)
-    (property "Reference" "U?" (id 0) (at 260.35 146.2532 0))
-    (property "Value" "LD1117S33TR_SOT223" (id 1) (at 260.35 148.5646 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 260.35 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 262.89 158.75 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 260.35 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "LD1117S33CTR" (id 5) (at 260.35 152.4 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 564e9703-3d03-4f70-a9be-eb02625d0dee))
-    (pin "2" (uuid 0b0ef651-b4b2-439e-8cc8-f9e826be9298))
-    (pin "3" (uuid 46aef440-631d-4ef5-96d8-b8c1de71e7ef))
-  )
-
   (symbol (lib_id "power:GND") (at 60.96 153.67 90) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid dfa1a545-7068-432f-945a-840b274ad1fc)
@@ -5320,13 +5054,16 @@
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e0806eeb-4e96-42a3-933a-3a646a9c42fb)
     (property "Reference" "J?" (id 0) (at 23.495 160.655 0))
-    (property "Value" "CUI-SJ-43515TS-SMT" (id 1) (at 23.495 163.195 0))
+    (property "Value" "SJ-43515TS-SMT" (id 1) (at 23.495 163.195 0))
     (property "Footprint" "mpb:Jack_3.5mm_CUI_SJ-43515TS-SMT" (id 2) (at 19.05 185.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.mouser.ch/datasheet/2/670/sj_4351x_smt-1779337.pdf" (id 3) (at 21.59 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "MPN" "SJ-43515TS-SMT-TR" (id 4) (at 24.13 171.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "NC" (uuid a8a8204c-5290-4e12-a644-92a3e6d8b361))
     (pin "R1" (uuid b9974f66-6588-41a0-a130-290fb464e72a))
     (pin "R2" (uuid 05817e18-ba31-4cd4-ac43-2f65a06bbfac))
@@ -5335,47 +5072,6 @@
     (pin "TN" (uuid f790fc32-86b9-4f1e-998f-ba7a64b6f0eb))
   )
 
-  (symbol (lib_id "Device:CP1") (at 246.38 156.21 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid e2ce56b9-af69-4089-94bf-a23fca3b9a95)
-    (property "Reference" "C?" (id 0) (at 249.301 155.0416 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "10uF" (id 1) (at 249.301 157.353 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 246.38 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 246.38 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "stash X7R" (id 4) (at 246.38 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 246.38 156.21 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 496e9863-c012-455f-a86a-9df08ec59c9e))
-    (pin "2" (uuid c47f3544-afe3-4779-84a2-a3f1d1e2fbd5))
-  )
-
-  (symbol (lib_id "power:GND") (at 260.35 160.02 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid ef9ef389-63eb-4542-8672-53ad2265f550)
-    (property "Reference" "#PWR?" (id 0) (at 260.35 166.37 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 260.477 164.4142 0))
-    (property "Footprint" "" (id 2) (at 260.35 160.02 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 260.35 160.02 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 245d32fd-ccf5-4e86-b3c0-38fbcfb641dc))
-  )
-
   (symbol (lib_id "Device:R") (at 60.96 184.15 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb9b2725-d30e-49f7-a32a-886f6d91f5f8)
diff --git a/kicad-dart-70/kicad-dart-70.kicad_sch b/kicad-dart-70/kicad-dart-70.kicad_sch
index d530763..a07f439 100644
--- a/kicad-dart-70/kicad-dart-70.kicad_sch
+++ b/kicad-dart-70/kicad-dart-70.kicad_sch
@@ -6,7 +6,7 @@
 
   (title_block
     (title "DART-70 TRX")
-    (date "2023-01-15")
+    (date "2023-01-19")
     (rev "0")
     (company "HB9EGM")
     (comment 1 "A 4m Band SSB/CW Transceiver")
@@ -182,59 +182,6 @@
         )
       )
     )
-    (symbol "Connector_Generic:Conn_01x03" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Conn_01x03" (id 1) (at 0 -5.08 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" "connector" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Conn_01x03_1_1"
-        (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 3.81) (end 1.27 -3.81)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type background))
-        )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
-          (name "Pin_1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 0 0) (length 3.81)
-          (name "Pin_2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
-          (name "Pin_3" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
       (property "Reference" "C" (id 0) (at 0.635 2.54 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -286,58 +233,60 @@
         )
       )
     )
-    (symbol "Device:CP1" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "C" (id 0) (at 0.635 2.54 0)
+    (symbol "Device:C_Polarized_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "C" (id 0) (at 0.254 1.778 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Device_CP1" (id 1) (at 0.635 -2.54 0)
+      (property "Value" "C_Polarized_Small" (id 1) (at 0.254 -2.032 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (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" "~" (id 3) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "CP_*" (id 4) (at 0 0 0)
+      (property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "CP1_0_1"
-        (polyline
-          (pts
-            (xy -2.032 0.762)
-            (xy 2.032 0.762)
-          )
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
+      (property "ki_description" "Polarized capacitor, small symbol" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "CP_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "C_Polarized_Small_0_1"
+        (rectangle (start -1.524 -0.3048) (end 1.524 -0.6858)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (rectangle (start -1.524 0.6858) (end 1.524 0.3048)
+          (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.778 2.286)
-            (xy -0.762 2.286)
+            (xy -1.27 1.524)
+            (xy -0.762 1.524)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.27 1.778)
-            (xy -1.27 2.794)
+            (xy -1.016 1.27)
+            (xy -1.016 1.778)
           )
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (arc (start 2.032 -1.27) (mid 0 -0.5572) (end -2.032 -1.27)
-          (stroke (width 0.508) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
       )
-      (symbol "CP1_1_1"
-        (pin passive line (at 0 3.81 270) (length 2.794)
+      (symbol "C_Polarized_Small_1_1"
+        (pin passive line (at 0 2.54 270) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -3.81 90) (length 3.302)
+        (pin passive line (at 0 -2.54 90) (length 1.8542)
           (name "~" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -660,55 +609,6 @@
         )
       )
     )
-    (symbol "Jumper:Jumper_2_Bridged" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "JP" (id 0) (at 0 1.905 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "Jumper_2_Bridged" (id 1) (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "" (id 2) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_keywords" "Jumper SPST" (id 4) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_description" "Jumper, 2-pole, closed/bridged" (id 5) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (property "ki_fp_filters" "Jumper* TestPoint*2Pads* TestPoint*Bridge*" (id 6) (at 0 0 0)
-        (effects (font (size 1.27 1.27)) hide)
-      )
-      (symbol "Jumper_2_Bridged_0_0"
-        (circle (center -2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (circle (center 2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "Jumper_2_Bridged_0_1"
-        (arc (start 1.524 0.254) (mid 0 0.762) (end -1.524 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-      )
-      (symbol "Jumper_2_Bridged_1_1"
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "A" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 0 180) (length 2.54)
-          (name "B" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
     (symbol "Oscillator:Si5351A-B-GT" (in_bom yes) (on_board yes)
       (property "Reference" "U" (id 0) (at -8.89 11.43 0)
         (effects (font (size 1.27 1.27)))
@@ -780,6 +680,49 @@
         )
       )
     )
+    (symbol "Regulator_Linear:LD1117S33TR_SOT223" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "U" (id 0) (at -3.81 3.175 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "LD1117S33TR_SOT223" (id 1) (at 0 3.175 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 2.54 -6.35 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "REGULATOR LDO 3.3V" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 3.3V, SOT-223" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "SOT?223*TabPin2*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "LD1117S33TR_SOT223_0_1"
+        (rectangle (start -5.08 -5.08) (end 5.08 1.905)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
+      )
+      (symbol "LD1117S33TR_SOT223_1_1"
+        (pin power_in line (at 0 -7.62 90) (length 2.54)
+          (name "GND" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_out line (at 7.62 0 180) (length 2.54)
+          (name "VO" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin power_in line (at -7.62 0 0) (length 2.54)
+          (name "VI" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Relay:G6K-2" (in_bom yes) (on_board yes)
       (property "Reference" "K" (id 0) (at 16.51 3.81 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1567,7 +1510,7 @@
   (junction (at 29.21 34.29) (diameter 0) (color 0 0 0 0)
     (uuid 0a082e3d-5a37-45bf-9936-1925b33d6b4f)
   )
-  (junction (at 222.25 177.8) (diameter 0) (color 0 0 0 0)
+  (junction (at 237.49 172.72) (diameter 0) (color 0 0 0 0)
     (uuid 0f37b587-17c8-4f47-b253-2cf37d019d4a)
   )
   (junction (at 152.4 130.81) (diameter 0) (color 0 0 0 0)
@@ -1576,6 +1519,9 @@
   (junction (at 33.02 39.37) (diameter 0) (color 0 0 0 0)
     (uuid 1484c051-867b-42a2-ab15-344bd0f662a5)
   )
+  (junction (at 48.26 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 1c29ab88-8089-4a9f-b0ec-e0493fb70d1a)
+  )
   (junction (at 33.02 34.29) (diameter 0) (color 0 0 0 0)
     (uuid 1fa90692-7773-42d6-8ba8-8ed55432226b)
   )
@@ -1585,39 +1531,42 @@
   (junction (at 29.21 39.37) (diameter 0) (color 0 0 0 0)
     (uuid 2bb5e7ab-7e6e-4e4b-8997-824caea277e9)
   )
-  (junction (at 250.19 185.42) (diameter 0) (color 0 0 0 0)
+  (junction (at 265.43 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 33f289fa-48b2-488e-ac1c-9e506fdc5998)
   )
-  (junction (at 240.03 185.42) (diameter 0) (color 0 0 0 0)
+  (junction (at 255.27 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 3a862fcc-728d-46ff-aba4-42ab7b8a4597)
   )
   (junction (at 119.38 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 3c03082b-2981-4df2-bc33-6ce03d4158b2)
   )
-  (junction (at 265.43 185.42) (diameter 0) (color 0 0 0 0)
+  (junction (at 280.67 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 3d21ed2c-8af2-40b8-995b-0086b5ca387d)
   )
   (junction (at 132.08 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 4049e650-6035-45af-a547-48a992b127be)
   )
-  (junction (at 222.25 185.42) (diameter 0) (color 0 0 0 0)
+  (junction (at 22.86 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid 547281cc-eb15-43de-9560-1b10e39a19ed)
+  )
+  (junction (at 237.49 180.34) (diameter 0) (color 0 0 0 0)
     (uuid 57dc6ee5-bba6-4f16-804b-6425d5f6f958)
   )
-  (junction (at 100.33 57.15) (diameter 0) (color 0 0 0 0)
+  (junction (at 26.67 -15.24) (diameter 0) (color 0 0 0 0)
     (uuid 659cbda1-195b-4dee-97c3-18db29658531)
   )
-  (junction (at 68.58 34.29) (diameter 0) (color 0 0 0 0)
-    (uuid 7a908d51-c916-43aa-8fdb-2e4bdec6c043)
-  )
-  (junction (at 102.87 44.45) (diameter 0) (color 0 0 0 0)
+  (junction (at 29.21 -27.94) (diameter 0) (color 0 0 0 0)
     (uuid 8bfbb559-df73-492c-ad12-a39947b8a2e2)
   )
-  (junction (at 240.03 177.8) (diameter 0) (color 0 0 0 0)
+  (junction (at 255.27 172.72) (diameter 0) (color 0 0 0 0)
     (uuid 987a9aa5-4951-4afc-b306-454b5942bab1)
   )
   (junction (at 96.52 -43.18) (diameter 0) (color 0 0 0 0)
     (uuid 9a3fa19c-537d-4296-bb63-989030ca8dd5)
   )
+  (junction (at 50.8 66.04) (diameter 0) (color 0 0 0 0)
+    (uuid a99cd17b-9938-46df-92bb-88378a42ecd6)
+  )
   (junction (at 167.64 130.81) (diameter 0) (color 0 0 0 0)
     (uuid a9fed849-c0d2-45ff-802c-7da3e4c52c0a)
   )
@@ -1627,22 +1576,25 @@
   (junction (at 86.36 -35.56) (diameter 0) (color 0 0 0 0)
     (uuid aeb1da01-4a44-4c30-b05f-9cec7ebba856)
   )
-  (junction (at 265.43 177.8) (diameter 0) (color 0 0 0 0)
+  (junction (at 280.67 172.72) (diameter 0) (color 0 0 0 0)
     (uuid b0bf6e1a-51f0-4f7d-a90d-b322f5d335e7)
   )
+  (junction (at 36.83 73.66) (diameter 0) (color 0 0 0 0)
+    (uuid b0c265f7-c716-45d5-8397-630db4d2cf65)
+  )
   (junction (at 96.52 -30.48) (diameter 0) (color 0 0 0 0)
     (uuid b80a4902-9741-47e8-9dca-09d8045e2d8b)
   )
-  (junction (at 250.19 177.8) (diameter 0) (color 0 0 0 0)
+  (junction (at 265.43 172.72) (diameter 0) (color 0 0 0 0)
     (uuid c8056791-56cd-4c36-8a94-cde805b65787)
   )
   (junction (at 158.75 -36.83) (diameter 0) (color 0 0 0 0)
     (uuid cf54eac6-4e22-42ca-9fa6-d7f7535b6530)
   )
-  (junction (at 107.95 52.07) (diameter 0) (color 0 0 0 0)
+  (junction (at 34.29 -20.32) (diameter 0) (color 0 0 0 0)
     (uuid d7598061-e53a-4897-bd5a-90ba110b288c)
   )
-  (junction (at 107.95 64.77) (diameter 0) (color 0 0 0 0)
+  (junction (at 34.29 -7.62) (diameter 0) (color 0 0 0 0)
     (uuid d8adb49f-2126-4723-8ce9-bf1a7117d37d)
   )
   (junction (at 177.8 -64.77) (diameter 0) (color 0 0 0 0)
@@ -1665,10 +1617,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 002154dd-fd21-426e-8f51-d82382197384)
   )
-  (wire (pts (xy 55.88 34.29) (xy 68.58 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 02b52dff-2945-47f9-b8fd-a704fc1af2fd)
-  )
   (wire (pts (xy 139.7 125.73) (xy 138.43 125.73))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 05f6334e-7131-4999-b788-1681af60d6df)
@@ -1677,11 +1625,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0ddf1d64-9780-4d45-bbe9-e1ef7d2537e3)
   )
-  (wire (pts (xy 236.22 166.37) (xy 236.22 167.64))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 0deec689-066c-4887-ab4f-5d454bc03f5d)
-  )
-  (wire (pts (xy 240.03 177.8) (xy 250.19 177.8))
+  (wire (pts (xy 255.27 172.72) (xy 265.43 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0f7e9d14-4334-4f32-bfe9-92fd215fb88d)
   )
@@ -1693,6 +1637,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 1191af19-dd21-435c-962e-d45775056556)
   )
+  (wire (pts (xy 22.86 66.04) (xy 22.86 67.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 11b5652b-07d3-428f-98d5-c354cf3693b1)
+  )
   (wire (pts (xy 162.56 -45.72) (xy 158.75 -45.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 141df3ac-0b03-40e1-a2cc-eb98174af7ef)
@@ -1705,26 +1653,26 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 17173695-2043-4565-af3d-54fde6f23867)
   )
-  (wire (pts (xy 100.33 41.91) (xy 100.33 44.45))
+  (wire (pts (xy 48.26 66.04) (xy 50.8 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 19f7333f-620c-4627-8d45-6f7912433af1)
+    (uuid 17ba5b19-2b5b-474e-9c14-1c7d35991587)
   )
-  (wire (pts (xy 275.59 137.16) (xy 309.88 137.16))
+  (wire (pts (xy 26.67 -30.48) (xy 26.67 -27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1c1df546-e0b8-4938-af9a-11a2d54628f4)
-  )
-  (wire (pts (xy 306.07 107.95) (xy 309.88 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 1cb9b8d4-2927-4719-a3be-e6664e0d1c37)
+    (uuid 19f7333f-620c-4627-8d45-6f7912433af1)
   )
   (wire (pts (xy 173.99 -36.83) (xy 173.99 -45.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 20eb0878-92ed-4715-9bf2-99507d350dbd)
   )
-  (wire (pts (xy 250.19 185.42) (xy 265.43 185.42))
+  (wire (pts (xy 265.43 180.34) (xy 280.67 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 24640bcb-dde4-41fa-827c-efb027cf3aa6)
   )
+  (wire (pts (xy 29.21 66.04) (xy 22.86 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 28eca374-9b5c-4480-a1a6-52ddcbb57db2)
+  )
   (wire (pts (xy 191.77 -24.13) (xy 173.99 -24.13))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2a561ed9-b296-4e6a-a0dd-6002fa7fffdc)
@@ -1737,7 +1685,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2fb14d37-de49-4570-be15-220be096d7ff)
   )
-  (wire (pts (xy 222.25 177.8) (xy 224.79 177.8))
+  (wire (pts (xy 237.49 172.72) (xy 240.03 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 378fac25-9ec9-4372-af8a-b41e5bae02dc)
   )
@@ -1749,14 +1697,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 51a3f919-4f6b-4c1a-9e4b-219d7ae9f12e)
   )
-  (wire (pts (xy 90.17 57.15) (xy 100.33 57.15))
+  (wire (pts (xy 16.51 -15.24) (xy 26.67 -15.24))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 52f536b5-e77f-4b31-8427-644dd3f72936)
   )
-  (wire (pts (xy 231.14 167.64) (xy 231.14 166.37))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 56879dcb-f19b-4ada-abf7-05788c417130)
-  )
   (wire (pts (xy 33.02 39.37) (xy 39.37 39.37))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 582ca415-c739-49c6-b2b7-df45a98331ed)
@@ -1769,10 +1713,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 619d38b3-854d-4d48-abf2-cb1aa62b4054)
   )
-  (wire (pts (xy 309.88 137.16) (xy 309.88 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 64394dfa-e31e-44bd-aa2a-6740b72c9446)
-  )
   (wire (pts (xy 33.02 34.29) (xy 39.37 34.29))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6465c817-6f2e-4e62-ac9d-f9a1d93df9e1)
@@ -1785,7 +1725,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 65756912-fb86-4307-8753-f20d3967afa2)
   )
-  (wire (pts (xy 102.87 52.07) (xy 107.95 52.07))
+  (wire (pts (xy 29.21 -20.32) (xy 34.29 -20.32))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 65ab6ccc-834e-4fd9-b802-a3de5308499d)
   )
@@ -1829,6 +1769,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e0abe23-8e7e-48a9-af11-f26197bd8fbf)
   )
+  (wire (pts (xy 22.86 72.39) (xy 22.86 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 99f8394d-1325-4f0e-9ed0-19dceab6e1f9)
+  )
   (wire (pts (xy 96.52 -30.48) (xy 92.71 -30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c52eb74-b8c8-4100-b844-c9be7c6d511d)
@@ -1857,15 +1801,23 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a64d0ff6-4671-4b63-946a-c6b60f6772e2)
   )
+  (wire (pts (xy 22.86 73.66) (xy 36.83 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a69bb6f5-978b-49bb-9446-4ec9cfe4501e)
+  )
   (wire (pts (xy 100.33 -15.24) (xy 92.71 -15.24))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a731f80a-972f-45de-8f8a-42b0b7414eea)
   )
-  (wire (pts (xy 212.09 177.8) (xy 222.25 177.8))
+  (wire (pts (xy 57.15 66.04) (xy 50.8 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a93dd5f3-ded3-42da-9f3d-78740a5a5bff)
+  )
+  (wire (pts (xy 227.33 172.72) (xy 237.49 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b2bf2e05-3221-4db4-bda8-849a4532eddd)
   )
-  (wire (pts (xy 107.95 62.23) (xy 107.95 64.77))
+  (wire (pts (xy 34.29 -10.16) (xy 34.29 -7.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4949bee-fd9e-4c28-83dd-1d0b51850339)
   )
@@ -1889,15 +1841,11 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c24d03f2-5bff-4d74-88e5-481cd2f1e035)
   )
-  (wire (pts (xy 68.58 34.29) (xy 72.39 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c2804cd9-3e42-4d67-ad5f-046296241a38)
-  )
   (wire (pts (xy 123.19 -33.02) (xy 123.19 -30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c353b884-bf6e-4195-82d9-6e347a13f8f2)
   )
-  (wire (pts (xy 212.09 185.42) (xy 222.25 185.42))
+  (wire (pts (xy 227.33 180.34) (xy 237.49 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c3ccffd0-5e76-4c65-89a9-fda2e5be31f6)
   )
@@ -1909,7 +1857,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cbbfb5e5-7e85-4367-b6a7-9b21fc6d9e17)
   )
-  (wire (pts (xy 107.95 64.77) (xy 100.33 64.77))
+  (wire (pts (xy 34.29 -7.62) (xy 26.67 -7.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc38d70f-19c1-4fb5-9f4f-506ef33fa169)
   )
@@ -1917,6 +1865,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc89f37d-2221-4ee8-a763-21432c733f93)
   )
+  (wire (pts (xy 44.45 66.04) (xy 48.26 66.04))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid cdc3b2bb-9f60-476c-ac94-bf550b6e7b5e)
+  )
   (wire (pts (xy 119.38 109.22) (xy 123.19 109.22))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ceb52c7a-a12c-449a-be98-109b3a3bd409)
@@ -1941,22 +1893,22 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid db017b0a-0353-497a-a563-8390daa5d431)
   )
-  (wire (pts (xy 240.03 185.42) (xy 250.19 185.42))
+  (wire (pts (xy 36.83 73.66) (xy 48.26 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid e264f0d9-6386-4838-a810-81df8032f681)
+  )
+  (wire (pts (xy 255.27 180.34) (xy 265.43 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e398653c-c0a3-4f5f-8e64-c2e4f2e156a7)
   )
-  (wire (pts (xy 265.43 185.42) (xy 275.59 185.42))
+  (wire (pts (xy 280.67 180.34) (xy 290.83 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e52dd491-e671-4aa0-8f11-59505c0c6791)
   )
-  (wire (pts (xy 265.43 177.8) (xy 275.59 177.8))
+  (wire (pts (xy 280.67 172.72) (xy 290.83 172.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e616422a-296c-4c3d-9126-d65d78ab0a16)
   )
-  (wire (pts (xy 271.78 114.3) (xy 278.13 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid e8041e79-64e0-42dc-9c18-1cdcb2c92f8f)
-  )
   (wire (pts (xy 177.8 -52.07) (xy 177.8 -45.72))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e95411a5-cb15-4bfe-9998-b0239dde6f5e)
@@ -1969,7 +1921,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ea97e745-2bac-4983-a78b-499e0f8d7b6d)
   )
-  (wire (pts (xy 100.33 44.45) (xy 102.87 44.45))
+  (wire (pts (xy 26.67 -27.94) (xy 29.21 -27.94))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid eab9c503-3cd1-4ca1-95eb-dfcf3401efaa)
   )
@@ -1981,7 +1933,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f38fd353-54b3-403a-9387-7ff36888e6a9)
   )
-  (wire (pts (xy 222.25 185.42) (xy 240.03 185.42))
+  (wire (pts (xy 237.49 180.34) (xy 255.27 180.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f4fd388d-525b-458c-9fc0-2f9761558457)
   )
@@ -1993,17 +1945,29 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid f841e691-04bf-4057-bcb4-476ba3910c05)
   )
+  (wire (pts (xy 48.26 72.39) (xy 48.26 73.66))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fc244ca3-4412-44ac-b1f3-44d00d15b5ac)
+  )
   (wire (pts (xy 170.18 -57.15) (xy 167.64 -57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ff109602-9cbf-44b4-9f41-7af8b1629863)
   )
+  (wire (pts (xy 48.26 66.04) (xy 48.26 67.31))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid ffb99ea8-48c3-486c-94d4-7034e45d57f7)
+  )
 
+  (text "Requires +3V3" (at 199.39 40.64 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 116a8b96-c84a-4d0e-9efd-2c374598e9fc)
+  )
   (text "DONE\nPFET switch instead of relay" (at 252.73 62.23 0)
     (effects (font (size 3 3)) (justify left bottom))
     (uuid 4875a109-b5a5-4c66-bceb-22c84659843a)
   )
   (text "5th order Chebychev\nCutoff 23MHz .. 34MHz\nBandpass Ripple 0.2dB"
-    (at 228.6 193.04 0)
+    (at 243.84 187.96 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 5683de0f-9986-4f35-9c26-10f4a2cf018a)
   )
@@ -2017,24 +1981,20 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid cc99dfff-7e1c-41c9-90b0-50846ceea0a1)
   )
-  (text "TODO\nSeparate 3.3V LDO for clk?" (at 109.22 165.1 0)
-    (effects (font (size 3 3) (thickness 0.6) bold) (justify left bottom))
-    (uuid ec42bbb7-00ad-45ed-b87f-2d3e85dc0756)
+  (text "For Control and Si5351" (at 24.13 58.42 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid f4edd5b2-72b4-45e8-b62f-fa9fad300bad)
   )
 
   (label "CLK1" (at 171.45 130.81 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 37559495-9dfc-4a54-80ee-fad84f20dc2a)
   )
-  (label "IF_TX" (at 271.78 114.3 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 5e96c9dc-ed42-4301-8cfa-b8b1c20a3dd6)
-  )
   (label "+8V" (at 158.75 -26.67 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 71b17479-6c39-4753-b20d-a825c2451b12)
   )
-  (label "EN_12VRX" (at 90.17 57.15 0)
+  (label "EN_12VRX" (at 16.51 -15.24 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 80987d0c-872e-4888-9189-38df98179868)
   )
@@ -2042,22 +2002,10 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8c29f5ca-49c7-4f16-ac34-557eb034e274)
   )
-  (label "HF_RX" (at 259.08 137.16 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid 99e1a020-d6ac-49ff-9b1f-b629705ce0c7)
-  )
   (label "LO1" (at 149.86 123.19 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b1685444-7ed2-49f0-840b-5ade5d456940)
   )
-  (label "IF_RX" (at 275.59 137.16 0)
-    (effects (font (size 1.27 1.27)) (justify left bottom))
-    (uuid ba916ec2-374d-448c-88be-e317fba10eb9)
-  )
-  (label "+8V" (at 68.58 34.29 180)
-    (effects (font (size 1.27 1.27)) (justify right bottom))
-    (uuid ccb112fb-238f-470d-98ee-5268983c8063)
-  )
   (label "+5V" (at 158.75 -16.51 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid db1512d6-86ff-4ba1-93b7-50fbe567100d)
@@ -2081,13 +2029,6 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "+8VRX" (shape input) (at 236.22 167.64 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 4c3ad136-5be9-4513-80de-9cc4704b7b0d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 210.82 139.7 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
   (global_label "SDA" (shape input) (at 113.03 138.43 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7b27748e-95b6-4e72-a559-44948dc7382e)
@@ -2102,13 +2043,6 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "+8V" (shape output) (at 72.39 34.29 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
-    (uuid 934215ee-f64c-4f2e-aab1-091430a300e6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -100.33 -27.94 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
   (global_label "SCL" (shape input) (at 113.03 135.89 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c9ecb380-e98f-45c6-b8cb-94efe9240021)
@@ -2116,10 +2050,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "+12VRX" (shape output) (at 113.03 44.45 0) (fields_autoplaced)
+  (global_label "+12VRX" (shape output) (at 39.37 -27.94 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid db9f82e4-09d6-4707-b385-45f3444d0874)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 123.0026 44.3706 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 49.3426 -28.0194 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
@@ -2131,10 +2065,6 @@
     )
   )
 
-  (hierarchical_label "HF_RX" (shape input) (at 231.14 167.64 180)
-    (effects (font (size 1.27 1.27)) (justify right))
-    (uuid 11e418f9-cbf0-44c9-bf78-4cd79f105743)
-  )
   (hierarchical_label "SWITCH_RELAYn" (shape input) (at 68.58 -35.56 180)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid a1830f45-f348-45e4-b2fb-0eb73dd068b0)
@@ -2165,59 +2095,31 @@
     (pin "2" (uuid 3905c18b-1d10-4d37-9e0c-05d99347c5da))
   )
 
-  (symbol (lib_id "Device:L") (at 222.25 181.61 0) (unit 1)
+  (symbol (lib_id "Device:L") (at 237.49 176.53 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 059bfdce-a55c-480c-b03f-871866a73262)
-    (property "Reference" "L?" (id 0) (at 223.52 180.3399 0)
+    (property "Reference" "L?" (id 0) (at 238.76 175.2599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "82nH" (id 1) (at 223.52 182.8799 0)
+    (property "Value" "82nH" (id 1) (at 238.76 177.7999 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 222.25 181.61 0)
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 237.49 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 222.25 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 237.49 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2BAS82NJ00L" (id 4) (at 222.25 181.61 0)
+    (property "MPN" "LQW2BAS82NJ00L" (id 4) (at 237.49 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 222.25 181.61 0)
+    (property "Need_order" "1" (id 5) (at 237.49 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 54f3b96d-33bd-4085-8f53-1d6b747b4816))
     (pin "2" (uuid 477f305f-c65c-4848-b1cf-0a0d40a9c67d))
   )
 
-  (symbol (lib_id "Device:CP1") (at 55.88 38.1 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 07d93d30-1807-419c-ab93-f9c56b415b45)
-    (property "Reference" "C?" (id 0) (at 58.801 36.9316 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "22uF" (id 1) (at 58.801 39.243 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 55.88 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 55.88 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "stash tantalum" (id 4) (at 55.88 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 5) (at 55.88 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "OriginalValue" "" (id 6) (at 55.88 38.1 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 02807341-1b46-43ae-96b0-78e2f6241af5))
-    (pin "2" (uuid 98003322-24ed-44b2-bbfc-a612e4401c51))
-  )
-
   (symbol (lib_id "power:+3.3V") (at 132.08 109.22 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0a66f684-42c8-4454-8b00-30b8c4ea5d56)
@@ -2315,44 +2217,44 @@
     (pin "1" (uuid b075df74-cc2c-4cf8-b10c-4a6f9df277a3))
   )
 
-  (symbol (lib_id "Device:C") (at 240.03 181.61 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 255.27 176.53 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 1a2f8f90-1bf0-4430-a952-447801ded9d0)
-    (property "Reference" "C?" (id 0) (at 242.951 180.4416 0)
+    (property "Reference" "C?" (id 0) (at 258.191 175.3616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "680pF" (id 1) (at 242.951 182.753 0)
+    (property "Value" "680pF" (id 1) (at 258.191 177.673 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 240.9952 185.42 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 256.2352 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 240.03 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 255.27 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 240.03 181.61 0)
+    (property "MPN" "" (id 4) (at 255.27 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 240.03 181.61 0)
+    (property "Need_order" "1" (id 5) (at 255.27 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7836fd34-c096-4ce5-a173-7f0008dc3019))
     (pin "2" (uuid 09723223-bc98-4871-b146-19568f3cb545))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 105.41 57.15 0) (unit 1)
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 31.75 -15.24 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 1a45911e-c79d-47cc-b39e-1f0c6d42a0a1)
-    (property "Reference" "Q?" (id 0) (at 111.76 57.1499 0)
+    (property "Reference" "Q?" (id 0) (at 38.1 -15.2401 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "IRF7309IPBF" (id 1) (at 111.76 58.4199 0)
+    (property "Value" "IRF7309IPBF" (id 1) (at 38.1 -13.9701 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 110.49 59.055 0)
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 36.83 -13.335 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 107.95 57.15 0)
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 34.29 -15.24 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (pin "1" (uuid ffc7224c-34c5-4ee6-b916-f21ed40aee73))
@@ -2500,22 +2402,20 @@
     (pin "2" (uuid dc6404f1-f3e6-4f85-999e-64b57f65807f))
   )
 
-  (symbol (lib_id "power:GNDA") (at 256.54 165.1 270) (unit 1)
+  (symbol (lib_id "power:+3.3V") (at 57.15 66.04 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid 243aa9f9-a129-4d8b-8707-0d2cae01d225)
-    (property "Reference" "#PWR?" (id 0) (at 250.19 165.1 0)
+    (uuid 297fb073-feb7-4cde-a10e-a6cf257a47de)
+    (property "Reference" "#PWR?" (id 0) (at 57.15 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 253.3142 165.227 90)
-      (effects (font (size 1.27 1.27)) (justify right))
-    )
-    (property "Footprint" "" (id 2) (at 256.54 165.1 0)
+    (property "Value" "+3.3V" (id 1) (at 57.531 61.6458 0))
+    (property "Footprint" "" (id 2) (at 57.15 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 256.54 165.1 0)
+    (property "Datasheet" "" (id 3) (at 57.15 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 61daf43d-54cb-444b-850c-60aac8fe83fe))
+    (pin "1" (uuid 5430bfbb-ddd1-4286-a6e6-a514e47d8b0b))
   )
 
   (symbol (lib_id "Device:C_Small") (at 119.38 111.76 180) (unit 1)
@@ -2567,19 +2467,19 @@
     (pin "8" (uuid c0745940-3b6a-4043-8b0f-32612edd27ee))
   )
 
-  (symbol (lib_id "power:GNDA") (at 107.95 64.77 0) (unit 1)
+  (symbol (lib_id "power:GNDA") (at 34.29 -7.62 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 3f3f3534-00ec-405e-984b-da7c1864ba7b)
-    (property "Reference" "#PWR?" (id 0) (at 107.95 71.12 0)
+    (property "Reference" "#PWR?" (id 0) (at 34.29 -1.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 108.077 67.9958 90)
+    (property "Value" "GNDA" (id 1) (at 34.417 -4.3942 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "" (id 2) (at 107.95 64.77 0)
+    (property "Footprint" "" (id 2) (at 34.29 -7.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 107.95 64.77 0)
+    (property "Datasheet" "" (id 3) (at 34.29 -7.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 455bfd34-5ff9-4ba5-bbee-2c191c145d16))
@@ -2624,27 +2524,55 @@
     (pin "2" (uuid f480cd12-f699-4529-ad30-1b027180f0be))
   )
 
-  (symbol (lib_id "Device:C") (at 254 177.8 90) (unit 1)
+  (symbol (lib_id "Device:C") (at 269.24 172.72 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 4d261602-597b-425d-bfad-b534ed4dce7c)
-    (property "Reference" "C?" (id 0) (at 254 170.18 90))
-    (property "Value" "33pF" (id 1) (at 254 172.72 90))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 257.81 176.8348 0)
+    (property "Reference" "C?" (id 0) (at 269.24 165.1 90))
+    (property "Value" "33pF" (id 1) (at 269.24 167.64 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 273.05 171.7548 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 254 177.8 0)
+    (property "Datasheet" "~" (id 3) (at 269.24 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "CBR" (id 4) (at 254 177.8 0)
+    (property "MPN" "CBR" (id 4) (at 269.24 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 254 177.8 0)
+    (property "Need_order" "0" (id 5) (at 269.24 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6dfe5d80-8f20-4050-8322-ce69950faa82))
     (pin "2" (uuid 67c68cd1-58bf-4b40-b22b-fe672603db52))
   )
 
+  (symbol (lib_id "Device:C_Polarized_Small") (at 48.26 69.85 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4f85864b-dffa-48c5-a3ea-03c083def1f8)
+    (property "Reference" "C?" (id 0) (at 51.181 68.6816 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "22uF" (id 1) (at 51.181 70.993 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "stash tantalum" (id 4) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 5) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 48.26 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0e42e104-dcdc-406d-98c2-e11733a0f186))
+    (pin "2" (uuid 1b475c61-5ed3-4f7a-a844-4a29a578ad64))
+  )
+
   (symbol (lib_id "Device:R") (at 161.29 -57.15 270) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 57d4f4ed-6e5f-4e11-adb3-12348adf79c1)
@@ -2678,41 +2606,22 @@
     (pin "2" (uuid 9d7dc0d3-56fd-4842-b1b9-5573881f4809))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x03") (at 233.68 161.29 90) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 69573fe5-cb09-414e-b3be-df840b699d82)
-    (property "Reference" "J?" (id 0) (at 233.7816 155.7782 90))
-    (property "Value" "RX Filt in" (id 1) (at 233.7816 158.0896 90))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 233.68 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 233.68 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 233.68 161.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e52106a5-eb1e-403c-9b5d-3d6f06546f28))
-    (pin "2" (uuid 5ef5e666-0c8a-481e-b50b-b802e3f6375c))
-    (pin "3" (uuid 1aec9e1f-a6ab-4e7c-af0d-be5acfc9b162))
-  )
-
-  (symbol (lib_id "Device:R") (at 102.87 48.26 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 29.21 -24.13 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 69800fcf-feb7-449a-8627-fe72f1f0f460)
-    (property "Reference" "R?" (id 0) (at 100.33 46.9899 0)
+    (property "Reference" "R?" (id 0) (at 26.67 -25.4001 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "12k" (id 1) (at 100.33 49.5299 0)
+    (property "Value" "12k" (id 1) (at 26.67 -22.8601 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 101.092 48.26 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 27.432 -24.13 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 102.87 48.26 0)
+    (property "Datasheet" "~" (id 3) (at 29.21 -24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 102.87 48.26 0)
+    (property "Need_order" "" (id 4) (at 29.21 -24.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a8857a4d-8214-488e-ad90-aab4c186f83f))
@@ -2808,21 +2717,21 @@
     (pin "1" (uuid fbbf55b8-9cec-4b64-a0f3-ccff9b73bc0a))
   )
 
-  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 107.95 46.99 270) (mirror x) (unit 2)
+  (symbol (lib_id "Transistor_FET:IRF7309IPBF") (at 34.29 -25.4 270) (mirror x) (unit 2)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 7a503c86-7f50-466c-86f4-718b4b269cc5)
-    (property "Reference" "Q?" (id 0) (at 107.95 36.83 90))
-    (property "Value" "IRF7309" (id 1) (at 107.95 39.37 90))
-    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 106.045 41.91 0)
+    (property "Reference" "Q?" (id 0) (at 34.29 -35.56 90))
+    (property "Value" "IRF7309" (id 1) (at 34.29 -33.02 90))
+    (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 32.385 -30.48 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 107.95 44.45 0)
+    (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf7309ipbf.pdf" (id 3) (at 34.29 -27.94 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
-    (property "MPN" "IRF7309IPBF" (id 5) (at 107.95 46.99 90)
+    (property "MPN" "IRF7309IPBF" (id 5) (at 34.29 -25.4 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 4) (at 107.95 46.99 90)
+    (property "Need_order" "1" (id 4) (at 34.29 -25.4 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d98f2c33-a62f-4cf8-87a2-61168649f191))
@@ -2835,6 +2744,28 @@
     (pin "6" (uuid 47056ef3-52c1-44e1-8605-b1123fdc77f2))
   )
 
+  (symbol (lib_id "Regulator_Linear:LD1117S33TR_SOT223") (at 36.83 66.04 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 7a8d8b49-894e-4df2-a14e-077959df16ce)
+    (property "Reference" "U?" (id 0) (at 36.83 59.8932 0))
+    (property "Value" "LD1117S33" (id 1) (at 36.83 62.2046 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (id 2) (at 36.83 60.96 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00000544.pdf" (id 3) (at 39.37 72.39 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 36.83 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "LD1117S33CTR" (id 5) (at 36.83 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 12b58730-fcab-4370-ae5a-aaf7b0fb6ffd))
+    (pin "2" (uuid c50d35de-5a80-45d6-ae48-15d8564bdf02))
+    (pin "3" (uuid 4e64102f-9bcf-4059-8642-0c100be737f2))
+  )
+
   (symbol (lib_id "power:GND") (at 243.84 116.84 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 7b80522d-1b73-4562-8423-74091f204fce)
@@ -2868,23 +2799,6 @@
     (pin "1" (uuid 394866e0-27f8-4336-895c-22b0b8b72f13))
   )
 
-  (symbol (lib_id "Connector:TestPoint") (at 68.58 34.29 180) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 858caef3-c221-4e4f-ae07-894951f3108e)
-    (property "Reference" "TP?" (id 0) (at 68.58 40.2082 0))
-    (property "Value" "+8V" (id 1) (at 68.58 42.5196 0))
-    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 63.5 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 63.5 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 68.58 34.29 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 0f9f47e1-103b-4832-98d6-b66fb396f498))
-  )
-
   (symbol (lib_id "Relay:G6K-2") (at 110.49 -22.86 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 877206fc-fbd9-4c0a-9c4a-a0fb40faa371)
@@ -2945,91 +2859,82 @@
     (pin "1" (uuid 11439d1e-008f-481c-a5ce-742b2fdbd01c))
   )
 
-  (symbol (lib_id "Jumper:Jumper_2_Bridged") (at 270.51 137.16 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 9414ea2b-59ca-4cc4-beca-febd811b6b99)
-    (property "Reference" "J?" (id 0) (at 270.51 132.207 0))
-    (property "Value" "HF_RX" (id 1) (at 270.51 134.5184 0))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 270.51 137.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 270.51 137.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Need_order" "" (id 4) (at 270.51 137.16 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 95d6a890-39e7-490c-88a4-420616655d61))
-    (pin "2" (uuid e8fe7677-bfbc-4c3a-9c75-f3d6c9ebd9a2))
-  )
-
-  (symbol (lib_id "Device:C") (at 265.43 181.61 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 280.67 176.53 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 982871ff-0fa5-4ce8-899e-85d3dce36aa2)
-    (property "Reference" "C?" (id 0) (at 268.351 180.4416 0)
+    (property "Reference" "C?" (id 0) (at 283.591 175.3616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "390pF" (id 1) (at 268.351 182.753 0)
+    (property "Value" "390pF" (id 1) (at 283.591 177.673 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 266.3952 185.42 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 281.6352 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 265.43 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 280.67 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 265.43 181.61 0)
+    (property "MPN" "" (id 4) (at 280.67 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 265.43 181.61 0)
+    (property "Need_order" "1" (id 5) (at 280.67 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 45fcd5c6-adaa-48b0-8334-b8e89f15a673))
     (pin "2" (uuid c0905aa0-e744-4b53-9217-e1cf561d13f3))
   )
 
-  (symbol (lib_id "Device:L") (at 275.59 181.61 0) (unit 1)
+  (symbol (lib_id "Device:L") (at 290.83 176.53 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9a82f78c-11c0-4baa-8636-54feba66a9ca)
-    (property "Reference" "L?" (id 0) (at 276.86 180.3399 0)
+    (property "Reference" "L?" (id 0) (at 292.1 175.2599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "82nH" (id 1) (at 276.86 182.8799 0)
+    (property "Value" "82nH" (id 1) (at 292.1 177.7999 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 275.59 181.61 0)
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 290.83 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 275.59 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 290.83 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2BAS82NJ00L" (id 4) (at 275.59 181.61 0)
+    (property "MPN" "LQW2BAS82NJ00L" (id 4) (at 290.83 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 275.59 181.61 0)
+    (property "Need_order" "1" (id 5) (at 290.83 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 13c1ae0d-2ce7-4cc5-8d18-f50745e8b679))
     (pin "2" (uuid 5898b9b3-82d6-4b09-aba0-e384d8a08b34))
   )
 
-  (symbol (lib_id "Connector_Generic:Conn_01x03") (at 259.08 160.02 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 9f18f177-dc0e-4af7-8684-e2433dac8ff0)
-    (property "Reference" "J?" (id 0) (at 258.9784 154.5082 90))
-    (property "Value" "RX Filt out" (id 1) (at 258.9784 156.8196 90))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 259.08 160.02 0)
+  (symbol (lib_id "Device:C_Polarized_Small") (at 22.86 69.85 0) (mirror y) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9aafdc7e-7c4c-4dd3-a761-35d7224b5c29)
+    (property "Reference" "C?" (id 0) (at 20.32 68.0338 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "10uF" (id 1) (at 20.32 70.5738 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" (id 2) (at 22.86 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 259.08 160.02 0)
+    (property "Datasheet" "~" (id 3) (at 22.86 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 259.08 160.02 0)
+    (property "MPN" "TAJA106K016RNJ" (id 4) (at 22.86 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e470f6ef-9f2d-4697-a639-b89d3ae850eb))
-    (pin "2" (uuid 5edfd03d-8059-413a-95ea-9acc6b79d547))
-    (pin "3" (uuid 11b3ce90-93ea-4204-98b2-1d9aad53b9e5))
+    (property "Need_order" "" (id 5) (at 22.86 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "OriginalValue" "" (id 6) (at 22.86 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c1880c67-928c-4c29-84b2-8365b725c870))
+    (pin "2" (uuid 087adf8a-e662-4b1e-a380-588e9789b1e7))
   )
 
   (symbol (lib_id "power:GNDA") (at 152.4 138.43 0) (unit 1)
@@ -3050,21 +2955,21 @@
     (pin "1" (uuid a2cc5352-c3c9-4f00-9512-1be05579f7cb))
   )
 
-  (symbol (lib_id "Device:C") (at 228.6 177.8 90) (unit 1)
+  (symbol (lib_id "Device:C") (at 243.84 172.72 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a3428874-8d4b-4441-a8a0-f1944e7a8237)
-    (property "Reference" "C?" (id 0) (at 228.6 170.18 90))
-    (property "Value" "33pF" (id 1) (at 228.6 172.72 90))
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 232.41 176.8348 0)
+    (property "Reference" "C?" (id 0) (at 243.84 165.1 90))
+    (property "Value" "33pF" (id 1) (at 243.84 167.64 90))
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 247.65 171.7548 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 228.6 177.8 0)
+    (property "Datasheet" "~" (id 3) (at 243.84 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "CBR" (id 4) (at 228.6 177.8 0)
+    (property "MPN" "CBR" (id 4) (at 243.84 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 228.6 177.8 0)
+    (property "Need_order" "0" (id 5) (at 243.84 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3f5c1a23-416e-495d-bd8a-095c74664911))
@@ -3107,17 +3012,17 @@
     (pin "1" (uuid 2a594e31-b0c7-4429-be4b-8f75cdf4c3ec))
   )
 
-  (symbol (lib_id "power:+12V") (at 100.33 41.91 0) (unit 1)
+  (symbol (lib_id "power:+12V") (at 26.67 -30.48 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid af57b027-831f-450a-b453-05f28d468bcb)
-    (property "Reference" "#PWR?" (id 0) (at 100.33 45.72 0)
+    (property "Reference" "#PWR?" (id 0) (at 26.67 -26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+12V" (id 1) (at 100.711 37.5158 0))
-    (property "Footprint" "" (id 2) (at 100.33 41.91 0)
+    (property "Value" "+12V" (id 1) (at 27.051 -34.8742 0))
+    (property "Footprint" "" (id 2) (at 26.67 -30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 100.33 41.91 0)
+    (property "Datasheet" "" (id 3) (at 26.67 -30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c74c96fa-6a27-444c-89e9-0ae75f9d592f))
@@ -3201,6 +3106,38 @@
     (pin "3" (uuid cd68798f-a8a8-4514-8e01-6f13cbda0ffa))
   )
 
+  (symbol (lib_id "power:+12V") (at 22.86 66.04 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid bfa17e18-87c4-489b-9c41-1249819749aa)
+    (property "Reference" "#PWR?" (id 0) (at 22.86 69.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+12V" (id 1) (at 22.86 60.96 0))
+    (property "Footprint" "" (id 2) (at 22.86 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 22.86 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid a559c5f1-aafa-4d8a-92d3-3ca621c21f99))
+  )
+
+  (symbol (lib_id "power:GND") (at 36.83 73.66 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid c12281a8-14ce-49d6-bfc7-51cbd063becb)
+    (property "Reference" "#PWR?" (id 0) (at 36.83 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 36.957 78.0542 0))
+    (property "Footprint" "" (id 2) (at 36.83 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 36.83 73.66 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4ce1a304-4a4b-4870-8e34-dd6d20d9af8b))
+  )
+
   (symbol (lib_id "Connector:Conn_Coaxial") (at 243.84 111.76 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c2556c3e-4acc-461a-b131-ccfaaa8f1356)
@@ -3255,21 +3192,21 @@
     (pin "2" (uuid fc5299d7-61c3-42b8-a5ae-2e8de242a46e))
   )
 
-  (symbol (lib_id "Device:L") (at 261.62 177.8 90) (unit 1)
+  (symbol (lib_id "Device:L") (at 276.86 172.72 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c67da606-97c6-4308-bb90-660f683511fc)
-    (property "Reference" "L?" (id 0) (at 261.62 171.45 90))
-    (property "Value" "1uH" (id 1) (at 261.62 173.99 90))
-    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 261.62 177.8 0)
+    (property "Reference" "L?" (id 0) (at 276.86 166.37 90))
+    (property "Value" "1uH" (id 1) (at 276.86 168.91 90))
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 276.86 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 261.62 177.8 0)
+    (property "Datasheet" "~" (id 3) (at 276.86 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2UAS" (id 4) (at 261.62 177.8 0)
+    (property "MPN" "LQW2UAS" (id 4) (at 276.86 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 261.62 177.8 0)
+    (property "Need_order" "0" (id 5) (at 276.86 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a00c5d6c-168b-469c-b495-ed7b6fb7f218))
@@ -3292,21 +3229,21 @@
     (pin "1" (uuid 53879a4a-4bf6-48ec-93e8-124655c03e90))
   )
 
-  (symbol (lib_id "Device:L") (at 236.22 177.8 90) (unit 1)
+  (symbol (lib_id "Device:L") (at 251.46 172.72 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cc0f1216-a279-495b-96f2-3e7294f89b9f)
-    (property "Reference" "L?" (id 0) (at 236.22 171.45 90))
-    (property "Value" "1uH" (id 1) (at 236.22 173.99 90))
-    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 236.22 177.8 0)
+    (property "Reference" "L?" (id 0) (at 251.46 166.37 90))
+    (property "Value" "1uH" (id 1) (at 251.46 168.91 90))
+    (property "Footprint" "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder" (id 2) (at 251.46 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 236.22 177.8 0)
+    (property "Datasheet" "~" (id 3) (at 251.46 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2UAS" (id 4) (at 236.22 177.8 0)
+    (property "MPN" "LQW2UAS" (id 4) (at 251.46 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "0" (id 5) (at 236.22 177.8 0)
+    (property "Need_order" "0" (id 5) (at 251.46 172.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2a656e71-4fa8-4cd4-b9b4-9763bab90a8e))
@@ -3373,25 +3310,25 @@
     (pin "2" (uuid 21673f41-8a54-432c-8bd4-1ce870bdabf2))
   )
 
-  (symbol (lib_id "Device:C") (at 212.09 181.61 0) (unit 1)
+  (symbol (lib_id "Device:C") (at 227.33 176.53 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid d373170a-16eb-497b-8757-673ad151586d)
-    (property "Reference" "C?" (id 0) (at 215.011 180.4416 0)
+    (property "Reference" "C?" (id 0) (at 230.251 175.3616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "390pF" (id 1) (at 215.011 182.753 0)
+    (property "Value" "390pF" (id 1) (at 230.251 177.673 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 213.0552 185.42 0)
+    (property "Footprint" "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 228.2952 180.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 212.09 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 227.33 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "" (id 4) (at 212.09 181.61 0)
+    (property "MPN" "" (id 4) (at 227.33 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "1" (id 5) (at 212.09 181.61 0)
+    (property "Need_order" "1" (id 5) (at 227.33 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f9622c15-191b-4504-bc1a-98f964d1f6f5))
@@ -3416,22 +3353,22 @@
     (pin "1" (uuid d8a3e89d-f051-4c24-8880-ae7c3f5043b3))
   )
 
-  (symbol (lib_id "Device:R") (at 100.33 60.96 180) (unit 1)
+  (symbol (lib_id "Device:R") (at 26.67 -11.43 180) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d6698ac4-4460-48e9-bf22-5265ecf836b6)
-    (property "Reference" "R?" (id 0) (at 97.79 59.6899 0)
+    (property "Reference" "R?" (id 0) (at 24.13 -12.7001 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10k" (id 1) (at 97.79 62.2299 0)
+    (property "Value" "10k" (id 1) (at 24.13 -10.1601 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 102.108 60.96 90)
+    (property "Footprint" "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" (id 2) (at 28.448 -11.43 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 100.33 60.96 0)
+    (property "Datasheet" "~" (id 3) (at 26.67 -11.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 4) (at 100.33 60.96 0)
+    (property "Need_order" "" (id 4) (at 26.67 -11.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 49be69f2-d125-4d11-afde-afeb3ac01df8))
@@ -3459,25 +3396,25 @@
     (pin "2" (uuid f2bd5a54-b226-4b90-8ebf-eec411f94ea5))
   )
 
-  (symbol (lib_id "Device:L") (at 250.19 181.61 0) (unit 1)
+  (symbol (lib_id "Device:L") (at 265.43 176.53 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dfa7ab25-229b-402d-a494-1f98c1bd8242)
-    (property "Reference" "L?" (id 0) (at 251.46 180.3399 0)
+    (property "Reference" "L?" (id 0) (at 266.7 175.2599 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "56nH" (id 1) (at 251.46 182.8799 0)
+    (property "Value" "56nH" (id 1) (at 266.7 177.7999 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 250.19 181.61 0)
+    (property "Footprint" "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 265.43 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 250.19 181.61 0)
+    (property "Datasheet" "~" (id 3) (at 265.43 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "MPN" "LQW2BAS56NG00L" (id 4) (at 250.19 181.61 0)
+    (property "MPN" "LQW2BAS56NG00L" (id 4) (at 265.43 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Need_order" "" (id 5) (at 250.19 181.61 0)
+    (property "Need_order" "" (id 5) (at 265.43 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2aeb7a30-3fce-4fbf-884b-a498691e67bb))
@@ -3506,6 +3443,23 @@
     (pin "2" (uuid 8c9f62b6-0df1-4301-b408-a64c43e4a0d4))
   )
 
+  (symbol (lib_id "Connector:TestPoint") (at 50.8 66.04 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid e34ebb9f-d06c-41e9-bb37-b5ac2dd6aa42)
+    (property "Reference" "TP?" (id 0) (at 50.8 57.785 0))
+    (property "Value" "+3V3" (id 1) (at 50.8 60.0964 0))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 55.88 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 55.88 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Need_order" "" (id 4) (at 50.8 66.04 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 23a8ca08-4382-4a42-b4d1-41b691a96d0c))
+  )
+
   (symbol (lib_id "Device:R") (at 86.36 -39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e3d7bdb3-1046-49f1-bf69-cfc864a8b55d)
@@ -3588,22 +3542,6 @@
     (pin "1" (uuid 3b3b3d7c-eb5e-423b-8e5a-bce93c214583))
   )
 
-  (symbol (lib_id "power:GND") (at 55.88 41.91 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid f59b16b2-3e65-4376-8346-5cda2772b35f)
-    (property "Reference" "#PWR?" (id 0) (at 55.88 48.26 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 56.007 46.3042 0))
-    (property "Footprint" "" (id 2) (at 55.88 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 55.88 41.91 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 01dd1d25-ae23-4208-95c6-5ef895b17acd))
-  )
-
   (symbol (lib_id "power:GND") (at 33.02 39.37 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid f8e05519-32a3-45ad-8dbb-3065d43fa200)
@@ -3739,6 +3677,14 @@
       (effects (font (size 1.27 1.27)) (justify left))
       (uuid e5da08d7-949e-4e30-9eb3-a55a5553c4f4)
     )
+    (pin "EN_VTX" input (at 198.12 109.22 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid 98202658-c32d-42c8-bac8-31778fbd36d8)
+    )
+    (pin "EN_VRX" input (at 198.12 111.76 180)
+      (effects (font (size 1.27 1.27)) (justify left))
+      (uuid da8a7301-6539-4ba7-a4da-9a1a24977b4b)
+    )
   )
 
   (sheet (at 278.13 96.52) (size 27.94 22.86) (fields_autoplaced)
@@ -3797,8 +3743,8 @@
     (path "/" (page "1"))
     (path "/b27332de-5841-4080-a117-6f6d9cd04da8" (page "2"))
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93" (page "3"))
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27" (page "5"))
-    (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4" (page "6"))
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27" (page "4"))
+    (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4" (page "5"))
   )
 
   (symbol_instances
@@ -4051,9 +3997,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005ef9cdf8"
       (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005f0402fb"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
     (path "/b27332de-5841-4080-a117-6f6d9cd04da8/00000000-0000-0000-0000-00005fb7b9dc"
       (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
     )
@@ -4114,6 +4057,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/020bd727-0520-4079-bebc-9041418f2d37"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/03272278-e3db-4be6-8479-99758255fb4d"
+      (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/05290e23-4b5d-4968-ab99-eef25ec0f2e2"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4129,6 +4075,9 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/12dd6f1e-8210-4dfc-adb0-4ba6bc669821"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/13f9cf6a-28ed-4a40-a578-742db0146f85"
+      (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/14521668-992a-410d-89b1-74da55e2f6d9"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4156,12 +4105,15 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/233c93e6-df2b-480c-a3fe-1a65a419c3f6"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
-    (path "/243aa9f9-a129-4d8b-8707-0d2cae01d225"
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/24628b06-bcd7-4b16-a566-041852aee771"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/26a93e83-a06a-419a-96db-e3679b5afa3e"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/297fb073-feb7-4cde-a10e-a6cf257a47de"
+      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2a48f53c-3809-4098-9337-9f6dd17da892"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4177,9 +4129,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/349c2b68-17ab-4a67-9461-deea864b1789"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/34bb6928-de57-492c-a2d9-2a938f6d5aeb"
-      (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/354bbddf-758c-4d9b-b3bb-3a9075b4a421"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4231,6 +4180,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/57527c92-9704-4f70-b6ab-4ba22bb44b90"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/58ba88e3-2644-409b-bf93-a97d876b43f5"
+      (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/5a4791ba-491f-4432-961f-1b249da54e4f"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4261,9 +4213,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/719adbed-b256-4f48-998e-adc4c6bda11f"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/730eaf99-2c9a-47f3-ab3a-31b1f0c9d99f"
-      (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/77f720e6-afb1-4708-88c7-bbfe0d74e853"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4294,6 +4243,9 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/8760b43f-eb45-4ac6-a7b1-63d847f10a11"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/876b2743-4d0f-4dbc-9633-63f78538646b"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/87b73833-1cad-43ad-ae9c-a4e38027942e"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4309,6 +4261,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/91318dee-2866-4619-95b1-4ff6847df4c4"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/942acf4b-8a96-4c46-ac34-0486d093be57"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/94a0256b-3533-4ef4-82a8-5a55804c7f98"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4339,6 +4294,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/a7f4aa41-642c-45a2-b040-50c879175c44"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/a8c9eac3-af1d-4c0f-9b95-28ebab57f749"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/ae4ef461-23fa-4b6d-87fe-5f69249b5ab4"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
@@ -4366,6 +4324,18 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b9de5f7c-067b-48fa-8477-cf727fd25bf1"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/befa6780-5c05-4352-b06a-3531a39e8bf5"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
+    (path "/bfa17e18-87c4-489b-9c41-1249819749aa"
+      (reference "#PWR?") (unit 1) (value "+12V") (footprint "")
+    )
+    (path "/c12281a8-14ce-49d6-bfc7-51cbd063becb"
+      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c2df5cf9-b8d5-4372-a132-9c4be7ddf003"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
     (path "/c4e31ce9-8700-41b8-bdf9-9bb94b0cfe14"
       (reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
     )
@@ -4408,24 +4378,21 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/e95bd894-167c-40e5-a7d3-8a074539ab69"
       (reference "#PWR?") (unit 1) (value "+5VA") (footprint "")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/ef9ef389-63eb-4542-8672-53ad2265f550"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/f343b8b7-a399-411f-aab7-be140049181b"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f35243ea-70a8-4861-b1e5-87022345fc08"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
-    (path "/f59b16b2-3e65-4376-8346-5cda2772b35f"
-      (reference "#PWR?") (unit 1) (value "GND") (footprint "")
-    )
     (path "/f8e05519-32a3-45ad-8dbb-3065d43fa200"
       (reference "#PWR?") (unit 1) (value "GND") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/fb43d9a5-77ef-4e0c-93ca-74cab7be4888"
       (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/fbed3405-f96f-4256-ba81-51be4d6cb88b"
+      (reference "#PWR?") (unit 1) (value "GNDA") (footprint "")
+    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/feb3ba42-7cf8-4d9f-8d5c-5ecda4d3a9ba"
       (reference "#PWR?") (unit 1) (value "+5VA") (footprint "")
     )
@@ -4729,9 +4696,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/0767cfad-d041-4c40-b142-2710b6d06e0f"
       (reference "C?") (unit 1) (value "DNF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
-    (path "/07d93d30-1807-419c-ab93-f9c56b415b45"
-      (reference "C?") (unit 1) (value "22uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/0dfdc0aa-3e1a-42ab-8203-fa0bcce2f05d"
       (reference "C?") (unit 1) (value "65pF") (footprint "picardy:C_trimmer_60pF")
     )
@@ -4765,9 +4729,6 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/2bbeeb72-f562-464f-a2d8-22926ab39a60"
       (reference "C?") (unit 1) (value "100pF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/2fb0ff3e-af89-4cd7-a2e5-ab2cf92b7b45"
-      (reference "C?") (unit 1) (value "22uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/3362462d-aa48-4506-8fdc-fed4c6bd7feb"
       (reference "C?") (unit 1) (value "68pF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -4798,6 +4759,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/4e6fc76b-450c-4792-9a36-cac0f875f94a"
       (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
+    (path "/4f85864b-dffa-48c5-a3ea-03c083def1f8"
+      (reference "C?") (unit 1) (value "22uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/56f9f753-8b29-4d01-9f77-3b40dbd06ddf"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -4816,12 +4780,18 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/619fc7f8-564c-4cfc-a622-bf3e0ffcf7a7"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/623947b0-76f8-478f-8077-454a3c3d3059"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/67ce5169-321d-48f7-947b-b4583319d8a8"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/6b3dab91-57c7-46a8-a11a-f52bdca37c93"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7256d241-c551-4211-a37c-383301b27340"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7266f3d7-99c1-41a2-afd6-517570504a61"
       (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -4852,9 +4822,15 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/8c60766a-0061-4110-9308-decf03c894ba"
       (reference "C?") (unit 1) (value "1uF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/9578d03f-4ecf-4253-ab7c-8492982a3872"
+      (reference "C?") (unit 1) (value "TBD") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
+    )
     (path "/982871ff-0fa5-4ce8-899e-85d3dce36aa2"
       (reference "C?") (unit 1) (value "390pF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/9aafdc7e-7c4c-4dd3-a761-35d7224b5c29"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/a164cd11-f000-430f-a28b-6641e65b3ca7"
       (reference "C?") (unit 1) (value "100pF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -4909,9 +4885,6 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/e16297a0-d610-49ed-9c5b-36949ff6f596"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/e2ce56b9-af69-4089-94bf-a23fca3b9a95"
-      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/e3dced21-eb35-4151-91e7-971aaeb5c614"
       (reference "C?") (unit 1) (value "10nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
     )
@@ -4921,6 +4894,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/e70056a5-d0a8-4878-884c-ee0bc58d7b2f"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/e9497301-9b60-4bc7-94e0-5a0820a55a4c"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/e9b4e065-5f66-4965-848d-d8a936238953"
       (reference "C?") (unit 1) (value "82pF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
     )
@@ -4930,6 +4906,12 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/eacb8690-bbfe-4cd4-916f-b6bef5f2fdb7"
       (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f098ce67-0336-4914-9677-9b654f4c37f1"
+      (reference "C?") (unit 1) (value "TBD") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f192297e-69ff-4fa3-bd49-f6b30525fc4f"
+      (reference "C?") (unit 1) (value "10uF") (footprint "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f67b33a7-5174-437c-99cf-02ccf86b5641"
       (reference "C?") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5062,18 +5044,9 @@
     (path "/677314cf-085c-44b6-bb48-31621b837e1c"
       (reference "J?") (unit 1) (value "12V") (footprint "")
     )
-    (path "/69573fe5-cb09-414e-b3be-df840b699d82"
-      (reference "J?") (unit 1) (value "RX Filt in") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/6d820c62-2ab0-46e1-a4bf-ebea05473b6c"
       (reference "J?") (unit 1) (value "BMI-S-209-F+BMI-S-209-C") (footprint "")
     )
-    (path "/9414ea2b-59ca-4cc4-beca-febd811b6b99"
-      (reference "J?") (unit 1) (value "HF_RX") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
-    )
-    (path "/9f18f177-dc0e-4af7-8684-e2433dac8ff0"
-      (reference "J?") (unit 1) (value "RX Filt out") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/a6768fc0-507a-43ad-824b-5f11fb2d3a1e"
       (reference "J?") (unit 1) (value "XTALFILT") (footprint "")
     )
@@ -5093,7 +5066,7 @@
       (reference "J?") (unit 1) (value "VHF") (footprint "Connector_Coaxial:SMA_Amphenol_132289_EdgeMount")
     )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/e0806eeb-4e96-42a3-933a-3a646a9c42fb"
-      (reference "J?") (unit 1) (value "CUI-SJ-43515TS-SMT") (footprint "mpb:Jack_3.5mm_CUI_SJ-43515TS-SMT")
+      (reference "J?") (unit 1) (value "SJ-43515TS-SMT") (footprint "mpb:Jack_3.5mm_CUI_SJ-43515TS-SMT")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/f5129df1-6a0c-4f94-a3e9-eb87bae5a941"
       (reference "J?") (unit 1) (value "XTALFILT") (footprint "")
@@ -5176,9 +5149,15 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/266a70f6-e26f-44e8-a4e7-a27fdea8bc85"
       (reference "L?") (unit 1) (value "120uH") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/3d728ab5-fe34-49e0-983a-a52237626250"
+      (reference "L?") (unit 1) (value "10t tri on 43 or MABA-009488") (footprint "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/67918753-831f-4b6c-82e2-5a4b3fbaa83c"
       (reference "L?") (unit 1) (value "120uH") (footprint "")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/8554cc98-0cbb-4f6a-b636-f2917076a214"
+      (reference "L?") (unit 1) (value "TBD") (footprint "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/92f28f5a-680c-4bd4-83b0-0fad8e359da8"
       (reference "L?") (unit 1) (value "120uH") (footprint "")
     )
@@ -5188,6 +5167,12 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/a106d720-f48d-4edc-923c-b4d6387dd7b0"
       (reference "L?") (unit 1) (value "220nH") (footprint "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/a94ee8cd-c574-40c4-8eda-7a181fc1dac0"
+      (reference "L?") (unit 1) (value "TBD") (footprint "Inductor_SMD:L_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/aa5b705c-c07d-4496-86b4-061b7508dbb5"
+      (reference "L?") (unit 1) (value "10t tri on 43 or MABA-009488") (footprint "Transformer_THT:Autotransformer_Toroid_1Tap_Horizontal_D10.5mm_Amidon-T37")
+    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/ab8de3bf-51bb-48d2-aa62-7b1ffb273744"
       (reference "L?") (unit 1) (value "120nH") (footprint "")
     )
@@ -5195,7 +5180,7 @@
       (reference "L?") (unit 1) (value "22nH") (footprint "Inductor_SMD:L_1008_2520Metric_Pad1.43x2.20mm_HandSolder")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/bf6ddafd-bcb1-4e32-aa73-c13d871e7f3b"
-      (reference "L?") (unit 1) (value "TBD") (footprint "")
+      (reference "L?") (unit 1) (value "6uH") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c44aad31-2950-4a14-ba25-b8a9de4891ea"
       (reference "L?") (unit 1) (value "120uH") (footprint "")
@@ -5230,6 +5215,9 @@
     (path "/b27332de-5841-4080-a117-6f6d9cd04da8/00000000-0000-0000-0000-00005fbcf0d3"
       (reference "Q?") (unit 1) (value "BSV52") (footprint "Package_TO_SOT_SMD:SOT-23_Handsoldering")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/0af7ceb8-79f5-40d6-80a5-080f0b2b9e91"
+      (reference "Q?") (unit 1) (value "IRF7309IPBF") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/1224743a-fec1-4784-b629-97126418ba69"
       (reference "Q?") (unit 1) (value "MMBT3904") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
@@ -5263,6 +5251,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7ddb1256-6628-4c62-a972-ff7f6d9499b7"
       (reference "Q?") (unit 1) (value "MMBT3904") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/89b16023-240b-46a9-aaf9-b94321e890ad"
+      (reference "Q?") (unit 1) (value "IRF7309IPBF") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/9d39195b-0175-46ba-944f-2771c3dba921"
       (reference "Q?") (unit 1) (value "MMBT3904") (footprint "Package_TO_SOT_SMD:SOT-23")
     )
@@ -5317,6 +5308,12 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/9744e152-5871-4027-9ba5-7f8fed7af1ad"
       (reference "Q?") (unit 2) (value "IRF7309") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b33779f2-9ef5-4a4b-b90d-f6a47f55c204"
+      (reference "Q?") (unit 2) (value "IRF7309") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/d2fa343c-741f-409b-b691-e1583a96f0db"
+      (reference "Q?") (unit 2) (value "IRF7309") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
+    )
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/00000000-0000-0000-0000-00005e3048e7"
       (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5524,6 +5521,9 @@
     (path "/134dd1ad-afc9-4161-b3c6-831b9caf39cb"
       (reference "R?") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/14b1e175-dc82-4d81-b685-f4322b88a4e2"
+      (reference "R?") (unit 1) (value "12k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/158d9815-0e3d-4623-8a00-b0d0b263d33d"
       (reference "R?") (unit 1) (value "180") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5575,6 +5575,9 @@
     (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/3a6f2379-28e7-4737-a8e7-34dc79ea3973"
       (reference "R?") (unit 1) (value "0") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/3ab3dc5c-b7cb-4af0-8b30-4ec3f542819c"
+      (reference "R?") (unit 1) (value "12k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/3ad97cd4-848d-4958-82ce-eba5e46fdd47"
       (reference "R?") (unit 1) (value "10") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5590,6 +5593,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/41db0386-630c-41be-b329-a5a09e27dbce"
       (reference "R?") (unit 1) (value "2.2k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/432e492c-0aac-4bc0-9e78-77ecc2e45463"
+      (reference "R?") (unit 1) (value "DNF") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/45f16f8c-47cc-436c-aa94-10902acd3358"
       (reference "R?") (unit 1) (value "2.2k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5653,6 +5659,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/7f2b800a-4e5a-4c94-b918-564ca91d8e5a"
       (reference "R?") (unit 1) (value "180") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/83ca7711-0d72-41d7-9213-756b7722072f"
+      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/889650cf-1be4-4283-bf88-1305868a006b"
       (reference "R?") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5698,12 +5707,18 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b73ab570-0eb3-4de6-a4f8-435f2ae7f375"
       (reference "R?") (unit 1) (value "220") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b7841085-84fa-4fcb-9d23-eea011876c07"
+      (reference "R?") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/b904a850-2ecb-4c3e-853f-c1b82c1ccc51"
       (reference "R?") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b9466051-6e46-4fc5-beb3-cf25653fb66b"
       (reference "R?") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/be3ff52f-2a1a-479d-b416-ff15318b7ee2"
+      (reference "R?") (unit 1) (value "1.2k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/bee5eed0-1297-4684-b7a0-ed7af5f2116c"
       (reference "R?") (unit 1) (value "0") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5719,6 +5734,9 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/c1e08b12-7b7a-44cf-9fcd-66a3082dc449"
       (reference "R?") (unit 1) (value "12k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c23d781c-363a-4d85-8171-fd97e7299b5c"
+      (reference "R?") (unit 1) (value "2.3k") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c9dd5951-2a7b-4a0f-bd40-bf21c1ffc44f"
       (reference "R?") (unit 1) (value "100") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
@@ -5782,6 +5800,9 @@
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/fc99c902-8c01-49d5-bf81-5a16edff9cd4"
       (reference "R?") (unit 1) (value "470") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/fdbd7fff-86a6-4aac-a458-e736136c8e38"
+      (reference "R?") (unit 1) (value "47") (footprint "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e418964"
       (reference "RV?") (unit 1) (value "10k") (footprint "Potentiometer_SMD:Potentiometer_Bourns_3214W_Vertical")
     )
@@ -5798,22 +5819,16 @@
       (reference "RV?") (unit 1) (value "500") (footprint "Potentiometer_SMD:Potentiometer_Bourns_3214W_Vertical")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/168ee993-6a85-48af-b8f8-0d87ada9138a"
-      (reference "T?") (unit 1) (value "10t tri, 43") (footprint "")
-    )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/2759d25b-2b4f-44e4-b729-9eee6231471c"
-      (reference "T?") (unit 1) (value "P: 16T S:2T on 43 or MABA-009488") (footprint "")
+      (reference "T?") (unit 1) (value "10t tri, 43, or MABA-009488") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/485f4421-09f9-4e11-be70-f967ac8e8800"
-      (reference "T?") (unit 1) (value "10t tri, 43") (footprint "")
+      (reference "T?") (unit 1) (value "10t tri, 43, or MABA-009488") (footprint "")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/863eb863-4675-4f95-81b6-2b036db3d5eb"
       (reference "T?") (unit 1) (value "P: 16T S:2T on 43 or MABA-009488") (footprint "")
     )
-    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/9277186f-df56-4035-8841-9ab6cc89b1e8"
-      (reference "T?") (unit 1) (value "P: 16T S:2T on 43 or MABA-009488") (footprint "")
-    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/c36f262a-d5d7-4c06-9442-d6dd1470d26d"
-      (reference "T?") (unit 1) (value "10t tri, 43") (footprint "")
+      (reference "T?") (unit 1) (value "10t tri, 43, or MABA-009488") (footprint "")
     )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/00000000-0000-0000-0000-00005e4c3889"
       (reference "TP?") (unit 1) (value "MIX LO") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
@@ -5833,21 +5848,18 @@
     (path "/6bd04b50-ca72-476f-8ad8-3219ec3ce85d"
       (reference "TP?") (unit 1) (value "5VTX") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/789dddc8-7ee8-4c3a-a944-77a67f1a5074"
-      (reference "TP?") (unit 1) (value "+3V3") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
-    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/7b0a5aee-563a-4e56-999e-f3e472cee944"
       (reference "TP?") (unit 1) (value "+5V") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
     )
     (path "/7ee18096-d6fb-467f-ad36-ebe46dffa4b8"
       (reference "TP?") (unit 1) (value "8VRX") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
     )
-    (path "/858caef3-c221-4e4f-ae07-894951f3108e"
-      (reference "TP?") (unit 1) (value "+8V") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
-    )
     (path "/cc1d2edb-6e9e-420a-bff0-a95c2a2a8305"
       (reference "TP?") (unit 1) (value "5VRX") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
     )
+    (path "/e34ebb9f-d06c-41e9-bb37-b5ac2dd6aa42"
+      (reference "TP?") (unit 1) (value "+3V3") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
+    )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/00000000-0000-0000-0000-00005e691f62"
       (reference "U?") (unit 1) (value "SSM2167") (footprint "Package_SO:MSOP-10_3x3mm_P0.5mm")
     )
@@ -5872,17 +5884,26 @@
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/39470be5-ffd0-4e1f-93e1-03d4fea4d62a"
       (reference "U?") (unit 1) (value "LD1117S50TR_SOT223") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
     )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/62e9ed49-1c7c-4949-ac10-4469b493ace4"
+      (reference "U?") (unit 1) (value "LD1117S33") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
+    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/6535aa12-f280-42f5-bd11-fdd961d18a11"
       (reference "U?") (unit 1) (value "BGA2869") (footprint "Package_TO_SOT_SMD:SOT-363_SC-70-6")
     )
+    (path "/7a8d8b49-894e-4df2-a14e-077959df16ce"
+      (reference "U?") (unit 1) (value "LD1117S33") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
+    )
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/8d6fba61-7575-4242-8f53-552540adc73f"
+      (reference "U?") (unit 1) (value "LM1117-ADJ 9V") (footprint "")
+    )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/b4856f24-f7e0-4f85-b3c9-503bee0085b8"
       (reference "U?") (unit 1) (value "BGA2869") (footprint "Package_TO_SOT_SMD:SOT-363_SC-70-6")
     )
     (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/b99aa9f1-875f-4993-801a-fec7085b6709"
       (reference "U?") (unit 1) (value "LM4865") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
     )
-    (path "/2868e76c-709b-493b-aaa8-b58a2fce5e93/d15c4a9e-b254-4358-8e09-a37deff555ae"
-      (reference "U?") (unit 1) (value "LD1117S33TR_SOT223") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
+    (path "/691ab6db-80d5-4c97-9e5f-aae234327d27/e34ad77f-821b-481e-89c5-cb7566a5eafd"
+      (reference "U?") (unit 1) (value "LD1117S50") (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
     )
     (path "/9b046cc4-7c70-4d6d-9bdd-a37aea612ec4/e58f1f4b-239f-424d-8144-6bcb17e83f03"
       (reference "U?") (unit 1) (value "BGA2869") (footprint "Package_TO_SOT_SMD:SOT-363_SC-70-6")
diff --git a/kicad-dart-70/lo_board.kicad_sch b/kicad-dart-70/lo_board.kicad_sch
index 367a55a..c86f568 100644
--- a/kicad-dart-70/lo_board.kicad_sch
+++ b/kicad-dart-70/lo_board.kicad_sch
@@ -5,9 +5,11 @@
   (paper "A4")
 
   (title_block
-    (title "Anglian LO Board")
-    (date "2020-11-29")
+    (title "DART-70 TRX")
+    (date "2023-01-19")
+    (rev "0")
     (company "HB9EGM")
+    (comment 1 "A 4m Band SSB/CW Transceiver")
   )
 
   (lib_symbols
-- 
cgit v1.2.3