diff --git a/.gitignore b/.gitignore
index 6cb93b5..b2baf91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,5 @@ fp-info-cache
 
 # Exported BOM files
 *.xml
-*.csv
+
 
diff --git a/BOM.csv b/BOM.csv
new file mode 100644
index 0000000..4d89c48
--- /dev/null
+++ b/BOM.csv
@@ -0,0 +1,153 @@
+Reference,Value,Datasheet,Footprint,Do Not Place,Exclude from BOM,Exclude from Board,Exclude from Simulation,Beschreibung,Qty
+BT1,Battery_Cell,~,,,,,,Single-cell battery,1
+BT2,Battery_Cell,~,,,,,,Single-cell battery,1
+BT3,Battery_Cell,~,,,,,,Single-cell battery,1
+BT4,Battery_Cell,~,,,,,,Single-cell battery,1
+BT5,Battery_Cell,~,,,,,,Single-cell battery,1
+BT6,Battery_Cell,~,,,,,,Single-cell battery,1
+BT7,Battery_Cell,~,,,,,,Single-cell battery,1
+BT8,Battery_Cell,~,,,,,,Single-cell battery,1
+C1,1uF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C2,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C3,680uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C4,220uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C5,1uF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C6,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C7,1uF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C8,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C9,1uF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C10,120nF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C11,15p,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C12,15p,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C13,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C14,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C15,1u,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C16,680uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C17,330uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C18,1u,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C19,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C20,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C21,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C22,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C23,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C24,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C25,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C26,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C27,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C28,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C29,1u,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C30,10uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C31,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C32,10uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C33,10uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C34,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C35,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C36,"0,1uF",~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C37,10uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C38,10uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C39,22pF,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C40,0.056uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C41,1uF,~,Capacitor_THT:CP_Radial_D10.0mm_P5.00mm,,,,,Polarized capacitor,1
+C42,100n,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+C43,10u,~,Capacitor_SMD:C_0805_2012Metric,,,,,Unpolarized capacitor,1
+D1,1N5824,~,Diode_THT:D_5W_P12.70mm_Horizontal,,,,,"Schottky diode, filled shape",1
+D2,1N5824,~,Diode_THT:D_5W_P12.70mm_Horizontal,,,,,"Schottky diode, filled shape",1
+D3,LED_Filled,~,LED_SMD:LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder,,,,,"Light emitting diode, filled shape",1
+D4,BAT54J,https://assets.nexperia.com/documents/data-sheet/BAT54J.pdf,Diode_SMD:D_SOD-323F,,,,,"30V 200mA Schottky diode, SOD-323F",1
+D5,LED_Filled,~,LED_SMD:LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder,,,,,"Light emitting diode, filled shape",1
+J1,Front-End,~,Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical,,,,,"Generic connector, double row, 02x03, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J2,Conn_02x03_Top_Bottom,~,Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical,,,,,"Generic connector, double row, 02x03, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J3,Back-End,~,Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical,,,,,"Generic connector, double row, 02x03, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J4,Conn_02x03_Top_Bottom,~,Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical,,,,,"Generic connector, double row, 02x03, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J5,BottleCarriage1,~,Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical,,,,,"Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J6,Conn_01x07,~,Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical,,,,,"Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J7,Motor,~,TerminalBlock:TerminalBlock_bornier-4_P5.08mm,,,,,"Generic screw terminal, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J8,BottleCarriage2,~,Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical,,,,,"Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J9,Conn_01x07,~,Connector_PinHeader_2.54mm:PinHeader_1x07_P2.54mm_Vertical,,,,,"Generic connector, single row, 01x07, script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J10,Display,~,Connector_PinHeader_2.54mm:PinHeader_2x08_P2.54mm_Vertical,,,,,"Generic connector, double row, 02x08, counter clockwise pin numbering scheme (similar to DIP package numbering), script generated (kicad-library-utils/schlib/autogen/connector/)",1
+J11,Conn_01x04_Pin-USB,~,Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical,,,,,"Generic connector, single row, 01x04, script generated",1
+L1,33uH,~,Inductor_SMD:L_0603_1608Metric,,,,,Inductor,1
+L2,33uH,~,Inductor_SMD:L_0603_1608Metric,,,,,Inductor,1
+L3,6.8uH?,~,,,,,,Inductor,1
+M1,Motor_Servo_Robbe,http://forums.parallax.com/uploads/attachments/46831/74481.png,,,,,,Servo Motor (Robbe connector),1
+M2,Motor_Servo_Robbe,http://forums.parallax.com/uploads/attachments/46831/74481.png,,,,,,Servo Motor (Robbe connector),1
+M3,Motor_Servo_Robbe,http://forums.parallax.com/uploads/attachments/46831/74481.png,,,,,,Servo Motor (Robbe connector),1
+Q1,Si7617DN,https://www.vishay.com/docs/65164/si7617dn.pdf,Package_SO:Vishay_PowerPAK_1212-8_Single,,,,,"-35A Id, -30V Vds, 0.0123 Ohm Ron, PowerPAK-8",1
+Q2,Si7617DN,https://www.vishay.com/docs/65164/si7617dn.pdf,Package_SO:Vishay_PowerPAK_1212-8_Single,,,,,"-35A Id, -30V Vds, 0.0123 Ohm Ron, PowerPAK-8",1
+Q3,Si7617DN,https://www.vishay.com/docs/65164/si7617dn.pdf,Package_SO:Vishay_PowerPAK_1212-8_Single,,,,,"-35A Id, -30V Vds, 0.0123 Ohm Ron, PowerPAK-8",1
+Q4,SiS412DN,https://www.vishay.com/docs/65164/si7617dn.pdf,Package_SO:Vishay_PowerPAK_1212-8_Single,,,,,"-35A Id, -30V Vds, 0.0123 Ohm Ron, PowerPAK-8",1
+Q5,SiS412DN,https://www.vishay.com/docs/65164/si7617dn.pdf,Package_SO:Vishay_PowerPAK_1212-8_Single,,,,,"-35A Id, -30V Vds, 0.0123 Ohm Ron, PowerPAK-8",1
+R1,10k,~,,,,,,Resistor,1
+R2,10k,~,,,,,,Resistor,1
+R3,10k,~,,,,,,Resistor,1
+R4,10k,~,,,,,,Resistor,1
+R5,DNF,~,,Nicht bestücken,,,,Resistor,1
+R6,1k,~,,,,,,Resistor,1
+R7,10k,~,,,,,,Resistor,1
+R8,10k,~,,,,,,Resistor,1
+R9,1k,~,,,,,,Resistor,1
+R10,10k,~,,,,,,Resistor,1
+R11,10k,~,,,,,,Resistor,1
+R12,10k,~,,,,,,Resistor,1
+R13,10k,~,,,,,,Resistor,1
+R14,10k,~,,,,,,Resistor,1
+R15,10k,~,,,,,,Resistor,1
+R16,10k,~,,,,,,Resistor,1
+R17,1k,~,,,,,,Resistor,1
+R18,27,~,,,,,,Resistor,1
+R19,27,~,,,,,,Resistor,1
+R20,10k,~,,,,,,Resistor,1
+R21,470,~,,,,,,Resistor,1
+R22,10k,~,,,,,,Resistor,1
+R23,10Ohm,~,,,,,,Resistor,1
+R24,0.010Ohm,~,Resistor_SMD:R_Shunt_Vishay_WSK2512_6332Metric_T1.19mm,,,,,Shunt resistor,1
+R25,1k,~,,,,,,Resistor,1
+R26,1k,~,,,,,,Resistor,1
+R27,100k,~,,,,,,Resistor,1
+R28,0.010Ohm,~,Resistor_SMD:R_Shunt_Vishay_WSK2512_6332Metric_T1.19mm,,,,,Shunt resistor,1
+R29,1k,~,,,,,,Resistor,1
+R30,1k,~,,,,,,Resistor,1
+R31,10k,~,,,,,,Resistor,1
+R32,10k,~,,,,,,Resistor,1
+R33,10k,~,,,,,,Resistor,1
+R34,100k,~,,,,,,Resistor,1
+R35,100k,~,,,,,,Resistor,1
+R36,100k,~,,,,,,Resistor,1
+R37,"32,4k",~,,,,,,Resistor,1
+R38,10k,~,,,,,,Resistor,1
+R39,"22,1k",~,,,,,,Resistor,1
+R40,100k,~,,,,,,Resistor,1
+R41,"32,4k",~,,,,,,Resistor,1
+R42,100,~,,,,,,Resistor,1
+R43,10k,~,,,,,,Resistor,1
+R44,10k,~,,,,,,Resistor,1
+R45,470,~,,,,,,Resistor,1
+R46,1k,~,,,,,,Resistor,1
+SW1,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW2,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW3,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW4,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW5,SW_DPST,~,,,,,,Double Pole Single Throw (DPST) Switch,1
+SW6,SW_SPDT,~,,,,,,"Switch, single pole double throw",1
+SW7,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW8,SW_Push_LED,~,,,,,,"Push button switch with LED, generic",1
+SW9,SW_Push_Open,~,,,,,,"Push button switch, push-to-open, generic, two pins",1
+SW10,SW_Push_LED,~,,,,,,"Push button switch with LED, generic",1
+TH1,Thermistor_NTC,~,,,,,,"Temperature dependent resistor, negative temperature coefficient",1
+U1,RASPBERRY_PI4,https://datasheets.raspberrypi.com/rpi4/raspberry-pi-4-datasheet.pdf,RASPBERRY_PI_ZERO_2_W:MODULE_RASPBERRY_PI_ZERO_2_W,,,,,Raspberry Pi 4 Model B,1
+U2,HC-SR04,,HC-SR04:XCVR_HC-SR04,,,,,,1
+U3,HC-SR04,,HC-SR04:XCVR_HC-SR04,,,,,,1
+U4,AP22816AKEWT,https://www.diodes.com/assets/Datasheets/AP22816_17_18.pdf,Package_TO_SOT_SMD:SOT-23-5_HandSoldering,,,,,"Current limited 1A power switch, single channel, SOT-23-5",1
+U5,LM2596T-5,http://www.ti.com/lit/ds/symlink/lm2596.pdf,Package_TO_SOT_THT:TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical,,,,,"5V 3A 150kHz Step-Down Voltage Regulator, TO-220",1
+U6,AP22816AKEWT,https://www.diodes.com/assets/Datasheets/AP22816_17_18.pdf,Package_TO_SOT_SMD:SOT-23-5_HandSoldering,,,,,"Current limited 1A power switch, single channel, SOT-23-5",1
+U7,TMC2209_SILENTSTEPSTICK,,TMC2209_SILENTSTEPSTICK:MODULE_TMC2209_SILENTSTEPSTICK,,,,,,1
+U8,AP22816AKEWT,https://www.diodes.com/assets/Datasheets/AP22816_17_18.pdf,Package_TO_SOT_SMD:SOT-23-5_HandSoldering,,,,,"Current limited 1A power switch, single channel, SOT-23-5",1
+U9,PCA9555D,https://www.nxp.com/docs/en/data-sheet/PCA9555.pdf,Package_SO:SOIC-24W_7.5x15.4mm_P1.27mm,,,,,"IO expander 16 GPIO, I2C 400kHz, Interrupt, 2.3 - 5.5V, SOIC-24",1
+U10,RP2040,https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf,Package_DFN_QFN:QFN-56-1EP_7x7mm_P0.4mm_EP3.2x3.2mm,,,,,A microcontroller by Raspberry Pi,1
+U11,W25Q128JVS,https://www.winbond.com/resource-files/w25q128jv_dtr%20revc%2003272018%20plus.pdf,Package_SO:SOIC-8_5.23x5.23mm_P1.27mm,,,,,"128Mb Serial Flash Memory, Standard/Dual/Quad SPI, SOIC-8",1
+U12,BNO055,https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bno055-ds000.pdf,Package_LGA:LGA-28_5.2x3.8mm_P0.5mm,,,,,"Intelligent 9-axis absolute orientation sensor, LGA-28",1
+U13,LM2596T-3.3,http://www.ti.com/lit/ds/symlink/lm2596.pdf,Package_TO_SOT_THT:TO-220-5_P3.4x3.7mm_StaggerOdd_Lead3.8mm_Vertical,,,,,"5V 3A 150kHz Step-Down Voltage Regulator, TO-220",1
+U14,INA260,http://www.ti.com/lit/ds/symlink/ina260.pdf,Package_SO:TSSOP-16_4.4x5mm_P0.65mm,,,,,"Current/power/voltage monitor with Integrated 2mΩ Shunt Resistor, 2.7V - 5.5V, I2C, TSSOP-16",1
+U15,BQ24610,https://www.ti.com/lit/ds/symlink/bq24610.pdf,Package_DFN_QFN:VQFN-24-1EP_4x4mm_P0.5mm_EP2.45x2.45mm,,,,,"10A, 28V max voltage, Li-Ion Charger w/600kHz NMOS-NMOS Synchronous Buck Converter, VQFN-24",1
+U16,AS5048B,https://ams.com/documents/20143/36005/AS5048_DS000298_4-00.pdf,Package_SO:TSSOP-14_4.4x5mm_P0.65mm,,,,,"Magnetic position sensor, 14-bit, PWM output, I2C Interface, TSSOP-14",1
+Y1,Crystal_GND24,~,,,,,,"Four pin crystal, GND on pins 2 and 4",1
diff --git a/Datasheets/SSD1322.pdf b/Datasheets/SSD1322.pdf
new file mode 100644
index 0000000..aabeaca
Binary files /dev/null and b/Datasheets/SSD1322.pdf differ
diff --git a/monorail.kicad_pro b/monorail.kicad_pro
index b0894fe..fb1189d 100644
--- a/monorail.kicad_pro
+++ b/monorail.kicad_pro
@@ -477,7 +477,7 @@
   },
   "schematic": {
     "annotate_start_num": 0,
-    "bom_export_filename": "",
+    "bom_export_filename": "BOM.csv",
     "bom_fmt_presets": [],
     "bom_fmt_settings": {
       "field_delimiter": ",",
@@ -511,11 +511,107 @@
           "show": true
         },
         {
-          "group_by": false,
+          "group_by": true,
           "label": "Footprint",
           "name": "Footprint",
           "show": true
         },
+        {
+          "group_by": false,
+          "label": "Do Not Place",
+          "name": "${DNP}",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Exclude from BOM",
+          "name": "${EXCLUDE_FROM_BOM}",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Exclude from Board",
+          "name": "${EXCLUDE_FROM_BOARD}",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Exclude from Simulation",
+          "name": "${EXCLUDE_FROM_SIM}",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Check_prices",
+          "name": "Check_prices",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Description_1",
+          "name": "Description_1",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "MANUFACTURER",
+          "name": "MANUFACTURER",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "MF",
+          "name": "MF",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "MP",
+          "name": "MP",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "PARTREV",
+          "name": "PARTREV",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Package",
+          "name": "Package",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Price",
+          "name": "Price",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "SNAPEDA_PN",
+          "name": "SNAPEDA_PN",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "STANDARD",
+          "name": "STANDARD",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "SnapEDA_Link",
+          "name": "SnapEDA_Link",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Beschreibung",
+          "name": "Description",
+          "show": true
+        },
         {
           "group_by": false,
           "label": "Qty",
@@ -523,17 +619,23 @@
           "show": true
         },
         {
-          "group_by": true,
-          "label": "DNP",
-          "name": "${DNP}",
-          "show": true
+          "group_by": false,
+          "label": "#",
+          "name": "${ITEM_NUMBER}",
+          "show": false
+        },
+        {
+          "group_by": false,
+          "label": "Availability",
+          "name": "Availability",
+          "show": false
         }
       ],
       "filter_string": "",
-      "group_symbols": true,
-      "name": "Grouped By Value",
+      "group_symbols": false,
+      "name": "",
       "sort_asc": true,
-      "sort_field": "Referenz"
+      "sort_field": "Reference"
     },
     "connection_grid_size": 50.0,
     "drawing": {
diff --git a/monorail.kicad_sch b/monorail.kicad_sch
index 707ee74..685aef4 100644
--- a/monorail.kicad_sch
+++ b/monorail.kicad_sch
@@ -534,6 +534,248 @@
 				)
 			)
 		)
+		(symbol "Connector:Conn_01x04_Pin"
+			(pin_names
+				(offset 1.016) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "J"
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "Conn_01x04_Pin"
+				(at 0 -7.62 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Generic connector, single row, 01x04, script generated"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_locked" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "ki_keywords" "connector"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "Conn_01x04_Pin_1_1"
+				(polyline
+					(pts
+						(xy 1.27 -5.08) (xy 0.8636 -5.08)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 -2.54) (xy 0.8636 -2.54)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 0) (xy 0.8636 0)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 2.54) (xy 0.8636 2.54)
+					)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(rectangle
+					(start 0.8636 -4.953)
+					(end 0 -5.207)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(rectangle
+					(start 0.8636 -2.413)
+					(end 0 -2.667)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(rectangle
+					(start 0.8636 0.127)
+					(end 0 -0.127)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(rectangle
+					(start 0.8636 2.667)
+					(end 0 2.413)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(pin passive line
+					(at 5.08 2.54 180)
+					(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 180)
+					(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 180)
+					(length 3.81)
+					(name "Pin_3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 -5.08 180)
+					(length 3.81)
+					(name "Pin_4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
 		(symbol "Connector:Raspberry_Pi_4"
 			(exclude_from_sim no)
 			(in_bom yes)
@@ -9397,6 +9639,179 @@
 				)
 			)
 		)
+		(symbol "Switch:SW_SPDT"
+			(pin_names
+				(offset 0) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "SW"
+				(at 0 5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "SW_SPDT"
+				(at 0 -5.08 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 -7.62 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Switch, single pole double throw"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "switch single-pole double-throw spdt ON-ON"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SW_SPDT_0_1"
+				(circle
+					(center -2.032 0)
+					(radius 0.4572)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -1.651 0.254) (xy 1.651 2.286)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.032 -2.54)
+					(radius 0.4572)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(circle
+					(center 2.032 2.54)
+					(radius 0.4572)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "SW_SPDT_1_1"
+				(rectangle
+					(start -3.175 3.81)
+					(end 3.175 -3.81)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type background)
+					)
+				)
+				(pin passive line
+					(at 5.08 2.54 180)
+					(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 0)
+					(length 2.54)
+					(name "B"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 -2.54 180)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
 		(symbol "TMC2209_SILENTSTEPSTICK:TMC2209_SILENTSTEPSTICK"
 			(pin_names
 				(offset 1.016)
@@ -11553,6 +11968,12 @@
 		(color 0 0 0 0)
 		(uuid "4fafc432-26d7-4c70-844e-cbe5d393e13c")
 	)
+	(junction
+		(at 68.58 208.28)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "515f183c-9db6-4e5c-a04a-45e2e5b7cfce")
+	)
 	(junction
 		(at 260.35 71.12)
 		(diameter 0)
@@ -11601,12 +12022,6 @@
 		(color 0 0 0 0)
 		(uuid "5eef07a4-476c-4d20-ab85-4e2f6966be7d")
 	)
-	(junction
-		(at 52.07 220.98)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "61fd68eb-8bbb-4d83-9798-6e54ba31de17")
-	)
 	(junction
 		(at 567.69 205.74)
 		(diameter 0)
@@ -11823,6 +12238,12 @@
 		(color 0 0 0 0)
 		(uuid "9c8a7697-ebc2-4d23-9b1c-948f5bccfdc2")
 	)
+	(junction
+		(at 49.53 220.98)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "9e9c8458-49a2-4c4a-9aa4-a77a98a09679")
+	)
 	(junction
 		(at 391.16 281.94)
 		(diameter 0)
@@ -12003,6 +12424,12 @@
 		(color 0 0 0 0)
 		(uuid "dc30a080-afb7-48a1-9348-3fa78b8193e0")
 	)
+	(junction
+		(at 66.04 215.9)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "decbe553-a3bd-4fc0-9f73-f7e590a6e953")
+	)
 	(junction
 		(at 139.7 171.45)
 		(diameter 0)
@@ -12157,6 +12584,10 @@
 		(at 386.08 313.69)
 		(uuid "a9eb4a0c-15fe-49cf-b559-eed295bbc624")
 	)
+	(no_connect
+		(at 55.88 194.31)
+		(uuid "c2ad0957-19e7-43e7-a01b-6131327d59c9")
+	)
 	(no_connect
 		(at 388.62 313.69)
 		(uuid "c3df7663-15a5-4e50-b4fd-21a303b85af3")
@@ -12219,6 +12650,16 @@
 		)
 		(uuid "021dd310-9842-412f-b9a6-439ebfee9b07")
 	)
+	(wire
+		(pts
+			(xy 60.96 203.2) (xy 60.96 194.31)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "024b73a8-241a-41ac-8ba5-fb036987d738")
+	)
 	(wire
 		(pts
 			(xy 521.97 214.63) (xy 518.16 214.63)
@@ -12349,6 +12790,16 @@
 		)
 		(uuid "080911a9-7fd1-4a2f-a512-6ec6992ba3a0")
 	)
+	(wire
+		(pts
+			(xy 213.36 335.28) (xy 218.44 335.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "093b43b4-12e8-4e38-b51c-693434ae7398")
+	)
 	(wire
 		(pts
 			(xy 165.1 63.5) (xy 165.1 64.77)
@@ -12531,7 +12982,7 @@
 	)
 	(wire
 		(pts
-			(xy 52.07 220.98) (xy 52.07 212.09)
+			(xy 49.53 220.98) (xy 49.53 212.09)
 		)
 		(stroke
 			(width 0)
@@ -12779,6 +13230,16 @@
 		)
 		(uuid "1bf274a5-5ce3-4796-8f63-d17b5156df58")
 	)
+	(wire
+		(pts
+			(xy 66.04 215.9) (xy 71.12 215.9)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "1c0abb07-a073-46ef-afc1-f11a1d1da4da")
+	)
 	(wire
 		(pts
 			(xy 119.38 191.77) (xy 116.84 191.77)
@@ -13251,7 +13712,7 @@
 	)
 	(wire
 		(pts
-			(xy 327.66 85.09) (xy 327.66 72.39)
+			(xy 323.85 85.09) (xy 323.85 72.39)
 		)
 		(stroke
 			(width 0)
@@ -14119,6 +14580,16 @@
 		)
 		(uuid "4aff79a2-047c-4eac-a1a2-f53ce42f4251")
 	)
+	(wire
+		(pts
+			(xy 233.68 330.2) (xy 233.68 331.47)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "4bd03464-1851-49c8-ba72-8c020d095761")
+	)
 	(wire
 		(pts
 			(xy 311.15 116.84) (xy 311.15 115.57)
@@ -14311,7 +14782,7 @@
 	)
 	(wire
 		(pts
-			(xy 307.34 67.31) (xy 307.34 53.34)
+			(xy 311.15 67.31) (xy 311.15 53.34)
 		)
 		(stroke
 			(width 0)
@@ -14351,7 +14822,7 @@
 	)
 	(wire
 		(pts
-			(xy 307.34 53.34) (xy 285.75 53.34)
+			(xy 311.15 53.34) (xy 285.75 53.34)
 		)
 		(stroke
 			(width 0)
@@ -14519,6 +14990,16 @@
 		)
 		(uuid "589dcbf5-543c-4164-b8da-a57533e69be1")
 	)
+	(wire
+		(pts
+			(xy 63.5 196.85) (xy 63.5 194.31)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "58aca190-38bc-4f3e-82cb-c89943a83c6f")
+	)
 	(wire
 		(pts
 			(xy 247.65 85.09) (xy 248.92 85.09)
@@ -14989,6 +15470,16 @@
 		)
 		(uuid "6cd24851-e871-48cb-a1b9-0fc94cb38c8b")
 	)
+	(wire
+		(pts
+			(xy 176.53 335.28) (xy 205.74 335.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6d1c9465-62ef-4ea4-8aaf-a8c509597e1f")
+	)
 	(wire
 		(pts
 			(xy 354.33 354.33) (xy 356.87 354.33)
@@ -15009,16 +15500,6 @@
 		)
 		(uuid "6dbc7ca3-3385-49a8-9590-09100d91ed67")
 	)
-	(wire
-		(pts
-			(xy 307.34 67.31) (xy 311.15 67.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "6e694ced-3402-496c-9eaa-a17970f211d8")
-	)
 	(wire
 		(pts
 			(xy 468.63 30.48) (xy 468.63 35.56)
@@ -15089,6 +15570,16 @@
 		)
 		(uuid "6f75f6cf-62db-463e-aa40-26e8a566cf01")
 	)
+	(wire
+		(pts
+			(xy 311.15 72.39) (xy 312.42 72.39)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "6fb48e94-a4ce-4ef5-bfd7-47b91153c708")
+	)
 	(wire
 		(pts
 			(xy 504.19 280.67) (xy 513.08 280.67)
@@ -15349,6 +15840,16 @@
 		)
 		(uuid "77a9b1ea-fd23-44c5-859c-f2cbc61a73f7")
 	)
+	(wire
+		(pts
+			(xy 229.87 337.82) (xy 229.87 335.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "77c29a2c-7dab-4e5a-8c47-724e3a435872")
+	)
 	(wire
 		(pts
 			(xy 111.76 171.45) (xy 116.84 171.45)
@@ -15541,7 +16042,7 @@
 	)
 	(wire
 		(pts
-			(xy 68.58 208.28) (xy 71.12 208.28)
+			(xy 63.5 208.28) (xy 68.58 208.28)
 		)
 		(stroke
 			(width 0)
@@ -15679,6 +16180,16 @@
 		)
 		(uuid "84d91776-56bf-4246-86df-d055b846fa9e")
 	)
+	(wire
+		(pts
+			(xy 68.58 208.28) (xy 71.12 208.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "8580f565-a370-48b5-8f56-efe619813b05")
+	)
 	(wire
 		(pts
 			(xy 351.79 60.96) (xy 351.79 66.04)
@@ -15849,6 +16360,16 @@
 		)
 		(uuid "907e6669-ebe1-4c34-bc72-d38b947cc452")
 	)
+	(wire
+		(pts
+			(xy 217.17 330.2) (xy 233.68 330.2)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "90bae9f8-a61d-461c-805f-a0572be2b10f")
+	)
 	(wire
 		(pts
 			(xy 238.76 107.95) (xy 238.76 97.79)
@@ -15949,6 +16470,16 @@
 		)
 		(uuid "93652f16-73b9-41d7-ba76-9cf11257223a")
 	)
+	(wire
+		(pts
+			(xy 49.53 220.98) (xy 83.82 220.98)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "9383ee58-fdd8-42e8-a821-92eb6fc42049")
+	)
 	(wire
 		(pts
 			(xy 171.45 91.44) (xy 173.99 91.44)
@@ -15979,6 +16510,16 @@
 		)
 		(uuid "94a16584-dd19-4953-9ac7-b2a8fbfd7d22")
 	)
+	(wire
+		(pts
+			(xy 49.53 220.98) (xy 46.99 220.98)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "952227aa-30d8-455a-acd7-8b7b410d05bd")
+	)
 	(wire
 		(pts
 			(xy 66.04 236.22) (xy 66.04 223.52)
@@ -16119,6 +16660,16 @@
 		)
 		(uuid "99cff96f-0d4b-497a-86e3-f9b7291cb327")
 	)
+	(wire
+		(pts
+			(xy 311.15 67.31) (xy 312.42 67.31)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "99e896cb-011e-40ec-ade0-4719319aa31b")
+	)
 	(wire
 		(pts
 			(xy 88.9 325.12) (xy 88.9 350.52)
@@ -16321,7 +16872,7 @@
 	)
 	(wire
 		(pts
-			(xy 68.58 215.9) (xy 71.12 215.9)
+			(xy 63.5 215.9) (xy 66.04 215.9)
 		)
 		(stroke
 			(width 0)
@@ -16409,6 +16960,16 @@
 		)
 		(uuid "a4b56644-c4b7-4ec4-ad67-da184389e1d5")
 	)
+	(wire
+		(pts
+			(xy 66.04 215.9) (xy 66.04 204.47)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a4f00f97-2a27-49df-a124-f6ade4ee02ab")
+	)
 	(wire
 		(pts
 			(xy 36.83 196.85) (xy 31.75 196.85)
@@ -16451,7 +17012,7 @@
 	)
 	(wire
 		(pts
-			(xy 327.66 72.39) (xy 321.31 72.39)
+			(xy 323.85 72.39) (xy 322.58 72.39)
 		)
 		(stroke
 			(width 0)
@@ -16459,6 +17020,16 @@
 		)
 		(uuid "a662588d-429d-4c19-aeb6-afced9f62807")
 	)
+	(wire
+		(pts
+			(xy 68.58 208.28) (xy 68.58 203.2)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "a68279f3-58af-469c-aaf1-a06e5173b167")
+	)
 	(wire
 		(pts
 			(xy 162.56 266.7) (xy 158.75 266.7)
@@ -17059,6 +17630,16 @@
 		)
 		(uuid "ba6ad2f9-1373-4c43-95e5-2d8c56edbdc7")
 	)
+	(wire
+		(pts
+			(xy 66.04 204.47) (xy 58.42 204.47)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "baddc3f1-dfd5-4228-80a8-edfece6b283b")
+	)
 	(wire
 		(pts
 			(xy 147.32 114.3) (xy 156.21 114.3)
@@ -17439,6 +18020,16 @@
 		)
 		(uuid "c7effa34-904f-48eb-924b-6636b9ff5891")
 	)
+	(wire
+		(pts
+			(xy 58.42 204.47) (xy 58.42 194.31)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c835d750-07f1-4a3d-9d97-1a6ab7cea2a1")
+	)
 	(wire
 		(pts
 			(xy 345.44 351.79) (xy 345.44 349.25)
@@ -17579,6 +18170,16 @@
 		)
 		(uuid "cd21bd6e-80a3-45cd-834e-86f431160983")
 	)
+	(wire
+		(pts
+			(xy 176.53 327.66) (xy 207.01 327.66)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "cd583836-de44-4ee4-8c07-fb345b228d87")
+	)
 	(wire
 		(pts
 			(xy 341.63 45.72) (xy 341.63 38.1)
@@ -17789,6 +18390,16 @@
 		)
 		(uuid "da706673-cded-4fb5-b0c4-7e7a9040e89f")
 	)
+	(wire
+		(pts
+			(xy 229.87 335.28) (xy 226.06 335.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "da716bff-3b94-4f1e-8e0b-9cdfe150dcd7")
+	)
 	(wire
 		(pts
 			(xy 205.74 58.42) (xy 205.74 44.45)
@@ -17799,6 +18410,16 @@
 		)
 		(uuid "da9567fc-2712-4152-a7a0-1baabd23f788")
 	)
+	(wire
+		(pts
+			(xy 229.87 325.12) (xy 224.79 325.12)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "dab14f88-0631-467c-a7b9-f87b51c26b34")
+	)
 	(wire
 		(pts
 			(xy 289.56 85.09) (xy 300.99 85.09)
@@ -17811,7 +18432,7 @@
 	)
 	(wire
 		(pts
-			(xy 31.75 212.09) (xy 52.07 212.09)
+			(xy 31.75 212.09) (xy 49.53 212.09)
 		)
 		(stroke
 			(width 0)
@@ -17861,7 +18482,7 @@
 	)
 	(wire
 		(pts
-			(xy 323.85 67.31) (xy 321.31 67.31)
+			(xy 323.85 67.31) (xy 322.58 67.31)
 		)
 		(stroke
 			(width 0)
@@ -18389,16 +19010,6 @@
 		)
 		(uuid "f850cb11-8711-44a5-9fef-ba8a9187b0ad")
 	)
-	(wire
-		(pts
-			(xy 83.82 220.98) (xy 52.07 220.98)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "f8642849-ca3d-45d8-8b20-7397bb1b5b23")
-	)
 	(wire
 		(pts
 			(xy 300.99 85.09) (xy 311.15 85.09)
@@ -18429,6 +19040,16 @@
 		)
 		(uuid "f930b562-8fa4-4b92-946a-34790fef2326")
 	)
+	(wire
+		(pts
+			(xy 68.58 203.2) (xy 60.96 203.2)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f9520798-8d1a-441c-b800-3dab77d2c2e1")
+	)
 	(wire
 		(pts
 			(xy 80.01 182.88) (xy 91.44 182.88)
@@ -18521,7 +19142,7 @@
 	)
 	(wire
 		(pts
-			(xy 350.52 85.09) (xy 327.66 85.09)
+			(xy 350.52 85.09) (xy 323.85 85.09)
 		)
 		(stroke
 			(width 0)
@@ -18549,16 +19170,6 @@
 		)
 		(uuid "fe9984f6-2fb1-4cb5-8883-45cd376e75db")
 	)
-	(wire
-		(pts
-			(xy 52.07 220.98) (xy 46.99 220.98)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ff59e6fc-5cdc-4685-b04b-ea13315b0e44")
-	)
 	(wire
 		(pts
 			(xy 270.51 133.35) (xy 281.94 133.35)
@@ -18772,25 +19383,6 @@
 		)
 		(uuid "558ff43f-8b4a-4e84-b0bd-484d76ed2cda")
 	)
-	(text_box "batt+ batt- are the wrong nets, because we do the current sensing now here. "
-		(exclude_from_sim no)
-		(at 454.66 2.54 0)
-		(size 43.18 5.08)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(fill
-			(type none)
-		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left top)
-		)
-		(uuid "58100b0a-4129-4e55-9e2c-466d6ef0ca87")
-	)
 	(text_box "BatteryConn"
 		(exclude_from_sim no)
 		(at 344.17 74.93 0)
@@ -19549,7 +20141,7 @@
 	)
 	(global_label "USB_D-"
 		(shape bidirectional)
-		(at 68.58 215.9 180)
+		(at 63.5 215.9 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -19559,7 +20151,7 @@
 		)
 		(uuid "52046480-cc3b-4ddc-bf14-367d17846c59")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 56.8635 215.9 0)
+			(at 51.7835 215.9 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -20386,7 +20978,7 @@
 	)
 	(global_label "USB_D+"
 		(shape bidirectional)
-		(at 68.58 208.28 180)
+		(at 63.5 208.28 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -20396,7 +20988,7 @@
 		)
 		(uuid "cd6330a6-5881-40e2-846a-1faeff31922d")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 56.8635 208.28 0)
+			(at 51.7835 208.28 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -22262,6 +22854,80 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Connector:Conn_01x04_Pin")
+		(at 58.42 189.23 90)
+		(mirror x)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "0f9a7c61-3427-46a5-90fd-3bb01e0ef879")
+		(property "Reference" "J11"
+			(at 50.8 189.865 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "Conn_01x04_Pin-USB"
+			(at 53.34 189.865 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical"
+			(at 58.42 189.23 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 58.42 189.23 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x04, script generated"
+			(at 58.42 189.23 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "61234634-9c8b-4e60-a94a-17f8e15495b8")
+		)
+		(pin "2"
+			(uuid "bff87aa6-9697-4442-8eb5-35155b81207f")
+		)
+		(pin "1"
+			(uuid "d5b4d627-1904-4d44-a207-eb775077e210")
+		)
+		(pin "4"
+			(uuid "989a53aa-370a-4b6c-8c10-225d1304c63b")
+		)
+		(instances
+			(project ""
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "J11")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 568.96 135.89 0)
@@ -23942,6 +24608,71 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 233.68 331.47 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "24196b50-5f87-4360-bfa4-9ef47b6332d3")
+		(property "Reference" "#PWR0120"
+			(at 233.68 337.82 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 233.68 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 233.68 331.47 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 233.68 331.47 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 233.68 331.47 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "b90606f6-3e2d-4729-848c-74f47046c947")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "#PWR0120")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 544.83 44.45 0)
@@ -24814,6 +25545,73 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:LED_Filled")
+		(at 222.25 335.28 180)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "33912af7-3671-44a5-98b9-30d5742f4950")
+		(property "Reference" "D5"
+			(at 222.25 332.74 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "LED_Filled"
+			(at 222.25 337.82 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "LED_SMD:LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder"
+			(at 222.25 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 222.25 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Light emitting diode, filled shape"
+			(at 222.25 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "86c97e01-73be-4dd2-a63d-432c4b7eb894")
+		)
+		(pin "2"
+			(uuid "621e5a34-c3ae-47a3-bee9-246cd7cfe3f7")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "D5")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 100.33 383.54 90)
@@ -25566,7 +26364,7 @@
 	)
 	(symbol
 		(lib_id "Switch:SW_DPST")
-		(at 316.23 69.85 0)
+		(at 317.5 69.85 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -25575,7 +26373,7 @@
 		(fields_autoplaced yes)
 		(uuid "3e3f7ec9-c90a-4c75-8df2-aa87ecfb0089")
 		(property "Reference" "SW5"
-			(at 316.23 60.96 0)
+			(at 317.5 60.96 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25583,7 +26381,7 @@
 			)
 		)
 		(property "Value" "SW_DPST"
-			(at 316.23 63.5 0)
+			(at 317.5 63.5 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25591,7 +26389,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 316.23 69.85 0)
+			(at 317.5 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25600,7 +26398,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 316.23 69.85 0)
+			(at 317.5 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25609,7 +26407,7 @@
 			)
 		)
 		(property "Description" "Double Pole Single Throw (DPST) Switch"
-			(at 316.23 69.85 0)
+			(at 317.5 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -25723,7 +26521,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "Si7617DN"
+		(property "Value" "SiS412DN"
 			(at 237.49 101.854 0)
 			(effects
 				(font
@@ -26941,6 +27739,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 63.5 196.85 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "4e49ad63-70ec-4fcc-a69e-b0404f663007")
+		(property "Reference" "#PWR0118"
+			(at 63.5 203.2 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 63.5 201.93 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 63.5 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 63.5 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 63.5 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "e11ee2aa-688c-41d9-b7fc-bb39c2a721bb")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "#PWR0118")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:C_Polarized")
 		(at 505.46 34.29 0)
@@ -29928,7 +30792,7 @@
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
-		(dnp no)
+		(dnp yes)
 		(uuid "6fe68350-84fe-48fc-a30c-94beb6cb0262")
 		(property "Reference" "R5"
 			(at 34.29 201.93 90)
@@ -30497,6 +31361,73 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 220.98 325.12 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "79370cb5-83e8-449c-8f61-2d805e3247af")
+		(property "Reference" "R46"
+			(at 220.98 323.088 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "1k"
+			(at 220.98 327.406 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 220.98 323.342 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 220.98 325.12 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 220.98 325.12 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "19752049-3684-48f1-83f6-c41e6b6ab6b9")
+		)
+		(pin "2"
+			(uuid "6a259867-c69b-4119-93fd-e5af7def49c7")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "R46")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 233.68 101.6 0)
@@ -33465,6 +34396,71 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 229.87 337.82 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "a45b072a-5bb9-4f52-bd49-0d35395e6d8c")
+		(property "Reference" "#PWR0119"
+			(at 229.87 344.17 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 229.87 341.63 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 229.87 337.82 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 229.87 337.82 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 229.87 337.82 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "59e9e01c-3592-4629-be7d-2d2ccf84b836")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "#PWR0119")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 495.3 364.49 0)
@@ -35730,6 +36726,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:+5V")
+		(at 229.87 325.12 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "beb901ca-e19a-4e3f-a60e-25e90af5ad98")
+		(property "Reference" "#PWR0121"
+			(at 229.87 328.93 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "+3.3V"
+			(at 229.87 320.04 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 229.87 325.12 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 229.87 325.12 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"+5V\""
+			(at 229.87 325.12 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "a83154fe-9f04-428d-9f2c-c454f2dca457")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "#PWR0121")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R")
 		(at 495.3 358.14 180)
@@ -36592,6 +37654,77 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Switch:SW_SPDT")
+		(at 212.09 327.66 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "c6026274-7f00-49c4-b931-23da3c5e1eef")
+		(property "Reference" "SW6"
+			(at 212.09 318.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SW_SPDT"
+			(at 212.09 321.31 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 212.09 327.66 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 212.09 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Switch, single pole double throw"
+			(at 212.09 327.66 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "c7e1817a-d21d-49dd-bf94-ac4d9a21f2f8")
+		)
+		(pin "3"
+			(uuid "67c2ff5e-c498-416e-bff8-19e65a61e55e")
+		)
+		(pin "2"
+			(uuid "ad6345c2-322d-490f-a890-f1b868e7b2fe")
+		)
+		(instances
+			(project ""
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "SW6")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:GND")
 		(at 452.12 119.38 270)
@@ -36678,7 +37811,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "Si7617DN"
+		(property "Value" "SiS412DN"
 			(at 252.73 78.7399 0)
 			(effects
 				(font
@@ -38671,6 +39804,73 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:R")
+		(at 209.55 335.28 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "e0576491-648a-4699-843a-b238580411ba")
+		(property "Reference" "R45"
+			(at 209.55 337.82 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "470"
+			(at 209.55 332.994 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 209.55 333.502 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 209.55 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor"
+			(at 209.55 335.28 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "234f983c-7f1e-4535-be69-ff8e56841d0a")
+		)
+		(pin "2"
+			(uuid "fac46fe5-bff5-494c-954b-91ae4b012c48")
+		)
+		(instances
+			(project "monorail"
+				(path "/10e9ed1f-81fe-4a04-a219-cef72219a4ee"
+					(reference "R45")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "power:-BATT")
 		(at 44.45 81.28 180)