diff --git a/controller/mixercontroller_w5100/mixercontroller_w5100.ino b/controller/mixercontroller_w5100/mixercontroller_w5100.ino
index 56a5645..02ebb3c 100644
--- a/controller/mixercontroller_w5100/mixercontroller_w5100.ino
+++ b/controller/mixercontroller_w5100/mixercontroller_w5100.ino
@@ -25,9 +25,9 @@ long last_serialdebug=0;
 #define INTERVAL_SERIALDEBUG 200
 
 //Inputs
-#define PIN_BUTTON PB0 //D8 = PB0
-#define PIN_ENCA PC1 //A1 = PC1
-#define PIN_ENCB PC2 //A2 = PC2
+#define PIN_BUTTON PC3 //A3 = PC3
+#define PIN_ENCA PC2 //A2 = PC2
+#define PIN_ENCB PC1 //A1 = PC1
 #define BUTTON_RELEASE_DEBOUNCE 100 //minimum time after button release to reenable triggering
 
 boolean button_flag=false; //true if button pressed
diff --git a/schematic/controller/_saved_controller.sch b/schematic/controller/_saved_controller.sch
new file mode 100644
index 0000000..335400c
--- /dev/null
+++ b/schematic/controller/_saved_controller.sch
@@ -0,0 +1,1296 @@
+EESchema Schematic File Version 4
+LIBS:controller-cache
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L MCU_Microchip_ATmega:ATmega328P-PU U1
+U 1 1 5CD141F3
+P 1950 3000
+F 0 "U1" H 1309 3046 50  0000 R CNN
+F 1 "ATmega328P-PU" H 1309 2955 50  0000 R CNN
+F 2 "Package_DIP:DIP-28_W7.62mm" H 1950 3000 50  0001 C CIN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf" H 1950 3000 50  0001 C CNN
+	1    1950 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR09
+U 1 1 5CD142C5
+P 1950 4650
+F 0 "#PWR09" H 1950 4400 50  0001 C CNN
+F 1 "GNDD" H 1954 4495 50  0000 C CNN
+F 2 "" H 1950 4650 50  0001 C CNN
+F 3 "" H 1950 4650 50  0001 C CNN
+	1    1950 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR021
+U 1 1 5CD1433E
+P 4850 7450
+F 0 "#PWR021" H 4850 7200 50  0001 C CNN
+F 1 "GNDA" H 4855 7277 50  0000 C CNN
+F 2 "" H 4850 7450 50  0001 C CNN
+F 3 "" H 4850 7450 50  0001 C CNN
+	1    4850 7450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR08
+U 1 1 5CD1438D
+P 1950 1300
+F 0 "#PWR08" H 1950 1150 50  0001 C CNN
+F 1 "+5V" H 1965 1473 50  0000 C CNN
+F 2 "" H 1950 1300 50  0001 C CNN
+F 3 "" H 1950 1300 50  0001 C CNN
+	1    1950 1300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1950 1300 1950 1350
+Wire Wire Line
+	2050 1500 2050 1350
+Wire Wire Line
+	2050 1350 1950 1350
+Connection ~ 1950 1350
+Wire Wire Line
+	1950 1350 1950 1500
+$Comp
+L power:+5V #PWR01
+U 1 1 5CD143AC
+P 1250 1700
+F 0 "#PWR01" H 1250 1550 50  0001 C CNN
+F 1 "+5V" H 1265 1873 50  0000 C CNN
+F 2 "" H 1250 1700 50  0001 C CNN
+F 3 "" H 1250 1700 50  0001 C CNN
+	1    1250 1700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1250 1700 1250 1800
+Wire Wire Line
+	1250 1800 1350 1800
+Wire Wire Line
+	1950 4650 1950 4500
+Text GLabel 2750 3000 2    50   Input ~ 0
+ENCODER_BUTTON
+Text GLabel 2750 2900 2    50   Input ~ 0
+ENCODER_A
+Text GLabel 2750 2800 2    50   Input ~ 0
+ENCODER_B
+Text GLabel 3250 3900 2    50   Input ~ 0
+SRLATCH
+Text GLabel 3250 3800 2    50   Input ~ 0
+SRCLOCK
+Text GLabel 3250 3700 2    50   Input ~ 0
+SRDATA
+Wire Wire Line
+	3250 3700 2550 3700
+Wire Wire Line
+	3250 3800 2550 3800
+Wire Wire Line
+	2550 3900 3250 3900
+$Comp
+L Device:R R2
+U 1 1 5CD153B9
+P 3000 3300
+F 0 "R2" V 2793 3300 50  0000 C CNN
+F 1 "10k" V 2884 3300 50  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 2930 3300 50  0001 C CNN
+F 3 "~" H 3000 3300 50  0001 C CNN
+	1    3000 3300
+	0    1    1    0   
+$EndComp
+$Comp
+L power:+5V #PWR013
+U 1 1 5CD1548E
+P 3300 3300
+F 0 "#PWR013" H 3300 3150 50  0001 C CNN
+F 1 "+5V" H 3315 3473 50  0000 C CNN
+F 2 "" H 3300 3300 50  0001 C CNN
+F 3 "" H 3300 3300 50  0001 C CNN
+	1    3300 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3300 3300 3150 3300
+Wire Wire Line
+	2850 3300 2600 3300
+Wire Wire Line
+	2600 3300 2600 3400
+Connection ~ 2600 3300
+Wire Wire Line
+	2600 3300 2550 3300
+Text GLabel 3600 3400 2    50   Input ~ 0
+RESET
+$Comp
+L Device:R R1
+U 1 1 5CD157F9
+P 2900 3600
+F 0 "R1" V 2800 3600 50  0000 C CNN
+F 1 "1k" V 2900 3600 50  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 2830 3600 50  0001 C CNN
+F 3 "~" H 2900 3600 50  0001 C CNN
+	1    2900 3600
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R3
+U 1 1 5CD15825
+P 3200 3500
+F 0 "R3" V 3100 3500 50  0000 C CNN
+F 1 "1k" V 3200 3500 50  0000 C CNN
+F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 3130 3500 50  0001 C CNN
+F 3 "~" H 3200 3500 50  0001 C CNN
+	1    3200 3500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3050 3500 2550 3500
+Wire Wire Line
+	2550 3600 2750 3600
+Text GLabel 3600 3600 2    50   Input ~ 0
+TX
+Text GLabel 3600 3500 2    50   Input ~ 0
+RX
+Wire Wire Line
+	3600 3500 3350 3500
+Wire Wire Line
+	3600 3600 3050 3600
+$Comp
+L Device:Crystal Y1
+U 1 1 5CD163A1
+P 3100 2450
+F 0 "Y1" V 3054 2581 50  0000 L CNN
+F 1 "Crystal" V 3145 2581 50  0000 L CNN
+F 2 "Crystal:Crystal_HC52-6mm_Vertical" H 3100 2450 50  0001 C CNN
+F 3 "~" H 3100 2450 50  0001 C CNN
+	1    3100 2450
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3100 2300 2950 2300
+Wire Wire Line
+	2950 2300 2950 2400
+Wire Wire Line
+	2950 2400 2550 2400
+Wire Wire Line
+	2550 2500 2950 2500
+Wire Wire Line
+	2950 2500 2950 2600
+Wire Wire Line
+	2950 2600 3100 2600
+$Comp
+L Device:C C5
+U 1 1 5CD16AB1
+P 3550 2300
+F 0 "C5" V 3298 2300 50  0000 C CNN
+F 1 "22p" V 3389 2300 50  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 3588 2150 50  0001 C CNN
+F 3 "~" H 3550 2300 50  0001 C CNN
+	1    3550 2300
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C6
+U 1 1 5CD16B2E
+P 3550 2600
+F 0 "C6" V 3700 2600 50  0000 C CNN
+F 1 "22p" V 3800 2600 50  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 3588 2450 50  0001 C CNN
+F 3 "~" H 3550 2600 50  0001 C CNN
+	1    3550 2600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3400 2600 3100 2600
+Connection ~ 3100 2600
+Wire Wire Line
+	3100 2300 3400 2300
+Connection ~ 3100 2300
+$Comp
+L power:GNDD #PWR016
+U 1 1 5CD17431
+P 3850 2650
+F 0 "#PWR016" H 3850 2400 50  0001 C CNN
+F 1 "GNDD" H 3854 2495 50  0000 C CNN
+F 2 "" H 3850 2650 50  0001 C CNN
+F 3 "" H 3850 2650 50  0001 C CNN
+	1    3850 2650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3850 2650 3850 2600
+Wire Wire Line
+	3850 2300 3700 2300
+Wire Wire Line
+	3700 2600 3850 2600
+Connection ~ 3850 2600
+Wire Wire Line
+	3850 2600 3850 2300
+$Comp
+L 74xx:74HC595 U4
+U 1 1 5CD17EBC
+P 5900 2200
+F 0 "U4" H 6100 2850 50  0000 C CNN
+F 1 "74HC595" H 6100 2750 50  0000 C CNN
+F 2 "Package_DIP:DIP-16_W7.62mm" H 5900 2200 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/sn74hc595.pdf" H 5900 2200 50  0001 C CNN
+	1    5900 2200
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR032
+U 1 1 5CD17FA8
+P 5900 1550
+F 0 "#PWR032" H 5900 1400 50  0001 C CNN
+F 1 "+5V" H 5915 1723 50  0000 C CNN
+F 2 "" H 5900 1550 50  0001 C CNN
+F 3 "" H 5900 1550 50  0001 C CNN
+	1    5900 1550
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR033
+U 1 1 5CD17FCB
+P 5900 2950
+F 0 "#PWR033" H 5900 2700 50  0001 C CNN
+F 1 "GNDD" H 5904 2795 50  0000 C CNN
+F 2 "" H 5900 2950 50  0001 C CNN
+F 3 "" H 5900 2950 50  0001 C CNN
+	1    5900 2950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5900 1550 5900 1600
+Wire Wire Line
+	5900 2900 5900 2950
+$Comp
+L power:+5V #PWR022
+U 1 1 5CD18B0D
+P 4950 2100
+F 0 "#PWR022" H 4950 1950 50  0001 C CNN
+F 1 "+5V" V 4965 2273 50  0000 C CNN
+F 2 "" H 4950 2100 50  0001 C CNN
+F 3 "" H 4950 2100 50  0001 C CNN
+	1    4950 2100
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5500 2100 4950 2100
+Text GLabel 5350 2000 0    50   Input ~ 0
+SRCLOCK
+Wire Wire Line
+	5500 2000 5350 2000
+Text GLabel 5350 2300 0    50   Input ~ 0
+SRLATCH
+Wire Wire Line
+	5500 2300 5350 2300
+Text GLabel 5350 1800 0    50   Input ~ 0
+SRDATA
+Wire Wire Line
+	5350 1800 5500 1800
+$Comp
+L power:GNDD #PWR030
+U 1 1 5CD1B4D1
+P 5350 2500
+F 0 "#PWR030" H 5350 2250 50  0001 C CNN
+F 1 "GNDD" H 5354 2345 50  0000 C CNN
+F 2 "" H 5350 2500 50  0001 C CNN
+F 3 "" H 5350 2500 50  0001 C CNN
+	1    5350 2500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5500 2400 5350 2400
+Wire Wire Line
+	5350 2400 5350 2500
+$Comp
+L power:+5V #PWR034
+U 1 1 5CD1CCB4
+P 5900 3450
+F 0 "#PWR034" H 5900 3300 50  0001 C CNN
+F 1 "+5V" H 5915 3623 50  0000 C CNN
+F 2 "" H 5900 3450 50  0001 C CNN
+F 3 "" H 5900 3450 50  0001 C CNN
+	1    5900 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR035
+U 1 1 5CD1CCBA
+P 5900 4850
+F 0 "#PWR035" H 5900 4600 50  0001 C CNN
+F 1 "GNDD" H 5904 4695 50  0000 C CNN
+F 2 "" H 5900 4850 50  0001 C CNN
+F 3 "" H 5900 4850 50  0001 C CNN
+	1    5900 4850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5900 3450 5900 3500
+Wire Wire Line
+	5900 4800 5900 4850
+$Comp
+L power:+5V #PWR023
+U 1 1 5CD1CCC2
+P 4950 4000
+F 0 "#PWR023" H 4950 3850 50  0001 C CNN
+F 1 "+5V" V 4965 4173 50  0000 C CNN
+F 2 "" H 4950 4000 50  0001 C CNN
+F 3 "" H 4950 4000 50  0001 C CNN
+	1    4950 4000
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	5500 4000 4950 4000
+Text GLabel 5350 3900 0    50   Input ~ 0
+SRCLOCK
+Wire Wire Line
+	5500 3900 5350 3900
+Text GLabel 5350 4200 0    50   Input ~ 0
+SRLATCH
+Wire Wire Line
+	5500 4200 5350 4200
+Wire Wire Line
+	5350 3700 5500 3700
+$Comp
+L power:GNDD #PWR031
+U 1 1 5CD1CCCF
+P 5350 4400
+F 0 "#PWR031" H 5350 4150 50  0001 C CNN
+F 1 "GNDD" H 5354 4245 50  0000 C CNN
+F 2 "" H 5350 4400 50  0001 C CNN
+F 3 "" H 5350 4400 50  0001 C CNN
+	1    5350 4400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5500 4300 5350 4300
+Wire Wire Line
+	5350 4300 5350 4400
+Wire Wire Line
+	5350 3200 6300 3200
+Wire Wire Line
+	6300 3200 6300 2700
+Wire Wire Line
+	5350 3200 5350 3700
+$Comp
+L Device:C C9
+U 1 1 5CD239F2
+P 5350 1300
+F 0 "C9" H 5235 1254 50  0000 R CNN
+F 1 "100nF" H 5235 1345 50  0000 R CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 5388 1150 50  0001 C CNN
+F 3 "~" H 5350 1300 50  0001 C CNN
+	1    5350 1300
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDD #PWR029
+U 1 1 5CD24539
+P 5350 1450
+F 0 "#PWR029" H 5350 1200 50  0001 C CNN
+F 1 "GNDD" H 5354 1295 50  0000 C CNN
+F 2 "" H 5350 1450 50  0001 C CNN
+F 3 "" H 5350 1450 50  0001 C CNN
+	1    5350 1450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR028
+U 1 1 5CD24558
+P 5350 1150
+F 0 "#PWR028" H 5350 1000 50  0001 C CNN
+F 1 "+5V" H 5365 1323 50  0000 C CNN
+F 2 "" H 5350 1150 50  0001 C CNN
+F 3 "" H 5350 1150 50  0001 C CNN
+	1    5350 1150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C8
+U 1 1 5CD250AE
+P 5100 3450
+F 0 "C8" H 4985 3404 50  0000 R CNN
+F 1 "100nF" H 4985 3495 50  0000 R CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 5138 3300 50  0001 C CNN
+F 3 "~" H 5100 3450 50  0001 C CNN
+	1    5100 3450
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDD #PWR026
+U 1 1 5CD250B4
+P 5100 3600
+F 0 "#PWR026" H 5100 3350 50  0001 C CNN
+F 1 "GNDD" H 5104 3445 50  0000 C CNN
+F 2 "" H 5100 3600 50  0001 C CNN
+F 3 "" H 5100 3600 50  0001 C CNN
+	1    5100 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR025
+U 1 1 5CD250BA
+P 5100 3300
+F 0 "#PWR025" H 5100 3150 50  0001 C CNN
+F 1 "+5V" H 5115 3473 50  0000 C CNN
+F 2 "" H 5100 3300 50  0001 C CNN
+F 3 "" H 5100 3300 50  0001 C CNN
+	1    5100 3300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 5CD25D56
+P 1550 1200
+F 0 "C1" H 1435 1154 50  0000 R CNN
+F 1 "100nF" H 1435 1245 50  0000 R CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 1588 1050 50  0001 C CNN
+F 3 "~" H 1550 1200 50  0001 C CNN
+	1    1550 1200
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDD #PWR03
+U 1 1 5CD25D5C
+P 1550 1350
+F 0 "#PWR03" H 1550 1100 50  0001 C CNN
+F 1 "GNDD" H 1554 1195 50  0000 C CNN
+F 2 "" H 1550 1350 50  0001 C CNN
+F 3 "" H 1550 1350 50  0001 C CNN
+	1    1550 1350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR02
+U 1 1 5CD25D62
+P 1550 1050
+F 0 "#PWR02" H 1550 900 50  0001 C CNN
+F 1 "+5V" H 1565 1223 50  0000 C CNN
+F 2 "" H 1550 1050 50  0001 C CNN
+F 3 "" H 1550 1050 50  0001 C CNN
+	1    1550 1050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Driver_Motor:L293D U3
+U 1 1 5CD2818F
+P 5050 6550
+F 0 "U3" H 5350 7600 50  0000 C CNN
+F 1 "L293D" H 5350 7500 50  0000 C CNN
+F 2 "Package_DIP:DIP-16_W7.62mm" H 5300 5800 50  0001 L CNN
+F 3 "http://www.ti.com/lit/ds/symlink/l293.pdf" H 4750 7250 50  0001 C CNN
+	1    5050 6550
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR024
+U 1 1 5CD2A75C
+P 4950 5450
+F 0 "#PWR024" H 4950 5300 50  0001 C CNN
+F 1 "VCC" H 4967 5623 50  0000 C CNN
+F 2 "" H 4950 5450 50  0001 C CNN
+F 3 "" H 4950 5450 50  0001 C CNN
+	1    4950 5450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4950 5450 4950 5550
+Wire Wire Line
+	4850 7450 4850 7400
+Wire Wire Line
+	4950 7350 4950 7400
+Wire Wire Line
+	4950 7400 4850 7400
+Connection ~ 4850 7400
+Wire Wire Line
+	4850 7400 4850 7350
+Wire Wire Line
+	5250 7350 5250 7400
+Wire Wire Line
+	5250 7400 5150 7400
+Connection ~ 4950 7400
+Wire Wire Line
+	5150 7350 5150 7400
+Connection ~ 5150 7400
+Wire Wire Line
+	5150 7400 4950 7400
+$Comp
+L power:VCC #PWR027
+U 1 1 5CD2E54B
+P 5150 5450
+F 0 "#PWR027" H 5150 5300 50  0001 C CNN
+F 1 "VCC" H 5167 5623 50  0000 C CNN
+F 2 "" H 5150 5450 50  0001 C CNN
+F 3 "" H 5150 5450 50  0001 C CNN
+	1    5150 5450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5150 5450 5150 5550
+$Comp
+L Connector:Conn_01x02_Male J5
+U 1 1 5CD323EC
+P 6050 6100
+F 0 "J5" H 6022 5980 50  0000 R CNN
+F 1 "Conn_Motor" H 6022 6071 50  0000 R CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 6050 6100 50  0001 C CNN
+F 3 "~" H 6050 6100 50  0001 C CNN
+	1    6050 6100
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5850 6000 5700 6000
+Wire Wire Line
+	5700 6000 5700 5950
+Wire Wire Line
+	5700 5950 5550 5950
+Wire Wire Line
+	5550 6150 5700 6150
+Wire Wire Line
+	5700 6150 5700 6100
+Wire Wire Line
+	5700 6100 5850 6100
+$Comp
+L Connector:Conn_01x02_Male J2
+U 1 1 5CD34BBF
+P 2800 950
+F 0 "J2" H 2906 1128 50  0000 C CNN
+F 1 "Conn_5V" H 2906 1037 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 2800 950 50  0001 C CNN
+F 3 "~" H 2800 950 50  0001 C CNN
+	1    2800 950 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR011
+U 1 1 5CD34CC4
+P 3250 800
+F 0 "#PWR011" H 3250 650 50  0001 C CNN
+F 1 "+5V" H 3265 973 50  0000 C CNN
+F 2 "" H 3250 800 50  0001 C CNN
+F 3 "" H 3250 800 50  0001 C CNN
+	1    3250 800 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR012
+U 1 1 5CD34CED
+P 3250 1100
+F 0 "#PWR012" H 3250 850 50  0001 C CNN
+F 1 "GNDD" H 3254 945 50  0000 C CNN
+F 2 "" H 3250 1100 50  0001 C CNN
+F 3 "" H 3250 1100 50  0001 C CNN
+	1    3250 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR018
+U 1 1 5CD37667
+P 4350 1100
+F 0 "#PWR018" H 4350 850 50  0001 C CNN
+F 1 "GNDA" H 4355 927 50  0000 C CNN
+F 2 "" H 4350 1100 50  0001 C CNN
+F 3 "" H 4350 1100 50  0001 C CNN
+	1    4350 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR017
+U 1 1 5CD38E26
+P 4350 800
+F 0 "#PWR017" H 4350 650 50  0001 C CNN
+F 1 "VCC" H 4367 973 50  0000 C CNN
+F 2 "" H 4350 800 50  0001 C CNN
+F 3 "" H 4350 800 50  0001 C CNN
+	1    4350 800 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:CP C4
+U 1 1 5CD3C177
+P 3450 950
+F 0 "C4" H 3568 996 50  0000 L CNN
+F 1 "100uF" H 3568 905 50  0000 L CNN
+F 2 "Capacitor_THT:CP_Radial_D8.0mm_P5.00mm" H 3488 800 50  0001 C CNN
+F 3 "~" H 3450 950 50  0001 C CNN
+	1    3450 950 
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C3
+U 1 1 5CD3F935
+P 3400 3400
+F 0 "C3" V 3150 3500 50  0000 C CNN
+F 1 "100nF" V 3250 3500 50  0000 C CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 3438 3250 50  0001 C CNN
+F 3 "~" H 3400 3400 50  0001 C CNN
+	1    3400 3400
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3250 3400 2600 3400
+Wire Wire Line
+	3600 3400 3550 3400
+$Comp
+L Connector:Conn_01x06_Female J3
+U 1 1 5CD43722
+P 3700 4750
+F 0 "J3" H 3727 4726 50  0000 L CNN
+F 1 "Conn_01x06_Female" H 3727 4635 50  0000 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" H 3700 4750 50  0001 C CNN
+F 3 "~" H 3700 4750 50  0001 C CNN
+	1    3700 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR014
+U 1 1 5CD43924
+P 3300 5050
+F 0 "#PWR014" H 3300 4800 50  0001 C CNN
+F 1 "GNDD" H 3304 4895 50  0000 C CNN
+F 2 "" H 3300 5050 50  0001 C CNN
+F 3 "" H 3300 5050 50  0001 C CNN
+	1    3300 5050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3500 5050 3300 5050
+Text GLabel 3300 4550 0    50   Input ~ 0
+RESET
+Wire Wire Line
+	3500 4550 3300 4550
+Text GLabel 2950 4650 0    50   Input ~ 0
+TX
+Text GLabel 2950 4750 0    50   Input ~ 0
+RX
+Wire Wire Line
+	2950 4750 3500 4750
+Wire Wire Line
+	2950 4650 3500 4650
+$Comp
+L Connector_Generic:Conn_02x04_Counter_Clockwise J1
+U 1 1 5CD7CCFC
+P 2250 6050
+F 0 "J1" H 1950 6250 50  0000 C CNN
+F 1 "Conn_w5100" H 2300 6276 50  0000 C CNN
+F 2 "footprints:W5100_V2" H 2250 6050 50  0001 C CNN
+F 3 "~" H 2250 6050 50  0001 C CNN
+	1    2250 6050
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR06
+U 1 1 5CD7CFCE
+P 1650 5950
+F 0 "#PWR06" H 1650 5700 50  0001 C CNN
+F 1 "GNDD" H 1654 5795 50  0000 C CNN
+F 2 "" H 1650 5950 50  0001 C CNN
+F 3 "" H 1650 5950 50  0001 C CNN
+	1    1650 5950
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2050 5950 1650 5950
+Text GLabel 1900 6050 0    50   Input ~ 0
+MOSI
+Text GLabel 1900 6150 0    50   Input ~ 0
+SCK
+Text GLabel 2700 6050 2    50   Input ~ 0
+MISO
+Text GLabel 2700 6150 2    50   Input ~ 0
+SS
+Wire Wire Line
+	2700 6050 2550 6050
+Wire Wire Line
+	2550 6150 2700 6150
+Wire Wire Line
+	1900 6150 2050 6150
+Wire Wire Line
+	2050 6050 1900 6050
+$Comp
+L Regulator_Linear:L78L33_TO92 U2
+U 1 1 5CD8B474
+P 2300 5250
+F 0 "U2" H 2300 5492 50  0000 C CNN
+F 1 "L78L33_TO92" H 2300 5401 50  0000 C CNN
+F 2 "Package_TO_SOT_THT:TO-92_Inline" H 2300 5475 50  0001 C CIN
+F 3 "http://www.st.com/content/ccc/resource/technical/document/datasheet/15/55/e5/aa/23/5b/43/fd/CD00000446.pdf/files/CD00000446.pdf/jcr:content/translations/en.CD00000446.pdf" H 2300 5200 50  0001 C CNN
+	1    2300 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR010
+U 1 1 5CD8B5FA
+P 2300 5550
+F 0 "#PWR010" H 2300 5300 50  0001 C CNN
+F 1 "GNDD" H 2304 5395 50  0000 C CNN
+F 2 "" H 2300 5550 50  0001 C CNN
+F 3 "" H 2300 5550 50  0001 C CNN
+	1    2300 5550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2800 5250 2800 5950
+Wire Wire Line
+	2800 5950 2550 5950
+Wire Wire Line
+	2600 5250 2800 5250
+Text Label 2750 5950 2    50   ~ 0
+3v3
+$Comp
+L power:+5V #PWR07
+U 1 1 5CD8E795
+P 1850 5250
+F 0 "#PWR07" H 1850 5100 50  0001 C CNN
+F 1 "+5V" H 1865 5423 50  0000 C CNN
+F 2 "" H 1850 5250 50  0001 C CNN
+F 3 "" H 1850 5250 50  0001 C CNN
+	1    1850 5250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2000 5250 1850 5250
+$Comp
+L Device:C C2
+U 1 1 5CD91735
+P 1650 5400
+F 0 "C2" H 1535 5354 50  0000 R CNN
+F 1 "100nF" H 1535 5445 50  0000 R CNN
+F 2 "Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm" H 1688 5250 50  0001 C CNN
+F 3 "~" H 1650 5400 50  0001 C CNN
+	1    1650 5400
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDD #PWR05
+U 1 1 5CD9173B
+P 1650 5550
+F 0 "#PWR05" H 1650 5300 50  0001 C CNN
+F 1 "GNDD" H 1654 5395 50  0000 C CNN
+F 2 "" H 1650 5550 50  0001 C CNN
+F 3 "" H 1650 5550 50  0001 C CNN
+	1    1650 5550
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR04
+U 1 1 5CD91741
+P 1650 5250
+F 0 "#PWR04" H 1650 5100 50  0001 C CNN
+F 1 "+5V" H 1665 5423 50  0000 C CNN
+F 2 "" H 1650 5250 50  0001 C CNN
+F 3 "" H 1650 5250 50  0001 C CNN
+	1    1650 5250
+	1    0    0    -1  
+$EndComp
+Text GLabel 2700 2000 2    50   Input ~ 0
+SS
+Text GLabel 2700 2100 2    50   Input ~ 0
+MOSI
+Text GLabel 2700 2200 2    50   Input ~ 0
+MISO
+Wire Wire Line
+	2700 2200 2550 2200
+Wire Wire Line
+	2550 2100 2700 2100
+Wire Wire Line
+	2700 2000 2550 2000
+Text GLabel 2700 2300 2    50   Input ~ 0
+SCK
+Wire Wire Line
+	2700 2300 2550 2300
+$Comp
+L Device:CP C7
+U 1 1 5CDA1999
+P 4450 5350
+F 0 "C7" H 4568 5396 50  0000 L CNN
+F 1 "470uF" H 4568 5305 50  0000 L CNN
+F 2 "Capacitor_THT:CP_Radial_D8.0mm_P5.00mm" H 4488 5200 50  0001 C CNN
+F 3 "~" H 4450 5350 50  0001 C CNN
+	1    4450 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR020
+U 1 1 5CDA1A27
+P 4450 5500
+F 0 "#PWR020" H 4450 5250 50  0001 C CNN
+F 1 "GNDA" H 4455 5327 50  0000 C CNN
+F 2 "" H 4450 5500 50  0001 C CNN
+F 3 "" H 4450 5500 50  0001 C CNN
+	1    4450 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR019
+U 1 1 5CDA1A5E
+P 4450 5200
+F 0 "#PWR019" H 4450 5050 50  0001 C CNN
+F 1 "VCC" H 4467 5373 50  0000 C CNN
+F 2 "" H 4450 5200 50  0001 C CNN
+F 3 "" H 4450 5200 50  0001 C CNN
+	1    4450 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3450 1100 3250 1100
+Wire Wire Line
+	3250 1100 3100 1100
+Wire Wire Line
+	3100 1100 3100 1050
+Wire Wire Line
+	3100 1050 3000 1050
+Connection ~ 3250 1100
+Wire Wire Line
+	3000 950  3100 950 
+Wire Wire Line
+	3100 950  3100 800 
+Wire Wire Line
+	3100 800  3250 800 
+Wire Wire Line
+	3250 800  3450 800 
+Connection ~ 3250 800 
+$Comp
+L Jumper:SolderJumper_2_Bridged JP1
+U 1 1 5CDBB9F4
+P 3850 800
+F 0 "JP1" H 3850 950 50  0000 C CNN
+F 1 "SolderJumper_5V_VCC" H 3850 900 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 3850 800 50  0001 C CNN
+F 3 "~" H 3850 800 50  0001 C CNN
+	1    3850 800 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3700 800  3450 800 
+Connection ~ 3450 800 
+Wire Wire Line
+	3450 1100 3700 1100
+Connection ~ 3450 1100
+Wire Wire Line
+	4350 1100 4000 1100
+Wire Wire Line
+	4000 800  4350 800 
+$Comp
+L Transistor_Array:ULN2803A U7
+U 1 1 5CDD2737
+P 7250 3200
+F 0 "U7" H 7250 3767 50  0000 C CNN
+F 1 "ULN2803A" H 7250 3676 50  0000 C CNN
+F 2 "Package_DIP:DIP-18_W7.62mm" H 7300 2550 50  0001 L CNN
+F 3 "http://www.ti.com/lit/ds/symlink/uln2803a.pdf" H 7350 3000 50  0001 C CNN
+	1    7250 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR041
+U 1 1 5CDD292F
+P 7250 3950
+F 0 "#PWR041" H 7250 3700 50  0001 C CNN
+F 1 "GNDA" H 7255 3777 50  0000 C CNN
+F 2 "" H 7250 3950 50  0001 C CNN
+F 3 "" H 7250 3950 50  0001 C CNN
+	1    7250 3950
+	1    0    0    -1  
+$EndComp
+Text Notes 4750 900  2    50   ~ 0
+VCC for \nMotor (3V - 7V)
+$Comp
+L Connector:Conn_01x02_Male J6
+U 1 1 5CDD6503
+P 5700 850
+F 0 "J6" H 5806 1028 50  0000 C CNN
+F 1 "Conn_9V" H 5806 937 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 5700 850 50  0001 C CNN
+F 3 "~" H 5700 850 50  0001 C CNN
+	1    5700 850 
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR038
+U 1 1 5CDD6820
+P 6000 1000
+F 0 "#PWR038" H 6000 750 50  0001 C CNN
+F 1 "GNDA" H 6005 827 50  0000 C CNN
+F 2 "" H 6000 1000 50  0001 C CNN
+F 3 "" H 6000 1000 50  0001 C CNN
+	1    6000 1000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6000 1000 6000 950 
+Wire Wire Line
+	6000 950  5900 950 
+$Comp
+L power:+9V #PWR039
+U 1 1 5CDDA496
+P 6050 800
+F 0 "#PWR039" H 6050 650 50  0001 C CNN
+F 1 "+9V" H 6065 973 50  0000 C CNN
+F 2 "" H 6050 800 50  0001 C CNN
+F 3 "" H 6050 800 50  0001 C CNN
+	1    6050 800 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6050 800  6050 850 
+Wire Wire Line
+	6050 850  5900 850 
+$Comp
+L Jumper:SolderJumper_2_Open JP2
+U 1 1 5CDDE1BC
+P 3850 1100
+F 0 "JP2" H 3850 1000 50  0000 C CNN
+F 1 "SolderJumper_GNDA" H 3850 900 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 3850 1100 50  0001 C CNN
+F 3 "~" H 3850 1100 50  0001 C CNN
+	1    3850 1100
+	1    0    0    -1  
+$EndComp
+Text GLabel 4500 5950 0    50   Input ~ 0
+MOTOR_1
+Text GLabel 4500 6150 0    50   Input ~ 0
+MOTOR_2
+Wire Wire Line
+	4550 6150 4500 6150
+Wire Wire Line
+	4550 5950 4500 5950
+Text GLabel 3100 4000 2    50   Input ~ 0
+MOTOR_1
+Text GLabel 3100 4100 2    50   Input ~ 0
+MOTOR_2
+Text GLabel 2650 2700 2    50   Input ~ 0
+SERVO_SLIDER
+Wire Wire Line
+	2650 2700 2550 2700
+Wire Wire Line
+	3100 4000 2550 4000
+Wire Wire Line
+	2550 4100 3100 4100
+$Comp
+L Connector:Conn_01x03_Male J7
+U 1 1 5CE08F51
+P 6500 6400
+F 0 "J7" H 6473 6330 50  0000 R CNN
+F 1 "Conn_Servo_Poti" H 6473 6421 50  0000 R CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" H 6500 6400 50  0001 C CNN
+F 3 "~" H 6500 6400 50  0001 C CNN
+	1    6500 6400
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+5V #PWR036
+U 1 1 5CE0942F
+P 6200 6300
+F 0 "#PWR036" H 6200 6150 50  0001 C CNN
+F 1 "+5V" H 6215 6473 50  0000 C CNN
+F 2 "" H 6200 6300 50  0001 C CNN
+F 3 "" H 6200 6300 50  0001 C CNN
+	1    6200 6300
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDD #PWR037
+U 1 1 5CE09472
+P 6200 6500
+F 0 "#PWR037" H 6200 6250 50  0001 C CNN
+F 1 "GNDD" H 6204 6345 50  0000 C CNN
+F 2 "" H 6200 6500 50  0001 C CNN
+F 3 "" H 6200 6500 50  0001 C CNN
+	1    6200 6500
+	1    0    0    -1  
+$EndComp
+Text GLabel 6200 6400 0    50   Input ~ 0
+SERVO_SLIDER
+Wire Wire Line
+	6300 6400 6200 6400
+Wire Wire Line
+	6200 6300 6300 6300
+Wire Wire Line
+	6200 6500 6300 6500
+$Comp
+L Connector:Conn_01x04_Male J4
+U 1 1 5CE19110
+P 4000 5700
+F 0 "J4" H 4000 5300 50  0000 C CNN
+F 1 "Conn_Encoder" H 4000 5400 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 4000 5700 50  0001 C CNN
+F 3 "~" H 4000 5700 50  0001 C CNN
+	1    4000 5700
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:GNDD #PWR015
+U 1 1 5CE20D44
+P 3650 5850
+F 0 "#PWR015" H 3650 5600 50  0001 C CNN
+F 1 "GNDD" H 3654 5695 50  0000 C CNN
+F 2 "" H 3650 5850 50  0001 C CNN
+F 3 "" H 3650 5850 50  0001 C CNN
+	1    3650 5850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3650 5500 3800 5500
+Text GLabel 3650 5500 0    50   Input ~ 0
+ENCODER_BUTTON
+Text GLabel 3650 5600 0    50   Input ~ 0
+ENCODER_A
+Text GLabel 3650 5700 0    50   Input ~ 0
+ENCODER_B
+Wire Wire Line
+	3800 5700 3650 5700
+Wire Wire Line
+	3650 5600 3800 5600
+Wire Wire Line
+	3800 5800 3650 5800
+Wire Wire Line
+	3650 5800 3650 5850
+Wire Wire Line
+	7250 3950 7250 3900
+$Comp
+L Transistor_Array:ULN2803A U6
+U 1 1 5CE689B3
+P 7250 1300
+F 0 "U6" H 7250 1867 50  0000 C CNN
+F 1 "ULN2803A" H 7250 1776 50  0000 C CNN
+F 2 "Package_DIP:DIP-18_W7.62mm" H 7300 650 50  0001 L CNN
+F 3 "http://www.ti.com/lit/ds/symlink/uln2803a.pdf" H 7350 1100 50  0001 C CNN
+	1    7250 1300
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GNDA #PWR040
+U 1 1 5CE68A43
+P 7250 2050
+F 0 "#PWR040" H 7250 1800 50  0001 C CNN
+F 1 "GNDA" H 7255 1877 50  0000 C CNN
+F 2 "" H 7250 2050 50  0001 C CNN
+F 3 "" H 7250 2050 50  0001 C CNN
+	1    7250 2050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7250 2050 7250 2000
+$Comp
+L Connector:Conn_01x09_Male J9
+U 1 1 5CEE2E4F
+P 8100 1400
+F 0 "J9" H 8073 1330 50  0000 R CNN
+F 1 "Conn_relayA" H 8073 1421 50  0000 R CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x09_P2.54mm_Vertical" H 8100 1400 50  0001 C CNN
+F 3 "~" H 8100 1400 50  0001 C CNN
+	1    8100 1400
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+9V #PWR043
+U 1 1 5CEE2FE5
+P 7800 900
+F 0 "#PWR043" H 7800 750 50  0001 C CNN
+F 1 "+9V" H 7815 1073 50  0000 C CNN
+F 2 "" H 7800 900 50  0001 C CNN
+F 3 "" H 7800 900 50  0001 C CNN
+	1    7800 900 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7800 900  7800 1000
+Wire Wire Line
+	7800 1000 7650 1000
+Wire Wire Line
+	7900 1000 7800 1000
+Connection ~ 7800 1000
+Wire Wire Line
+	7650 1100 7900 1100
+Wire Wire Line
+	7650 1200 7900 1200
+Wire Wire Line
+	7650 1300 7900 1300
+Wire Wire Line
+	7650 1400 7900 1400
+Wire Wire Line
+	7650 1500 7900 1500
+Wire Wire Line
+	7650 1600 7900 1600
+Wire Wire Line
+	7650 1700 7900 1700
+Wire Wire Line
+	7650 1800 7900 1800
+$Comp
+L Connector:Conn_01x09_Male J8
+U 1 1 5CF21C9B
+P 8050 3300
+F 0 "J8" H 8022 3230 50  0000 R CNN
+F 1 "Conn_relayB" H 8022 3321 50  0000 R CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x09_P2.54mm_Vertical" H 8050 3300 50  0001 C CNN
+F 3 "~" H 8050 3300 50  0001 C CNN
+	1    8050 3300
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+9V #PWR042
+U 1 1 5CF21DA0
+P 7750 2850
+F 0 "#PWR042" H 7750 2700 50  0001 C CNN
+F 1 "+9V" H 7765 3023 50  0000 C CNN
+F 2 "" H 7750 2850 50  0001 C CNN
+F 3 "" H 7750 2850 50  0001 C CNN
+	1    7750 2850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7650 2900 7750 2900
+Wire Wire Line
+	7750 2850 7750 2900
+Connection ~ 7750 2900
+Wire Wire Line
+	7750 2900 7850 2900
+Wire Wire Line
+	7850 3000 7650 3000
+Wire Wire Line
+	7650 3100 7850 3100
+Wire Wire Line
+	7850 3200 7650 3200
+Wire Wire Line
+	7650 3300 7850 3300
+Wire Wire Line
+	7850 3400 7650 3400
+Wire Wire Line
+	7650 3500 7850 3500
+Wire Wire Line
+	7850 3600 7650 3600
+Wire Wire Line
+	7650 3700 7850 3700
+Wire Wire Line
+	6300 1800 6850 1800
+Wire Wire Line
+	6300 1900 6800 1900
+Wire Wire Line
+	6800 1900 6800 1700
+Wire Wire Line
+	6800 1700 6850 1700
+Wire Wire Line
+	6850 1600 6750 1600
+Wire Wire Line
+	6750 1600 6750 2000
+Wire Wire Line
+	6750 2000 6300 2000
+Wire Wire Line
+	6300 2100 6700 2100
+Wire Wire Line
+	6700 2100 6700 1500
+Wire Wire Line
+	6700 1500 6850 1500
+Wire Wire Line
+	6850 1400 6650 1400
+Wire Wire Line
+	6650 1400 6650 2200
+Wire Wire Line
+	6650 2200 6300 2200
+Wire Wire Line
+	6600 2300 6600 1300
+Wire Wire Line
+	6600 1300 6850 1300
+Wire Wire Line
+	6300 2300 6600 2300
+Wire Wire Line
+	6850 1200 6550 1200
+Wire Wire Line
+	6550 1200 6550 2400
+Wire Wire Line
+	6550 2400 6300 2400
+Wire Wire Line
+	6300 2500 6500 2500
+Wire Wire Line
+	6500 2500 6500 1100
+Wire Wire Line
+	6500 1100 6850 1100
+$Comp
+L 74xx:74HC595 U5
+U 1 1 5CD1CCAE
+P 5900 4100
+F 0 "U5" H 6100 4800 50  0000 C CNN
+F 1 "74HC595" H 6100 4700 50  0000 C CNN
+F 2 "Package_DIP:DIP-16_W7.62mm" H 5900 4100 50  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/sn74hc595.pdf" H 5900 4100 50  0001 C CNN
+	1    5900 4100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6300 3700 6850 3700
+Wire Wire Line
+	6850 3600 6750 3600
+Wire Wire Line
+	6750 3600 6750 3800
+Wire Wire Line
+	6750 3800 6300 3800
+Wire Wire Line
+	6300 3900 6700 3900
+Wire Wire Line
+	6700 3900 6700 3500
+Wire Wire Line
+	6700 3500 6850 3500
+Wire Wire Line
+	6850 3400 6650 3400
+Wire Wire Line
+	6650 3400 6650 4000
+Wire Wire Line
+	6650 4000 6300 4000
+Wire Wire Line
+	6300 4100 6600 4100
+Wire Wire Line
+	6600 4100 6600 3300
+Wire Wire Line
+	6600 3300 6850 3300
+Wire Wire Line
+	6850 3200 6550 3200
+Wire Wire Line
+	6550 3200 6550 4200
+Wire Wire Line
+	6550 4200 6300 4200
+Wire Wire Line
+	6300 4300 6500 4300
+Wire Wire Line
+	6500 4300 6500 3100
+Wire Wire Line
+	6500 3100 6850 3100
+Wire Wire Line
+	6850 3000 6450 3000
+Wire Wire Line
+	6450 3000 6450 4400
+Wire Wire Line
+	6450 4400 6300 4400
+Wire Wire Line
+	2750 3000 2550 3000
+Wire Wire Line
+	2750 2900 2550 2900
+Wire Wire Line
+	2550 2800 2750 2800
+$Comp
+L nec-eb2-12nu:NEC-EB2-12NU U?
+U 1 1 5D045184
+P 9350 2050
+F 0 "U?" H 10140 2096 50  0000 L CNN
+F 1 "NEC-EB2-12NU" H 10140 2005 50  0000 L CNN
+F 2 "" H 9350 2050 50  0001 C CNN
+F 3 "" H 9350 2050 50  0001 C CNN
+	1    9350 2050
+	1    0    0    -1  
+$EndComp
+$EndSCHEMATC
diff --git a/schematic/controller/controller.kicad_pcb b/schematic/controller/controller.kicad_pcb
index 5419387..21d9428 100644
--- a/schematic/controller/controller.kicad_pcb
+++ b/schematic/controller/controller.kicad_pcb
@@ -3,7 +3,7 @@
   (general
     (thickness 1.6)
     (drawings 0)
-    (tracks 53)
+    (tracks 79)
     (zones 0)
     (modules 31)
     (nets 63)
@@ -11,7 +11,7 @@
 
   (page A4)
   (layers
-    (0 F.Cu signal hide)
+    (0 F.Cu signal)
     (31 B.Cu signal)
     (32 B.Adhes user)
     (33 F.Adhes user)
@@ -226,14 +226,14 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1AC21)
-    (at 259.275001 57.535001)
+    (at 45.72 86.32 90)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD25D56)
-    (fp_text reference C1 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C1 (at 1.25 -2.05 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 100nF (at 1.25 2.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
@@ -246,12 +246,12 @@
     (fp_line (start -1.05 1.05) (end 3.55 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 1.05) (end 3.55 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 +5V))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -260,18 +260,18 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1AC32)
-    (at 222.825001 72.885001)
+  (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1A7AF)
+    (at 73.66 121.96 270)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD91735)
-    (fp_text reference C2 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C2 (at 1.25 -2.05 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 100nF (at 1.25 2.05 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 270) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
@@ -284,9 +284,9 @@
     (fp_line (start 2.75 0.8) (end 2.75 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 0.8) (end 2.75 0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 +5V))
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -296,7 +296,7 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1DAF4)
-    (at 106.68 66.04)
+    (at 40.64 76.2)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD3F935)
@@ -331,7 +331,7 @@
   )
 
   (module Capacitor_THT:CP_Radial_D8.0mm_P5.00mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1ACEC)
-    (at 241.38 30.48)
+    (at 53.42 48.26)
     (descr "CP, Radial series, Radial, pin pitch=5.00mm, , diameter=8mm, Electrolytic Capacitor")
     (tags "CP Radial series Radial pin pitch 5.00mm  diameter 8mm Electrolytic Capacitor")
     (path /5CD3C177)
@@ -518,14 +518,14 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1DE2A)
-    (at 99.1 76.2)
+    (at 36.83 85.13 270)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD16AB1)
-    (fp_text reference C5 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C5 (at 1.25 -2.05 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22p (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 22p (at 1.25 2.05 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
@@ -538,12 +538,12 @@
     (fp_line (start -1.05 1.05) (end 3.55 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 1.05) (end 3.55 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 270) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 5 "Net-(C5-Pad2)"))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -553,17 +553,17 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1AD0E)
-    (at 99.1 81.28)
+    (at 36.83 93.94 90)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD16B2E)
-    (fp_text reference C6 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C6 (at 1.25 -2.05 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 22p (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 22p (at 1.25 2.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
@@ -576,9 +576,9 @@
     (fp_line (start 2.75 0.8) (end 2.75 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 0.8) (end 2.75 0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 6 "Net-(C6-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -587,8 +587,8 @@
     )
   )
 
-  (module Capacitor_THT:CP_Radial_D8.0mm_P5.00mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1ADB7)
-    (at 220.98 58.42)
+  (module Capacitor_THT:CP_Radial_D8.0mm_P5.00mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1A962)
+    (at 96.52 111.76)
     (descr "CP, Radial series, Radial, pin pitch=5.00mm, , diameter=8mm, Electrolytic Capacitor")
     (tags "CP Radial series Radial pin pitch 5.00mm  diameter 8mm Electrolytic Capacitor")
     (path /5CDA1999)
@@ -775,17 +775,17 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1ADC8)
-    (at 247.745001 66.085001)
+    (at 76.2 33.02 90)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD250AE)
-    (fp_text reference C8 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C8 (at 1.25 -2.05 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 100nF (at 1.25 2.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
@@ -798,9 +798,9 @@
     (fp_line (start 2.75 0.8) (end 2.75 -0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 0.8) (end 2.75 0.8) (layer F.Fab) (width 0.1))
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 +5V))
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -810,14 +810,14 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5CD1ADD9)
-    (at 242.235001 70.875001)
+    (at 78.74 60.92 90)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (path /5CD239F2)
-    (fp_text reference C9 (at 1.25 -2.05) (layer F.SilkS)
+    (fp_text reference C9 (at 1.25 -2.05 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 1.25 2.05) (layer F.Fab)
+    (fp_text value 100nF (at 1.25 2.05 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.25 -0.8) (end -0.25 0.8) (layer F.Fab) (width 0.1))
@@ -830,12 +830,12 @@
     (fp_line (start -1.05 1.05) (end 3.55 1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 1.05) (end 3.55 -1.05) (layer F.CrtYd) (width 0.05))
     (fp_line (start 3.55 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 0.6 0.6) (thickness 0.09)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 GNDD))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 +5V))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.0mm_W1.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
@@ -844,8 +844,8 @@
     )
   )
 
-  (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AE0D)
-    (at 251.725001 58.285001)
+  (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1ACAB)
+    (at 48.26 40.64)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5CD34BBF)
@@ -885,7 +885,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1D96C)
-    (at 99.06 66.04 180)
+    (at 33.02 76.2 180)
     (descr "Through hole straight pin header, 1x06, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x06 2.54mm single row")
     (path /5CD43722)
@@ -931,7 +931,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AE3F)
-    (at 129.54 73.66 180)
+    (at 63.5 83.82 180)
     (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x04 2.54mm single row")
     (path /5CE19110)
@@ -975,7 +975,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AE55)
-    (at 81.28 88.9)
+    (at 110.49 91.44)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5CD323EC)
@@ -1015,7 +1015,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1D86D)
-    (at 200.66 55.88)
+    (at 48.26 25.4)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /5CDD6503)
@@ -1055,7 +1055,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AE82)
-    (at 210.82 45.72)
+    (at 63.5 88.9)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /5CE08F51)
@@ -1097,7 +1097,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x09_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AE9F)
-    (at 154.94 45.72 180)
+    (at 109.22 45.72 180)
     (descr "Through hole straight pin header, 1x09, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x09 2.54mm single row")
     (path /5CF21C9B)
@@ -1151,7 +1151,7 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x09_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5CD1AEBC)
-    (at 193.04 38.1 180)
+    (at 109.22 73.66 180)
     (descr "Through hole straight pin header, 1x09, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x09 2.54mm single row")
     (path /5CEE2E4F)
@@ -1205,7 +1205,7 @@
   )
 
   (module Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm (layer F.Cu) (tedit 5B391424) (tstamp 5CD1AECA)
-    (at 226.06 45.72)
+    (at 81.28 81.28)
     (descr "SMD Solder Jumper, 1x1.5mm Pads, 0.3mm gap, bridged with 1 copper strip")
     (tags "solder jumper open")
     (path /5CDBB9F4)
@@ -1236,7 +1236,7 @@
   )
 
   (module Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm (layer F.Cu) (tedit 5A3EABFC) (tstamp 5CD1AED8)
-    (at 235.57 50.8)
+    (at 114.3 104.14)
     (descr "SMD Solder Jumper, 1x1.5mm Pads, 0.3mm gap, open")
     (tags "solder jumper open")
     (path /5CDDE1BC)
@@ -1262,7 +1262,7 @@
   )
 
   (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal (layer F.Cu) (tedit 5AE5139B) (tstamp 5CD1AEEB)
-    (at 106.68 63.5)
+    (at 40.64 73.66)
     (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=5.08mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 5.08mm 0.167W length 3.6mm diameter 1.6mm")
     (path /5CD157F9)
@@ -1299,7 +1299,7 @@
   )
 
   (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal (layer F.Cu) (tedit 5AE5139B) (tstamp 5CD1AEFE)
-    (at 106.68 58.42)
+    (at 40.64 68.58)
     (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=5.08mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 5.08mm 0.167W length 3.6mm diameter 1.6mm")
     (path /5CD153B9)
@@ -1336,7 +1336,7 @@
   )
 
   (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal (layer F.Cu) (tedit 5AE5139B) (tstamp 5CD1AF11)
-    (at 106.68 60.96)
+    (at 40.64 71.12)
     (descr "Resistor, Axial_DIN0204 series, Axial, Horizontal, pin pitch=5.08mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0204 series Axial Horizontal pin pitch 5.08mm 0.167W length 3.6mm diameter 1.6mm")
     (path /5CD15825)
@@ -1373,7 +1373,7 @@
   )
 
   (module Package_DIP:DIP-28_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1AF41)
-    (at 114.3 58.42)
+    (at 48.26 68.58)
     (descr "28-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CD141F3)
@@ -1460,17 +1460,17 @@
   )
 
   (module Package_TO_SOT_THT:TO-92_Inline (layer F.Cu) (tedit 5A1DD157) (tstamp 5CD1D7B4)
-    (at 156.21 93.98 270)
+    (at 73.66 130.81 180)
     (descr "TO-92 leads in-line, narrow, oval pads, drill 0.75mm (see NXP sot054_po.pdf)")
     (tags "to-92 sc-43 sc-43a sot54 PA33 transistor")
     (path /5CD8B474)
-    (fp_text reference U2 (at 1.27 -3.56 270) (layer F.SilkS)
+    (fp_text reference U2 (at 1.27 -3.56 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value L78L33_TO92 (at 1.27 2.79 270) (layer F.Fab)
+    (fp_text value L78L33_TO92 (at 1.27 2.79 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 1.27 -3.56 270) (layer F.Fab)
+    (fp_text user %R (at 1.27 -3.56 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -0.53 1.85) (end 3.07 1.85) (layer F.SilkS) (width 0.12))
@@ -1483,11 +1483,11 @@
     (fp_arc (start 1.27 0) (end 1.27 -2.6) (angle -135) (layer F.SilkS) (width 0.12))
     (fp_arc (start 1.27 0) (end 1.27 -2.48) (angle -135) (layer F.Fab) (width 0.1))
     (fp_arc (start 1.27 0) (end 1.27 -2.6) (angle 135) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.27 0 270) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 1.27 0 180) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
       (net 1 GNDD))
-    (pad 3 thru_hole oval (at 2.54 0 270) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 2.54 0 180) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
       (net 2 +5V))
-    (pad 1 thru_hole rect (at 0 0 270) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 180) (size 1.05 1.5) (drill 0.75) (layers *.Cu *.Mask)
       (net 13 /3v3))
     (model ${KISYS3DMOD}/Package_TO_SOT_THT.3dshapes/TO-92_Inline.wrl
       (at (xyz 0 0 0))
@@ -1497,7 +1497,7 @@
   )
 
   (module Package_DIP:DIP-16_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1AF77)
-    (at 76.2 99.06 180)
+    (at 104.14 104.14 180)
     (descr "16-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CD2818F)
@@ -1559,7 +1559,7 @@
   )
 
   (module Package_DIP:DIP-16_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1AF9B)
-    (at 175.26 35.56 180)
+    (at 91.44 71.12 180)
     (descr "16-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CD17EBC)
@@ -1627,7 +1627,7 @@
   )
 
   (module Package_DIP:DIP-16_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1AFBF)
-    (at 137.16 43.18 180)
+    (at 91.44 43.18 180)
     (descr "16-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CD1CCAE)
@@ -1694,7 +1694,7 @@
   )
 
   (module Package_DIP:DIP-18_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1AFE5)
-    (at 180.34 20.32)
+    (at 96.52 55.88)
     (descr "18-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CE689B3)
@@ -1766,7 +1766,7 @@
   )
 
   (module Package_DIP:DIP-18_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5CD1B00B)
-    (at 142.24 27.94)
+    (at 96.52 27.94)
     (descr "18-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5CDD2737)
@@ -1838,7 +1838,7 @@
   )
 
   (module Crystal:Crystal_HC52-6mm_Vertical (layer F.Cu) (tedit 5A1AD3B8) (tstamp 5CD1B022)
-    (at 106.68 77.48 270)
+    (at 40.64 87.64 270)
     (descr "Crystal THT HC-52/6mm, http://www.kvg-gmbh.de/assets/uploads/files/product_pdfs/XS71xx.pdf")
     (tags "THT crystalHC-49/U")
     (path /5CD163A1)
@@ -1879,12 +1879,12 @@
   )
 
   (module footprints:W5100_V2 (layer F.Cu) (tedit 5CD1A29F) (tstamp 5CD1A383)
-    (at 160.655 87.63)
+    (at 80.01 135.255 270)
     (path /5CD7CCFC)
-    (fp_text reference J1 (at 5.835 -6.71) (layer F.SilkS)
+    (fp_text reference J1 (at 5.835 -6.71 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Conn_w5100 (at 5.835 -7.71) (layer F.Fab)
+    (fp_text value Conn_w5100 (at 5.835 -7.71 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 33 -8) (end 54 -8) (layer F.SilkS) (width 0.15))
@@ -1895,76 +1895,102 @@
     (fp_line (start 50 -14) (end 50 14) (layer F.SilkS) (width 0.15))
     (fp_line (start 0 -14) (end 50 -14) (layer F.SilkS) (width 0.15))
     (fp_line (start 0 14) (end 0 -14) (layer F.SilkS) (width 0.15))
-    (pad "" np_thru_hole circle (at 47.5 11.25) (size 3 3) (drill 2) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 47.5 -11.25) (size 3 3) (drill 2) (layers *.Cu *.Mask))
-    (pad 8 thru_hole circle (at 1.905 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad "" np_thru_hole circle (at 47.5 11.25 270) (size 3 3) (drill 2) (layers *.Cu *.Mask))
+    (pad "" np_thru_hole circle (at 47.5 -11.25 270) (size 3 3) (drill 2) (layers *.Cu *.Mask))
+    (pad 8 thru_hole circle (at 1.905 3.81 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 13 /3v3))
-    (pad 7 thru_hole circle (at 1.905 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad 7 thru_hole circle (at 1.905 1.27 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 12 MISO))
-    (pad 6 thru_hole circle (at 1.905 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad 6 thru_hole circle (at 1.905 -1.27 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 11 SS))
-    (pad 5 thru_hole circle (at 1.905 -3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-    (pad 4 thru_hole circle (at 4.445 -3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-    (pad 3 thru_hole circle (at 4.445 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad 5 thru_hole circle (at 1.905 -3.81 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+    (pad 4 thru_hole circle (at 4.445 -3.81 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+    (pad 3 thru_hole circle (at 4.445 -1.27 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 10 SCK))
-    (pad 2 thru_hole circle (at 4.445 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 4.445 1.27 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 MOSI))
-    (pad 1 thru_hole circle (at 4.445 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 4.445 3.81 270) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 1 GNDD))
   )
 
-  (segment (start 114.3 58.42) (end 111.76 58.42) (width 1) (layer B.Cu) (net 4))
-  (segment (start 111.76 58.42) (end 109.22 58.42) (width 1) (layer B.Cu) (net 4))
-  (segment (start 109.18 58.46) (end 109.18 66.04) (width 1) (layer B.Cu) (net 4))
-  (segment (start 109.22 58.42) (end 109.18 58.46) (width 1) (layer B.Cu) (net 4))
-  (segment (start 114.3 78.74) (end 111.76 78.74) (width 1) (layer B.Cu) (net 5))
-  (segment (start 110.5 77.48) (end 111.76 78.74) (width 1) (layer B.Cu) (net 5))
-  (segment (start 106.68 77.48) (end 110.5 77.48) (width 1) (layer B.Cu) (net 5))
-  (segment (start 102.88 77.48) (end 101.6 76.2) (width 1) (layer B.Cu) (net 5))
-  (segment (start 106.68 77.48) (end 102.88 77.48) (width 1) (layer B.Cu) (net 5))
-  (segment (start 114.3 81.28) (end 106.68 81.28) (width 1) (layer B.Cu) (net 6))
-  (segment (start 106.68 81.28) (end 101.6 81.28) (width 1) (layer B.Cu) (net 6))
-  (segment (start 154.94 45.72) (end 149.86 45.72) (width 1) (layer B.Cu) (net 23))
-  (segment (start 149.86 43.18) (end 154.94 43.18) (width 1) (layer B.Cu) (net 24))
-  (segment (start 154.94 40.64) (end 149.86 40.64) (width 1) (layer B.Cu) (net 25))
-  (segment (start 149.86 38.1) (end 154.94 38.1) (width 1) (layer B.Cu) (net 26))
-  (segment (start 154.94 35.56) (end 149.86 35.56) (width 1) (layer B.Cu) (net 27))
-  (segment (start 149.86 33.02) (end 154.94 33.02) (width 1) (layer B.Cu) (net 28))
-  (segment (start 154.94 30.48) (end 149.86 30.48) (width 1) (layer B.Cu) (net 29))
-  (segment (start 149.86 27.94) (end 154.94 27.94) (width 1) (layer B.Cu) (net 30))
-  (segment (start 187.96 20.32) (end 193.04 20.32) (width 1) (layer B.Cu) (net 31))
-  (segment (start 193.04 22.86) (end 187.96 22.86) (width 1) (layer B.Cu) (net 32))
-  (segment (start 187.96 25.4) (end 193.04 25.4) (width 1) (layer B.Cu) (net 33))
-  (segment (start 193.04 27.94) (end 187.96 27.94) (width 1) (layer B.Cu) (net 34))
-  (segment (start 187.96 30.48) (end 193.04 30.48) (width 1) (layer B.Cu) (net 35))
-  (segment (start 193.04 33.02) (end 187.96 33.02) (width 1) (layer B.Cu) (net 36))
-  (segment (start 187.96 35.56) (end 193.04 35.56) (width 1) (layer B.Cu) (net 37))
-  (segment (start 193.04 38.1) (end 187.96 38.1) (width 1) (layer B.Cu) (net 38))
-  (segment (start 114.3 63.5) (end 111.76 63.5) (width 1) (layer B.Cu) (net 39))
-  (segment (start 111.76 60.96) (end 114.3 60.96) (width 1) (layer B.Cu) (net 40))
-  (segment (start 180.34 35.56) (end 175.26 35.56) (width 1) (layer B.Cu) (net 46))
-  (segment (start 175.26 33.02) (end 180.34 33.02) (width 1) (layer B.Cu) (net 48))
-  (segment (start 180.34 30.48) (end 175.26 30.48) (width 1) (layer B.Cu) (net 49))
-  (segment (start 175.26 27.94) (end 180.34 27.94) (width 1) (layer B.Cu) (net 50))
-  (segment (start 180.34 25.4) (end 175.26 25.4) (width 1) (layer B.Cu) (net 51))
-  (segment (start 175.26 22.86) (end 180.34 22.86) (width 1) (layer B.Cu) (net 52))
-  (segment (start 175.26 20.32) (end 180.34 20.32) (width 1) (layer B.Cu) (net 53))
-  (segment (start 180.34 38.1) (end 172.72 38.1) (width 1) (layer B.Cu) (net 54))
-  (segment (start 170.18 33.02) (end 167.64 33.02) (width 1) (layer B.Cu) (net 54))
-  (segment (start 171.45 36.83) (end 171.45 34.29) (width 1) (layer B.Cu) (net 54))
-  (segment (start 172.72 38.1) (end 171.45 36.83) (width 1) (layer B.Cu) (net 54))
-  (segment (start 171.45 34.29) (end 170.18 33.02) (width 1) (layer B.Cu) (net 54))
-  (segment (start 142.24 45.72) (end 134.62 45.72) (width 1) (layer B.Cu) (net 55))
-  (segment (start 134.62 45.72) (end 133.35 44.45) (width 1) (layer B.Cu) (net 55))
-  (segment (start 133.35 44.45) (end 133.35 41.91) (width 1) (layer B.Cu) (net 55))
-  (segment (start 133.35 41.91) (end 132.08 40.64) (width 1) (layer B.Cu) (net 55))
-  (segment (start 132.08 40.64) (end 129.54 40.64) (width 1) (layer B.Cu) (net 55))
-  (segment (start 137.16 27.94) (end 142.24 27.94) (width 1) (layer B.Cu) (net 56))
-  (segment (start 142.24 30.48) (end 137.16 30.48) (width 1) (layer B.Cu) (net 57))
-  (segment (start 137.16 33.02) (end 142.24 33.02) (width 1) (layer B.Cu) (net 58))
-  (segment (start 142.24 35.56) (end 137.16 35.56) (width 1) (layer B.Cu) (net 59))
-  (segment (start 137.16 38.1) (end 142.24 38.1) (width 1) (layer B.Cu) (net 60))
-  (segment (start 142.24 40.64) (end 137.16 40.64) (width 1) (layer B.Cu) (net 61))
-  (segment (start 137.16 43.18) (end 142.24 43.18) (width 1) (layer B.Cu) (net 62))
+  (segment (start 45.76 86.36) (end 45.72 86.32) (width 1) (layer B.Cu) (net 1))
+  (segment (start 48.26 86.36) (end 45.76 86.36) (width 1) (layer B.Cu) (net 1))
+  (segment (start 36.83 85.13) (end 38.1 83.86) (width 1) (layer B.Cu) (net 1))
+  (segment (start 42.12863 83.86) (end 38.1 83.86) (width 1) (layer B.Cu) (net 1))
+  (segment (start 44.58863 86.32) (end 42.12863 83.86) (width 1) (layer B.Cu) (net 1))
+  (segment (start 45.72 86.32) (end 44.58863 86.32) (width 1) (layer B.Cu) (net 1))
+  (segment (start 35.69863 93.94) (end 34.29 92.53137) (width 1) (layer B.Cu) (net 1))
+  (segment (start 36.83 93.94) (end 35.69863 93.94) (width 1) (layer B.Cu) (net 1))
+  (segment (start 35.69863 85.13) (end 36.83 85.13) (width 1) (layer B.Cu) (net 1))
+  (segment (start 34.29 86.53863) (end 35.69863 85.13) (width 1) (layer B.Cu) (net 1))
+  (segment (start 34.29 92.53137) (end 34.29 86.53863) (width 1) (layer B.Cu) (net 1))
+  (segment (start 83.82 43.18) (end 83.82 48.26) (width 1) (layer B.Cu) (net 2))
+  (segment (start 83.82 48.26) (end 86.36 50.8) (width 1) (layer B.Cu) (net 2))
+  (segment (start 84.95137 55.88) (end 83.82 55.88) (width 1) (layer B.Cu) (net 2))
+  (segment (start 86.36 54.47137) (end 84.95137 55.88) (width 1) (layer B.Cu) (net 2))
+  (segment (start 86.36 50.8) (end 86.36 54.47137) (width 1) (layer B.Cu) (net 2))
+  (segment (start 48.26 83.82) (end 45.72 83.82) (width 1) (layer B.Cu) (net 2))
+  (segment (start 48.26 68.58) (end 45.72 68.58) (width 1) (layer B.Cu) (net 4))
+  (segment (start 45.72 68.58) (end 43.18 68.58) (width 1) (layer B.Cu) (net 4))
+  (segment (start 43.14 68.62) (end 43.14 76.2) (width 1) (layer B.Cu) (net 4))
+  (segment (start 43.18 68.58) (end 43.14 68.62) (width 1) (layer B.Cu) (net 4))
+  (segment (start 40.64 87.64) (end 41.92 87.64) (width 1) (layer B.Cu) (net 5))
+  (segment (start 43.18 88.9) (end 48.26 88.9) (width 1) (layer B.Cu) (net 5))
+  (segment (start 41.92 87.64) (end 43.18 88.9) (width 1) (layer B.Cu) (net 5))
+  (segment (start 40.63 87.63) (end 40.64 87.64) (width 1) (layer B.Cu) (net 5))
+  (segment (start 36.83 87.63) (end 40.63 87.63) (width 1) (layer B.Cu) (net 5))
+  (segment (start 48.26 91.44) (end 40.64 91.44) (width 1) (layer B.Cu) (net 6))
+  (segment (start 40.64 91.44) (end 36.83 91.44) (width 1) (layer B.Cu) (net 6))
+  (segment (start 110.49 93.98) (end 110.49 97.79) (width 1) (layer B.Cu) (net 19))
+  (segment (start 109.22 99.06) (end 104.14 99.06) (width 1) (layer B.Cu) (net 19))
+  (segment (start 110.49 97.79) (end 109.22 99.06) (width 1) (layer B.Cu) (net 19))
+  (segment (start 110.49 91.44) (end 104.14 91.44) (width 1) (layer B.Cu) (net 20))
+  (segment (start 109.22 45.72) (end 104.14 45.72) (width 1) (layer B.Cu) (net 23))
+  (segment (start 104.14 43.18) (end 109.22 43.18) (width 1) (layer B.Cu) (net 24))
+  (segment (start 109.22 40.64) (end 104.14 40.64) (width 1) (layer B.Cu) (net 25))
+  (segment (start 104.14 38.1) (end 109.22 38.1) (width 1) (layer B.Cu) (net 26))
+  (segment (start 109.22 35.56) (end 104.14 35.56) (width 1) (layer B.Cu) (net 27))
+  (segment (start 104.14 33.02) (end 109.22 33.02) (width 1) (layer B.Cu) (net 28))
+  (segment (start 109.22 30.48) (end 104.14 30.48) (width 1) (layer B.Cu) (net 29))
+  (segment (start 104.14 27.94) (end 109.22 27.94) (width 1) (layer B.Cu) (net 30))
+  (segment (start 104.14 55.88) (end 109.22 55.88) (width 1) (layer B.Cu) (net 31))
+  (segment (start 109.22 58.42) (end 104.14 58.42) (width 1) (layer B.Cu) (net 32))
+  (segment (start 104.14 60.96) (end 109.22 60.96) (width 1) (layer B.Cu) (net 33))
+  (segment (start 109.22 63.5) (end 104.14 63.5) (width 1) (layer B.Cu) (net 34))
+  (segment (start 104.14 66.04) (end 109.22 66.04) (width 1) (layer B.Cu) (net 35))
+  (segment (start 109.22 68.58) (end 104.14 68.58) (width 1) (layer B.Cu) (net 36))
+  (segment (start 104.14 71.12) (end 109.22 71.12) (width 1) (layer B.Cu) (net 37))
+  (segment (start 109.22 73.66) (end 104.14 73.66) (width 1) (layer B.Cu) (net 38))
+  (segment (start 48.26 73.66) (end 45.72 73.66) (width 1) (layer B.Cu) (net 39))
+  (segment (start 45.72 71.12) (end 48.26 71.12) (width 1) (layer B.Cu) (net 40))
+  (segment (start 96.52 71.12) (end 91.44 71.12) (width 1) (layer B.Cu) (net 46))
+  (segment (start 81.28 53.34) (end 83.82 53.34) (width 1) (layer B.Cu) (net 47))
+  (segment (start 83.82 38.1) (end 81.28 38.1) (width 1) (layer B.Cu) (net 47))
+  (segment (start 78.74 50.8) (end 81.28 53.34) (width 1) (layer B.Cu) (net 47))
+  (segment (start 81.28 38.1) (end 78.74 40.64) (width 1) (layer B.Cu) (net 47))
+  (segment (start 78.74 40.64) (end 78.74 50.8) (width 1) (layer B.Cu) (net 47))
+  (segment (start 91.44 68.58) (end 96.52 68.58) (width 1) (layer B.Cu) (net 48))
+  (segment (start 96.52 66.04) (end 91.44 66.04) (width 1) (layer B.Cu) (net 49))
+  (segment (start 91.44 63.5) (end 96.52 63.5) (width 1) (layer B.Cu) (net 50))
+  (segment (start 96.52 60.96) (end 91.44 60.96) (width 1) (layer B.Cu) (net 51))
+  (segment (start 91.44 58.42) (end 96.52 58.42) (width 1) (layer B.Cu) (net 52))
+  (segment (start 91.44 55.88) (end 96.52 55.88) (width 1) (layer B.Cu) (net 53))
+  (segment (start 96.52 73.66) (end 88.9 73.66) (width 1) (layer B.Cu) (net 54))
+  (segment (start 86.36 68.58) (end 83.82 68.58) (width 1) (layer B.Cu) (net 54))
+  (segment (start 87.63 72.39) (end 87.63 69.85) (width 1) (layer B.Cu) (net 54))
+  (segment (start 88.9 73.66) (end 87.63 72.39) (width 1) (layer B.Cu) (net 54))
+  (segment (start 87.63 69.85) (end 86.36 68.58) (width 1) (layer B.Cu) (net 54))
+  (segment (start 96.52 45.72) (end 88.9 45.72) (width 1) (layer B.Cu) (net 55))
+  (segment (start 88.9 45.72) (end 87.63 44.45) (width 1) (layer B.Cu) (net 55))
+  (segment (start 87.63 44.45) (end 87.63 41.91) (width 1) (layer B.Cu) (net 55))
+  (segment (start 87.63 41.91) (end 86.36 40.64) (width 1) (layer B.Cu) (net 55))
+  (segment (start 86.36 40.64) (end 83.82 40.64) (width 1) (layer B.Cu) (net 55))
+  (segment (start 91.44 27.94) (end 96.52 27.94) (width 1) (layer B.Cu) (net 56))
+  (segment (start 96.52 30.48) (end 91.44 30.48) (width 1) (layer B.Cu) (net 57))
+  (segment (start 91.44 33.02) (end 96.52 33.02) (width 1) (layer B.Cu) (net 58))
+  (segment (start 96.52 35.56) (end 91.44 35.56) (width 1) (layer B.Cu) (net 59))
+  (segment (start 91.44 38.1) (end 96.52 38.1) (width 1) (layer B.Cu) (net 60))
+  (segment (start 96.52 40.64) (end 91.44 40.64) (width 1) (layer B.Cu) (net 61))
+  (segment (start 91.44 43.18) (end 96.52 43.18) (width 1) (layer B.Cu) (net 62))
 
 )
diff --git a/schematic/controller/controller.sch b/schematic/controller/controller.sch
index e5f4201..d52248a 100644
--- a/schematic/controller/controller.sch
+++ b/schematic/controller/controller.sch
@@ -84,13 +84,11 @@ Wire Wire Line
 	1250 1800 1350 1800
 Wire Wire Line
 	1950 4650 1950 4500
-Wire Wire Line
-	2550 1800 3050 1800
-Text GLabel 3050 1800 2    50   Input ~ 0
+Text GLabel 2750 3000 2    50   Input ~ 0
 ENCODER_BUTTON
-Text GLabel 2750 2800 2    50   Input ~ 0
-ENCODER_A
 Text GLabel 2750 2900 2    50   Input ~ 0
+ENCODER_A
+Text GLabel 2750 2800 2    50   Input ~ 0
 ENCODER_B
 Text GLabel 3250 3900 2    50   Input ~ 0
 SRLATCH
@@ -980,10 +978,6 @@ Text GLabel 2650 2700 2    50   Input ~ 0
 SERVO_SLIDER
 Wire Wire Line
 	2650 2700 2550 2700
-Wire Wire Line
-	2750 2800 2550 2800
-Wire Wire Line
-	2750 2900 2550 2900
 Wire Wire Line
 	3100 4000 2550 4000
 Wire Wire Line
@@ -1282,4 +1276,10 @@ Wire Wire Line
 	6450 3000 6450 4400
 Wire Wire Line
 	6450 4400 6300 4400
+Wire Wire Line
+	2750 3000 2550 3000
+Wire Wire Line
+	2750 2900 2550 2900
+Wire Wire Line
+	2550 2800 2750 2800
 $EndSCHEMATC
diff --git a/schematic/footprints/NEC-EB2-12NU.kicad_mod b/schematic/footprints/NEC-EB2-12NU.kicad_mod
new file mode 100644
index 0000000..d999c28
--- /dev/null
+++ b/schematic/footprints/NEC-EB2-12NU.kicad_mod
@@ -0,0 +1,28 @@
+(module NEC-EB2-12NU (layer F.Cu) (tedit 5CD1A950)
+  (fp_text reference REF** (at 10.16 0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value NEC-EB2-12NU (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -4 -2.54) (end -4 2.54) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.08 2.54) (end -5.08 -2.54) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.08 2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.08 -2.54) (end 5.08 2.54) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.08 -2.54) (end 5.08 -2.54) (layer F.SilkS) (width 0.15))
+  (fp_line (start -6 -4.65) (end -6 4.65) (layer F.Fab) (width 0.15))
+  (fp_line (start -7.15 4.65) (end -7.15 -4.65) (layer F.Fab) (width 0.15))
+  (fp_line (start 7.15 4.65) (end -7.15 4.65) (layer F.Fab) (width 0.15))
+  (fp_line (start 7.15 -4.65) (end 7.15 4.65) (layer F.Fab) (width 0.15))
+  (fp_line (start -7.15 -4.65) (end 7.15 -4.65) (layer F.Fab) (width 0.15))
+  (pad 10 smd rect (at -5.08 4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 9 smd rect (at -2.54 4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 8 smd rect (at 0 4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 7 smd rect (at 2.54 4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 6 smd rect (at 5.08 4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 5 smd rect (at 5.08 -4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 2.54 -4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0 -4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at -2.54 -4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -5.08 -4.78) (size 1 2.94) (layers F.Cu F.Paste F.Mask))
+)