diff --git a/stepcraft_controller-cache.lib b/stepcraft_controller-cache.lib
deleted file mode 100644
index 9cc5ce6..0000000
--- a/stepcraft_controller-cache.lib
+++ /dev/null
@@ -1,549 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# +5V
-#
-DEF +5V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5VP
-#
-DEF +5VP #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5VP" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5VP 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# ADuM1201AR
-#
-DEF ADuM1201AR U 0 40 Y Y 1 F N
-F0 "U" -350 400 50 H V L CNN
-F1 "ADuM1201AR" 0 400 50 H V L CNN
-F2 "Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ADuM1201BR ADuM1201CR ADuM1201WS ADuM1201WT ADuM1201WU
-$FPLIST
- SO*
-$ENDFPLIST
-DRAW
-S -350 350 350 -350 0 1 10 f
-X VDD1 1 -450 250 100 R 50 50 1 1 W
-X VOA 2 -450 100 100 R 50 50 1 1 O
-X VIB 3 -450 -100 100 R 50 50 1 1 I
-X GND1 4 -450 -250 100 R 50 50 1 1 W
-X GND2 5 450 -250 100 L 50 50 1 1 W
-X VOB 6 450 -100 100 L 50 50 1 1 O
-X VIA 7 450 100 100 L 50 50 1 1 I
-X VDD2 8 450 250 100 L 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# ATMEGA168A-AU
-#
-DEF ATMEGA168A-AU U 0 40 Y Y 1 F N
-F0 "U" -750 1250 50 H V L BNN
-F1 "ATMEGA168A-AU" 400 -1400 50 H V L BNN
-F2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATMEGA48A-AU ATMEGA48PA-AU ATMEGA88A-AU ATMEGA88PA-AU ATMEGA168PA-AU ATMEGA328-AU ATMEGA328P-AU
-$FPLIST
- TQFP*7x7mm*Pitch0.8mm*
-$ENDFPLIST
-DRAW
-S -750 1200 850 -1300 0 1 10 f
-X (PCINT19/OC2B/INT1)PD3 1 1000 -800 150 L 40 40 1 1 B
-X (PCINT20/XCK/T0)PD4 2 1000 -900 150 L 40 40 1 1 B
-X GND 3 -900 -1200 150 R 40 40 1 1 W
-X VCC 4 -900 1100 150 R 40 40 1 1 W
-X GND 5 -900 -1100 150 R 40 40 1 1 W
-X VCC 6 -900 1000 150 R 40 40 1 1 W
-X (PCINT6/XTAL1/TOSC1)PB6 7 1000 500 150 L 40 40 1 1 B
-X (PCINT7/XTAL2/TOSC2)PB7 8 1000 400 150 L 40 40 1 1 B
-X (PCINT21/OC0B/T1)PD5 9 1000 -1000 150 L 40 40 1 1 B
-X (PCINT22/OC0A/AIN0)PD6 10 1000 -1100 150 L 40 40 1 1 B
-X AREF 20 -900 500 150 R 40 40 1 1 B
-X (PCINT16/RXD)PD0 30 1000 -500 150 L 40 40 1 1 B
-X (PCINT23/AIN1)PD7 11 1000 -1200 150 L 40 40 1 1 B
-X GND 21 -900 -1000 150 R 40 40 1 1 W
-X (PCINT17/TXD)PD1 31 1000 -600 150 L 40 40 1 1 B
-X (PCINT0/CLKO/ICP1)PB0 12 1000 1100 150 L 40 40 1 1 B
-X ADC7 22 -900 -350 150 R 40 40 1 1 I
-X (PCINT18/INT0)PD2 32 1000 -700 150 L 40 40 1 1 B
-X (PCINT1/OC1A)PB1 13 1000 1000 150 L 40 40 1 1 B
-X (PCINT8/ADC0)PC0 23 1000 250 150 L 40 40 1 1 B
-X (PCINT2/OC1B/~SS~)PB2 14 1000 900 150 L 40 40 1 1 B
-X (PCINT9/ADC1)PC1 24 1000 150 150 L 40 40 1 1 B
-X (PCINT3/OC2A/MOSI)PB3 15 1000 800 150 L 40 40 1 1 B
-X (PCINT10/ADC2)PC2 25 1000 50 150 L 40 40 1 1 B
-X (PCINT4/MISO)PB4 16 1000 700 150 L 40 40 1 1 B
-X (PCINT11/ADC3)PC3 26 1000 -50 150 L 40 40 1 1 B
-X (PCINT5/SCK)PB5 17 1000 600 150 L 40 40 1 1 B
-X (PCINT12/SDA/ADC4)PC4 27 1000 -150 150 L 40 40 1 1 B
-X AVCC 18 -900 800 150 R 40 40 1 1 W
-X (PCINT13/SCL/ADC5)PC5 28 1000 -250 150 L 40 40 1 1 B
-X ADC6 19 -900 -250 150 R 40 40 1 1 I
-X (PCINT14/~RESET~)PC6 29 1000 -350 150 L 40 40 1 1 B
-ENDDRAW
-ENDDEF
-#
-# Audio-Jack-3
-#
-DEF Audio-Jack-3 J 0 40 Y Y 1 F N
-F0 "J" -50 175 50 H V C CNN
-F1 "Audio-Jack-3" 100 -70 50 H V C CNN
-F2 "" 250 100 50 H I C CNN
-F3 "" 250 100 50 H I C CNN
-DRAW
-T 0 -25 50 30 0 0 0 1 Normal 0 C C
-T 0 -100 50 30 0 0 0 2 Normal 0 C C
-S -185 125 100 -25 0 1 10 f
-S -175 0 -205 100 0 1 0 F
-P 4 0 1 10 -50 0 -25 25 0 0 100 0 N
-P 4 0 1 10 100 100 -75 100 -100 75 -125 100 N
-X ~ 1 200 0 100 L 50 50 1 1 P
-X ~ 2 200 100 100 L 50 50 1 1 P
-X ~ 3 -200 -100 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C
-#
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 110 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X02
-#
-DEF CONN_01X02 J 0 40 Y N 1 F N
-F0 "J" 0 150 50 H V C CNN
-F1 "CONN_01X02" 100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Pin_Header_Straight_1X*
- Pin_Header_Angled_1X*
- Socket_Strip_Straight_1X*
- Socket_Strip_Angled_1X*
-$ENDFPLIST
-DRAW
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 100 50 -100 0 1 0 N
-X P1 1 -200 50 150 R 50 50 1 1 P
-X P2 2 -200 -50 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X03
-#
-DEF CONN_01X03 J 0 40 Y N 1 F N
-F0 "J" 0 200 50 H V C CNN
-F1 "CONN_01X03" 100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Pin_Header_Straight_1X*
- Pin_Header_Angled_1X*
- Socket_Strip_Straight_1X*
- Socket_Strip_Angled_1X*
-$ENDFPLIST
-DRAW
-S -50 -95 10 -105 0 1 0 N
-S -50 5 10 -5 0 1 0 N
-S -50 105 10 95 0 1 0 N
-S -50 150 50 -150 0 1 0 N
-X P1 1 -200 100 150 R 50 50 1 1 P
-X P2 2 -200 0 150 R 50 50 1 1 P
-X P3 3 -200 -100 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_02X03
-#
-DEF CONN_02X03 J 0 1 Y N 1 F N
-F0 "J" 0 200 50 H V C CNN
-F1 "CONN_02X03" 0 -200 50 H V C CNN
-F2 "" 0 -1200 50 H I C CNN
-F3 "" 0 -1200 50 H I C CNN
-$FPLIST
- Pin_Header_Straight_2X*
- Pin_Header_Angled_2X*
- Socket_Strip_Straight_2X*
- Socket_Strip_Angled_2X*
- IDC_Header_Straight_*
-$ENDFPLIST
-DRAW
-S -100 -95 -50 -105 0 1 0 N
-S -100 5 -50 -5 0 1 0 N
-S -100 105 -50 95 0 1 0 N
-S -100 150 100 -150 0 1 0 N
-S 50 -95 100 -105 0 1 0 N
-S 50 5 100 -5 0 1 0 N
-S 50 105 100 95 0 1 0 N
-X P1 1 -250 100 150 R 50 50 1 1 P
-X P2 2 250 100 150 L 50 50 1 1 P
-X P3 3 -250 0 150 R 50 50 1 1 P
-X P4 4 250 0 150 L 50 50 1 1 P
-X P5 5 -250 -100 150 R 50 50 1 1 P
-X P6 6 250 -100 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP2102N-A01-GQFN24
-#
-DEF CP2102N-A01-GQFN24 U 0 40 Y Y 1 F N
-F0 "U" -200 875 50 H V R CNN
-F1 "CP2102N-A01-GQFN24" -200 800 50 H V R CNN
-F2 "Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm" 450 -800 50 H I L CNN
-F3 "" 50 -1050 50 H I C CNN
-$FPLIST
- QFN*4x4mm*Pitch0.5mm*
-$ENDFPLIST
-DRAW
-S -450 750 450 -750 0 1 10 f
-X RI/CLK 1 600 600 150 L 50 50 1 1 B
-X GND 2 100 -900 150 U 50 50 1 1 W
-X D+ 3 -600 -400 150 R 50 50 1 1 B
-X D- 4 -600 -500 150 R 50 50 1 1 B
-X VIO 5 0 900 150 D 50 50 1 1 W
-X VDD 6 -100 900 150 D 50 50 1 1 W
-X REGIN 7 -600 0 150 R 50 50 1 1 W
-X VBUS 8 -600 -300 150 R 50 50 1 1 I
-X ~RSTb 9 -600 600 150 R 50 50 1 1 I
-X NC 10 400 -900 150 U 50 50 1 1 N N
-X RXD 20 600 300 150 L 50 50 1 1 I
-X GPIO.3 11 600 -300 150 L 50 50 1 1 B
-X TXD 21 600 200 150 L 50 50 1 1 O
-X GPIO.2 12 600 -400 150 L 50 50 1 1 B
-X DSR 22 600 100 150 L 50 50 1 1 I
-X GPIO.1 13 600 -500 150 L 50 50 1 1 B
-X DTR 23 600 0 150 L 50 50 1 1 O
-X GPIO.0 14 600 -600 150 L 50 50 1 1 B
-X DCD 24 600 -100 150 L 50 50 1 1 I
-X ~SUSPENDb 15 -600 200 150 R 50 50 1 1 O
-X GND 25 0 -900 150 U 50 50 1 1 W
-X NC 16 300 -900 150 U 50 50 1 1 N N
-X SUSPEND 17 -600 300 150 R 50 50 1 1 O
-X CTS 18 600 500 150 L 50 50 1 1 I
-X RTS 19 600 400 150 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# Crystal
-#
-DEF Crystal Y 0 40 N N 1 F N
-F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Crystal*
-$ENDFPLIST
-DRAW
-S -45 100 45 -100 0 1 12 N
-P 2 0 1 0 -100 0 -75 0 N
-P 2 0 1 20 -75 -50 -75 50 N
-P 2 0 1 20 75 -50 75 50 N
-P 2 0 1 0 100 0 75 0 N
-X 1 1 -150 0 50 R 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky
-#
-DEF D_Schottky D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_TVS
-#
-DEF D_TVS D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_TVS" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 8 -100 -50 0 0 -100 50 -100 -50 N
-P 4 0 1 8 20 50 0 50 0 -50 -20 -50 N
-P 4 0 1 8 100 50 100 -50 0 0 100 50 N
-X A1 1 -150 0 100 R 50 50 1 1 P
-X A2 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GNDD
-#
-DEF GNDD #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDD" 0 -125 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-S -50 -60 50 -80 0 1 10 F
-P 2 0 1 0 0 0 0 -60 N
-X GNDD 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# Jumper
-#
-DEF Jumper JP 0 30 Y N 1 F N
-F0 "JP" 0 150 50 H V C CNN
-F1 "Jumper" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
-C -100 0 35 0 1 0 N
-C 100 0 35 0 1 0 N
-X 1 1 -300 0 165 R 50 50 0 1 P
-X 2 2 300 0 165 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NO_Small
-#
-DEF Jumper_NO_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NO_Small" 10 -60 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Polyfuse
-#
-DEF Polyfuse F 0 0 N Y 1 F N
-F0 "F" -100 0 50 V V C CNN
-F1 "Polyfuse" 100 0 50 V V C CNN
-F2 "" 50 -200 50 H I L CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- *polyfuse*
- *PTC*
-$ENDFPLIST
-DRAW
-S -30 100 30 -100 0 1 10 N
-P 2 0 1 0 0 100 0 -100 N
-P 4 0 1 0 -60 100 -60 60 60 -60 60 -100 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
- R_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SW_PUSH_SHIELD
-#
-DEF SW_PUSH_SHIELD SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH_SHIELD" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -170 50 170 60 0 1 0 N
-P 2 0 1 0 175 75 150 75 N
-P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
-P 6 0 1 0 175 75 200 75 200 -75 -200 -75 -200 75 -150 75 N
-X 1 1 -300 0 200 R 50 50 0 1 P I
-X 2 2 300 0 200 L 50 50 0 1 P I
-X SH SH 0 -200 125 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Stepcraft_X1
-#
-DEF Stepcraft_X1 J 0 1 Y N 1 F N
-F0 "J" 0 700 50 H V C CNN
-F1 "Stepcraft_X1" 0 0 50 V V C CNN
-F2 "" 0 -1150 50 H I C CNN
-F3 "" 0 -1150 50 H I C CNN
-$FPLIST
- Pin_Header_Straight_2X*
- Pin_Header_Angled_2X*
- Socket_Strip_Straight_2X*
- Socket_Strip_Angled_2X*
- IDC_Header_Straight_*
-$ENDFPLIST
-DRAW
-S -100 -595 -50 -605 0 1 0 N
-S -100 -495 -50 -505 0 1 0 N
-S -100 -395 -50 -405 0 1 0 N
-S -100 -295 -50 -305 0 1 0 N
-S -100 -195 -50 -205 0 1 0 N
-S -100 -95 -50 -105 0 1 0 N
-S -100 5 -50 -5 0 1 0 N
-S -100 105 -50 95 0 1 0 N
-S -100 205 -50 195 0 1 0 N
-S -100 305 -50 295 0 1 0 N
-S -100 405 -50 395 0 1 0 N
-S -100 505 -50 495 0 1 0 N
-S -100 605 -50 595 0 1 0 N
-S -100 650 100 -650 0 1 0 f
-S 50 -595 100 -605 0 1 0 N
-S 50 -495 100 -505 0 1 0 N
-S 50 -395 100 -405 0 1 0 N
-S 50 -295 100 -305 0 1 0 N
-S 50 -195 100 -205 0 1 0 N
-S 50 -95 100 -105 0 1 0 N
-S 50 5 100 -5 0 1 0 N
-S 50 105 100 95 0 1 0 N
-S 50 205 100 195 0 1 0 N
-S 50 305 100 295 0 1 0 N
-S 50 405 100 395 0 1 0 N
-S 50 505 100 495 0 1 0 N
-S 50 605 100 595 0 1 0 N
-X P1 1 -250 600 150 R 50 50 1 1 P
-X P2 2 -250 500 150 R 50 50 1 1 P
-X P3 3 -250 400 150 R 50 50 1 1 P
-X P4 4 -250 300 150 R 50 50 1 1 P
-X P5 5 -250 200 150 R 50 50 1 1 P
-X P6 6 -250 100 150 R 50 50 1 1 P
-X P7 7 -250 0 150 R 50 50 1 1 P
-X P8 8 -250 -100 150 R 50 50 1 1 P
-X P9 9 -250 -200 150 R 50 50 1 1 P
-X P10 10 -250 -300 150 R 50 50 1 1 P
-X P20 20 250 0 150 L 50 50 1 1 P
-X P11 11 -250 -400 150 R 50 50 1 1 P
-X P21 21 250 -100 150 L 50 50 1 1 P
-X P12 12 -250 -500 150 R 50 50 1 1 P
-X P22 22 250 -200 150 L 50 50 1 1 P
-X P13 13 -250 -600 150 R 50 50 1 1 P
-X P23 23 250 -300 150 L 50 50 1 1 P
-X P2 14 250 600 150 L 50 50 1 1 P
-X P24 24 250 -400 150 L 50 50 1 1 P
-X P15 15 250 500 150 L 50 50 1 1 P
-X P25 25 250 -500 150 L 50 50 1 1 P
-X P16 16 250 400 150 L 50 50 1 1 P
-X P26 26 250 -600 150 L 50 50 1 1 P
-X P17 17 250 300 150 L 50 50 1 1 P
-X P18 18 250 200 150 L 50 50 1 1 P
-X P19 19 250 100 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# USB_OTG
-#
-DEF USB_OTG J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
-F1 "USB_OTG" -200 350 50 H V L CNN
-F2 "" 150 -50 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
-$FPLIST
- USB*
-$ENDFPLIST
-DRAW
-C -150 85 25 0 1 10 F
-C -25 135 15 0 1 10 F
-S -200 -300 200 300 0 1 10 f
-S -5 -300 5 -270 0 1 0 N
-S 10 50 -20 20 0 1 10 F
-S 200 -205 170 -195 0 1 0 N
-S 200 -105 170 -95 0 1 0 N
-S 200 -5 170 5 0 1 0 N
-S 200 195 170 205 0 1 0 N
-P 2 0 1 10 -75 85 25 85 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
-P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
-P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
-X VBUS 1 300 200 100 L 50 50 1 1 W
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
-X ID 4 300 -200 100 L 50 50 1 1 P
-X GND 5 0 -400 100 U 50 50 1 1 W
-X Shield 6 -100 -400 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/stepcraft_controller.pro b/stepcraft_controller.pro
index 10e65c6..bd35da3 100644
--- a/stepcraft_controller.pro
+++ b/stepcraft_controller.pro
@@ -1,29 +1,10 @@
-update=20-9-2017 19:54:03
+update=11/16/22 15:59:22
 version=1
 last_client=kicad
 [general]
 version=1
 RootSch=
 BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
@@ -39,37 +20,238 @@ LabSize=60
 ERC_TestSimilarLabels=1
 [eeschema]
 version=1
-LibDir=../iotta-kicad-libs
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=iotta_wsn_rev2
-LibName31=smisioto.no-ip.org/w_connectors
-LibName32=C:/Program Files/KiCad/share/kicad/library/silabs
+LibDir=
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=
+CopperLayerCount=2
+BoardThickness=1.6
+AllowMicroVias=0
+AllowBlindVias=0
+RequireCourtyardDefinitions=0
+ProhibitOverlappingCourtyards=1
+MinTrackWidth=0.2
+MinViaDiameter=0.5
+MinViaDrill=0.3
+MinMicroViaDiameter=0.2
+MinMicroViaDrill=0.09999999999999999
+MinHoleToHole=0.25
+TrackWidth1=0.25
+TrackWidth2=0.25
+TrackWidth3=0.4
+TrackWidth4=0.6
+TrackWidth5=0.8
+TrackWidth6=1
+TrackWidth7=1.2
+TrackWidth8=2
+TrackWidth9=4
+ViaDiameter1=0.8
+ViaDrill1=0.4
+ViaDiameter2=0.6
+ViaDrill2=0.3
+dPairWidth1=0.2
+dPairGap1=0.25
+dPairViaGap1=0.25
+SilkLineWidth=0.15
+SilkTextSizeV=1
+SilkTextSizeH=1
+SilkTextSizeThickness=0.15
+SilkTextItalic=0
+SilkTextUpright=1
+CopperLineWidth=0.2
+CopperTextSizeV=1.5
+CopperTextSizeH=1.5
+CopperTextThickness=0.3
+CopperTextItalic=0
+CopperTextUpright=1
+EdgeCutLineWidth=0.15
+CourtyardLineWidth=0.05
+OthersLineWidth=0.15
+OthersTextSizeV=1
+OthersTextSizeH=1
+OthersTextSizeThickness=0.15
+OthersTextItalic=0
+OthersTextUpright=1
+SolderMaskClearance=0.2
+SolderMaskMinWidth=0
+SolderPasteClearance=0
+SolderPasteRatio=-0
+[pcbnew/Layer.F.Cu]
+Name=F.Cu
+Type=0
+Enabled=1
+[pcbnew/Layer.In1.Cu]
+Name=In1.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In2.Cu]
+Name=In2.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In3.Cu]
+Name=In3.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In4.Cu]
+Name=In4.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In5.Cu]
+Name=In5.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In6.Cu]
+Name=In6.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In7.Cu]
+Name=In7.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In8.Cu]
+Name=In8.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In9.Cu]
+Name=In9.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In10.Cu]
+Name=In10.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In11.Cu]
+Name=In11.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In12.Cu]
+Name=In12.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In13.Cu]
+Name=In13.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In14.Cu]
+Name=In14.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In15.Cu]
+Name=In15.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In16.Cu]
+Name=In16.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In17.Cu]
+Name=In17.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In18.Cu]
+Name=In18.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In19.Cu]
+Name=In19.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In20.Cu]
+Name=In20.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In21.Cu]
+Name=In21.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In22.Cu]
+Name=In22.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In23.Cu]
+Name=In23.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In24.Cu]
+Name=In24.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In25.Cu]
+Name=In25.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In26.Cu]
+Name=In26.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In27.Cu]
+Name=In27.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In28.Cu]
+Name=In28.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In29.Cu]
+Name=In29.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.In30.Cu]
+Name=In30.Cu
+Type=0
+Enabled=0
+[pcbnew/Layer.B.Cu]
+Name=B.Cu
+Type=0
+Enabled=1
+[pcbnew/Layer.B.Adhes]
+Enabled=1
+[pcbnew/Layer.F.Adhes]
+Enabled=1
+[pcbnew/Layer.B.Paste]
+Enabled=1
+[pcbnew/Layer.F.Paste]
+Enabled=1
+[pcbnew/Layer.B.SilkS]
+Enabled=1
+[pcbnew/Layer.F.SilkS]
+Enabled=1
+[pcbnew/Layer.B.Mask]
+Enabled=1
+[pcbnew/Layer.F.Mask]
+Enabled=1
+[pcbnew/Layer.Dwgs.User]
+Enabled=1
+[pcbnew/Layer.Cmts.User]
+Enabled=1
+[pcbnew/Layer.Eco1.User]
+Enabled=1
+[pcbnew/Layer.Eco2.User]
+Enabled=1
+[pcbnew/Layer.Edge.Cuts]
+Enabled=1
+[pcbnew/Layer.Margin]
+Enabled=1
+[pcbnew/Layer.B.CrtYd]
+Enabled=1
+[pcbnew/Layer.F.CrtYd]
+Enabled=1
+[pcbnew/Layer.B.Fab]
+Enabled=1
+[pcbnew/Layer.F.Fab]
+Enabled=1
+[pcbnew/Layer.Rescue]
+Enabled=0
+[pcbnew/Netclasses]
+[pcbnew/Netclasses/Default]
+Name=Default
+Clearance=0.19
+TrackWidth=0.25
+ViaDiameter=0.8
+ViaDrill=0.4
+uViaDiameter=0.3
+uViaDrill=0.1
+dPairWidth=0.2
+dPairGap=0.25
+dPairViaGap=0.25
diff --git a/stepcraft_controller.sch b/stepcraft_controller.sch
index e0c9573..08c76ae 100644
--- a/stepcraft_controller.sch
+++ b/stepcraft_controller.sch
@@ -1,38 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:iotta_wsn_rev2
-LIBS:w_connectors
-LIBS:silabs
-LIBS:stepcraft_controller-cache
-EELAYER 26 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -47,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ADuM1201BR U3
+L stepcraft_controller-rescue:ADuM1201BR U3
 U 1 1 5997405D
 P 5250 3000
 F 0 "U3" H 5250 3517 50  0000 C CNN
@@ -58,7 +25,7 @@ F 3 "" H 5250 3000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ATMEGA328P-AU U4
+L stepcraft_controller-rescue:ATMEGA328P-AU U4
 U 1 1 59974221
 P 9250 2250
 F 0 "U4" H 9300 3617 50  0000 C CNN
@@ -69,7 +36,7 @@ F 3 "" H 9250 2250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Polyfuse F1
+L Device:Polyfuse F1
 U 1 1 59974303
 P 1550 3250
 F 0 "F1" V 1345 3250 50  0000 C CNN
@@ -80,18 +47,18 @@ F 3 "" H 1550 3250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L USB_OTG J1
+L stepcraft_controller-rescue:USB_OTG J1
 U 1 1 5997440E
 P 900 3450
 F 0 "J1" H 955 3917 50  0000 C CNN
 F 1 "USB" H 955 3826 50  0000 C CNN
-F 2 "iotta_footprints:conn_usb_B_micro_smd" H 1050 3400 50  0001 C CNN
+F 2 "iotta_footprints:USB_Micro-B_2_Holes" H 1050 3400 50  0001 C CNN
 F 3 "" H 1050 3400 50  0001 C CNN
 	1    900  3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L Stepcraft_X1 J9
+L iotta_wsn_rev2:Stepcraft_X1 J9
 U 1 1 59974C5B
 P 10200 4750
 F 0 "J9" H 10200 5565 50  0000 C CNN
@@ -102,7 +69,7 @@ F 3 "" H 10200 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X03 J8
+L stepcraft_controller-rescue:CONN_02X03 J8
 U 1 1 59974E5D
 P 8300 6050
 F 0 "J8" H 8300 6365 50  0000 C CNN
@@ -113,7 +80,7 @@ F 3 "" H 8300 4900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Audio-Jack-3 J3
+L stepcraft_controller-rescue:Audio-Jack-3 J3
 U 1 1 5997572F
 P 850 6700
 F 0 "J3" H 562 6770 50  0000 R CNN
@@ -124,7 +91,7 @@ F 3 "" H 1100 6800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Audio-Jack-3 J2
+L stepcraft_controller-rescue:Audio-Jack-3 J2
 U 1 1 599757B6
 P 850 6250
 F 0 "J2" H 826 6575 50  0000 C CNN
@@ -169,7 +136,7 @@ NoConn ~ 10450 4450
 Text Label 10450 5350 0    60   ~ 0
 SC_VCC_5V
 $Comp
-L GND #PWR01
+L power:GND #PWR01
 U 1 1 5997564B
 P 900 3950
 F 0 "#PWR01" H 900 3700 50  0001 C CNN
@@ -181,7 +148,7 @@ F 3 "" H 900 3950 50  0001 C CNN
 $EndComp
 NoConn ~ 1200 3650
 $Comp
-L +5V #PWR025
+L power:+5V #PWR025
 U 1 1 59975F6B
 P 10850 6150
 F 0 "#PWR025" H 10850 6000 50  0001 C CNN
@@ -192,7 +159,7 @@ F 3 "" H 10850 6150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR022
+L power:+5V #PWR022
 U 1 1 59976123
 P 8250 1000
 F 0 "#PWR022" H 8250 850 50  0001 C CNN
@@ -205,7 +172,7 @@ $EndComp
 NoConn ~ 8350 2500
 NoConn ~ 8350 2600
 $Comp
-L C C14
+L Device:C C14
 U 1 1 59976249
 P 8000 1550
 F 0 "C14" H 8050 1450 50  0000 L CNN
@@ -216,7 +183,7 @@ F 3 "" H 8000 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C13
+L Device:C C13
 U 1 1 59976347
 P 7700 1550
 F 0 "C13" H 7750 1450 50  0000 L CNN
@@ -231,7 +198,7 @@ AVR_TX
 Text Label 10250 2750 0    60   ~ 0
 AVR_RX
 $Comp
-L R R6
+L Device:R R6
 U 1 1 59976930
 P 5300 3800
 F 0 "R6" V 5093 3800 50  0000 C CNN
@@ -242,7 +209,7 @@ F 3 "" H 5300 3800 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R7
+L Device:R R7
 U 1 1 59976A0E
 P 5300 3950
 F 0 "R7" V 5400 3950 50  0000 C CNN
@@ -253,7 +220,7 @@ F 3 "" H 5300 3950 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R9
+L Device:R R9
 U 1 1 59976C80
 P 6350 2900
 F 0 "R9" V 6143 2900 50  0000 C CNN
@@ -264,7 +231,7 @@ F 3 "" H 6350 2900 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R10
+L Device:R R10
 U 1 1 59976D2F
 P 6350 3100
 F 0 "R10" V 6450 3100 50  0000 C CNN
@@ -279,7 +246,7 @@ AVR_RX
 Text Label 6900 2900 0    60   ~ 0
 AVR_TX
 $Comp
-L +5V #PWR015
+L power:+5V #PWR015
 U 1 1 599770B5
 P 5850 2650
 F 0 "#PWR015" H 5850 2500 50  0001 C CNN
@@ -294,7 +261,7 @@ SC_VCC_5V
 Text Label 10250 2600 0    60   ~ 0
 AVR_RST
 $Comp
-L C C10
+L Device:C C10
 U 1 1 5997876B
 P 6650 1900
 F 0 "C10" V 6810 1900 50  0000 C CNN
@@ -307,7 +274,7 @@ $EndComp
 Text Label 7250 4900 0    60   ~ 0
 AVR_RST
 $Comp
-L R R27
+L Device:R R27
 U 1 1 5997899C
 P 7050 4600
 F 0 "R27" H 6980 4554 50  0000 R CNN
@@ -318,7 +285,7 @@ F 3 "" H 7050 4600 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR017
+L power:+5V #PWR017
 U 1 1 59978BE3
 P 7050 4400
 F 0 "#PWR017" H 7050 4250 50  0001 C CNN
@@ -329,7 +296,7 @@ F 3 "" H 7050 4400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R28
+L Device:R R28
 U 1 1 59978DFB
 P 7050 5150
 F 0 "R28" H 7120 5196 50  0000 L CNN
@@ -340,7 +307,7 @@ F 3 "" H 7050 5150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Jumper_NO_Small JP1
+L Device:Jumper_NO_Small JP1
 U 1 1 59979856
 P 8750 5950
 F 0 "JP1" H 8750 6135 50  0000 C CNN
@@ -351,7 +318,7 @@ F 3 "" H 8750 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR023
+L power:+5V #PWR023
 U 1 1 5997999F
 P 9100 5850
 F 0 "#PWR023" H 9100 5700 50  0001 C CNN
@@ -362,7 +329,7 @@ F 3 "" H 9100 5850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SW_PUSH_SHIELD SW1
+L iotta_wsn_rev2:SW_PUSH_SHIELD SW1
 U 1 1 59976B68
 P 7050 5700
 F 0 "SW1" V 7096 5818 50  0000 L CNN
@@ -381,7 +348,7 @@ D13_SCK
 Text Label 8050 6150 2    60   ~ 0
 AVR_RST
 $Comp
-L C C2
+L Device:C C2
 U 1 1 59977BF2
 P 2050 2350
 F 0 "C2" H 2165 2396 50  0000 L CNN
@@ -392,7 +359,7 @@ F 3 "" H 2050 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal Y1
+L Device:Crystal Y1
 U 1 1 599784D7
 P 8400 4750
 F 0 "Y1" H 8400 4482 50  0000 C CNN
@@ -403,7 +370,7 @@ F 3 "" H 8400 4750 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C11
+L Device:C C11
 U 1 1 599787A1
 P 8100 5000
 F 0 "C11" H 8215 5046 50  0000 L CNN
@@ -414,7 +381,7 @@ F 3 "" H 8100 5000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C12
+L Device:C C12
 U 1 1 599787ED
 P 8700 5000
 F 0 "C12" H 8815 5046 50  0000 L CNN
@@ -433,7 +400,7 @@ AVR_XTAL1
 Text Label 10250 1850 0    60   ~ 0
 AVR_XTAL2
 $Comp
-L C C3
+L Device:C C3
 U 1 1 599780B8
 P 2000 4000
 F 0 "C3" H 2050 3900 50  0000 L CNN
@@ -444,7 +411,7 @@ F 3 "" H 2000 4000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C4
+L Device:C C4
 U 1 1 59978104
 P 2250 4000
 F 0 "C4" H 2300 3900 50  0000 L CNN
@@ -455,7 +422,7 @@ F 3 "" H 2250 4000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C1
+L Device:C C1
 U 1 1 59979C28
 P 1750 2350
 F 0 "C1" H 1635 2396 50  0000 R CNN
@@ -466,7 +433,7 @@ F 3 "" H 1750 2350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L ADuM1201BR U2
+L stepcraft_controller-rescue:ADuM1201BR U2
 U 1 1 59B0525E
 P 5250 1800
 F 0 "U2" H 5250 2317 50  0000 C CNN
@@ -477,7 +444,7 @@ F 3 "" H 5250 1800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR014
+L power:+5V #PWR014
 U 1 1 59B05A58
 P 5850 1250
 F 0 "#PWR014" H 5850 1100 50  0001 C CNN
@@ -488,7 +455,7 @@ F 3 "" H 5850 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L Device:R R5
 U 1 1 59B05F47
 P 5300 1000
 F 0 "R5" V 5093 1000 50  0000 C CNN
@@ -499,7 +466,7 @@ F 3 "" H 5300 1000 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L C C8
+L Device:C C8
 U 1 1 59B0653D
 P 6050 1600
 F 0 "C8" H 6165 1646 50  0000 L CNN
@@ -510,7 +477,7 @@ F 3 "" H 6050 1600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C9
+L Device:C C9
 U 1 1 59B0695D
 P 6050 2400
 F 0 "C9" H 5935 2354 50  0000 R CNN
@@ -521,7 +488,7 @@ F 3 "" H 6050 2400 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDD #PWR020
+L power:GNDD #PWR020
 U 1 1 59B07B0E
 P 8000 3750
 F 0 "#PWR020" H 8000 3500 50  0001 C CNN
@@ -532,7 +499,7 @@ F 3 "" H 8000 3750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR024
+L power:GNDD #PWR024
 U 1 1 59B07CD1
 P 10850 4850
 F 0 "#PWR024" H 10850 4600 50  0001 C CNN
@@ -543,7 +510,7 @@ F 3 "" H 10850 4850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR012
+L power:GNDD #PWR012
 U 1 1 59B07E5C
 P 5750 2200
 F 0 "#PWR012" H 5750 1950 50  0001 C CNN
@@ -554,7 +521,7 @@ F 3 "" H 5750 2200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C5
+L Device:C C5
 U 1 1 59B0837A
 P 4400 2200
 F 0 "C5" H 4515 2246 50  0000 L CNN
@@ -565,7 +532,7 @@ F 3 "" H 4400 2200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L Device:C C6
 U 1 1 59B08584
 P 4450 3350
 F 0 "C6" H 4565 3396 50  0000 L CNN
@@ -576,7 +543,7 @@ F 3 "" H 4450 3350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L power:GND #PWR06
 U 1 1 59B0863A
 P 4450 3600
 F 0 "#PWR06" H 4450 3350 50  0001 C CNN
@@ -587,7 +554,7 @@ F 3 "" H 4450 3600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L power:GND #PWR05
 U 1 1 59B08689
 P 4400 2450
 F 0 "#PWR05" H 4400 2200 50  0001 C CNN
@@ -598,7 +565,7 @@ F 3 "" H 4400 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR013
+L power:GNDD #PWR013
 U 1 1 59B08C40
 P 5800 3400
 F 0 "#PWR013" H 5800 3150 50  0001 C CNN
@@ -609,40 +576,40 @@ F 3 "" H 5800 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L power:GND #PWR011
 U 1 1 59B08ED8
-P 2400 1350
-F 0 "#PWR011" H 2400 1100 50  0001 C CNN
-F 1 "GND" H 2405 1177 50  0000 C CNN
-F 2 "" H 2400 1350 50  0001 C CNN
-F 3 "" H 2400 1350 50  0001 C CNN
-	1    2400 1350
+P 3250 1150
+F 0 "#PWR011" H 3250 900 50  0001 C CNN
+F 1 "GND" H 3255 977 50  0000 C CNN
+F 2 "" H 3250 1150 50  0001 C CNN
+F 3 "" H 3250 1150 50  0001 C CNN
+	1    3250 1150
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR016
+L power:GNDD #PWR016
 U 1 1 59B08F27
-P 2800 1350
-F 0 "#PWR016" H 2800 1100 50  0001 C CNN
-F 1 "GNDD" H 2804 1195 50  0000 C CNN
-F 2 "" H 2800 1350 50  0001 C CNN
-F 3 "" H 2800 1350 50  0001 C CNN
-	1    2800 1350
+P 3650 1150
+F 0 "#PWR016" H 3650 900 50  0001 C CNN
+F 1 "GNDD" H 3654 995 50  0000 C CNN
+F 2 "" H 3650 1150 50  0001 C CNN
+F 3 "" H 3650 1150 50  0001 C CNN
+	1    3650 1150
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R8
+L Device:R R8
 U 1 1 59B08F76
-P 2600 1200
-F 0 "R8" V 2393 1200 50  0000 C CNN
-F 1 "0 (DNP)" V 2484 1200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805" V 2530 1200 50  0001 C CNN
-F 3 "" H 2600 1200 50  0001 C CNN
-	1    2600 1200
+P 3450 1000
+F 0 "R8" V 3243 1000 50  0000 C CNN
+F 1 "0 (DNP)" V 3334 1000 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3380 1000 50  0001 C CNN
+F 3 "" H 3450 1000 50  0001 C CNN
+	1    3450 1000
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDD #PWR018
+L power:GNDD #PWR018
 U 1 1 59B0943A
 P 7050 6150
 F 0 "#PWR018" H 7050 5900 50  0001 C CNN
@@ -653,7 +620,7 @@ F 3 "" H 7050 6150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R11
+L Device:R R11
 U 1 1 59B28AC7
 P 6650 1700
 F 0 "R11" V 6857 1700 50  0000 C CNN
@@ -664,7 +631,7 @@ F 3 "" H 6650 1700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDD #PWR019
+L power:GNDD #PWR019
 U 1 1 59B29D19
 P 8400 5350
 F 0 "#PWR019" H 8400 5100 50  0001 C CNN
@@ -675,7 +642,7 @@ F 3 "" H 8400 5350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR021
+L power:GNDD #PWR021
 U 1 1 59B29DB5
 P 8650 6200
 F 0 "#PWR021" H 8650 5950 50  0001 C CNN
@@ -686,73 +653,62 @@ F 3 "" H 8650 6200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D_TVS D1
+L Device:D_TVS D1
 U 1 1 59B2A30A
 P 1400 3950
 F 0 "D1" H 1400 4166 50  0000 C CNN
-F 1 "D_TVS" H 1400 4075 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0603" H 1400 3950 50  0001 C CNN
+F 1 "TVS Diode" H 1400 4075 50  0000 C CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 1400 3950 50  0001 C CNN
 F 3 "" H 1400 3950 50  0001 C CNN
 	1    1400 3950
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D_TVS D2
+L Device:D_TVS D2
 U 1 1 59B2A3DE
 P 1650 3950
 F 0 "D2" H 1650 4166 50  0000 C CNN
-F 1 "D_TVS" H 1650 4075 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0603" H 1650 3950 50  0001 C CNN
+F 1 "TVS Diode" H 1650 4075 50  0000 C CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 1650 3950 50  0001 C CNN
 F 3 "" H 1650 3950 50  0001 C CNN
 	1    1650 3950
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D_TVS D3
-U 1 1 59B2B616
-P 1950 7100
-F 0 "D3" V 1904 7022 50  0000 R CNN
-F 1 "D_TVS" V 1995 7022 50  0000 R CNN
-F 2 "Capacitors_SMD:C_0603" H 1950 7100 50  0001 C CNN
-F 3 "" H 1950 7100 50  0001 C CNN
-	1    1950 7100
-	0    1    1    0   
-$EndComp
-$Comp
-L D_TVS D4
+L Device:D_TVS D4
 U 1 1 59B2B80C
 P 2200 7100
 F 0 "D4" V 2600 7100 50  0000 L CNN
-F 1 "D_TVS" V 2700 7100 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 2200 7100 50  0001 C CNN
+F 1 "TVS Diode" V 2750 6725 50  0000 L CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 2200 7100 50  0001 C CNN
 F 3 "" H 2200 7100 50  0001 C CNN
 	1    2200 7100
 	0    1    1    0   
 $EndComp
 $Comp
-L D_TVS D5
+L Device:D_TVS D5
 U 1 1 59B2B878
 P 2450 7100
 F 0 "D5" V 2850 7100 50  0000 L CNN
-F 1 "D_TVS" V 2950 7100 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 2450 7100 50  0001 C CNN
+F 1 "TVS Diode" V 2250 6700 50  0000 L CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 2450 7100 50  0001 C CNN
 F 3 "" H 2450 7100 50  0001 C CNN
 	1    2450 7100
 	0    1    1    0   
 $EndComp
 $Comp
-L D_TVS D6
+L Device:D_TVS D6
 U 1 1 59B2B8E0
 P 2700 7100
 F 0 "D6" V 2654 7179 50  0000 L CNN
-F 1 "D_TVS" V 2745 7179 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 2700 7100 50  0001 C CNN
+F 1 "TVS Diode" V 2400 6700 50  0000 L CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 2700 7100 50  0001 C CNN
 F 3 "" H 2700 7100 50  0001 C CNN
 	1    2700 7100
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDD #PWR03
+L power:GNDD #PWR03
 U 1 1 59B2B948
 P 1200 7500
 F 0 "#PWR03" H 1200 7250 50  0001 C CNN
@@ -763,7 +719,7 @@ F 3 "" H 1200 7500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L Device:R R1
 U 1 1 59B2C8B7
 P 1600 6150
 F 0 "R1" V 1807 6150 50  0000 C CNN
@@ -774,7 +730,7 @@ F 3 "" H 1600 6150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R2
+L Device:R R2
 U 1 1 59B2CA00
 P 1600 6250
 F 0 "R2" V 1500 6350 50  0000 C CNN
@@ -785,7 +741,7 @@ F 3 "" H 1600 6250 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R3
+L Device:R R3
 U 1 1 59B2CA68
 P 1600 6600
 F 0 "R3" V 1700 6700 50  0000 C CNN
@@ -796,7 +752,7 @@ F 3 "" H 1600 6600 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R4
+L Device:R R4
 U 1 1 59B2CAE2
 P 1600 6700
 F 0 "R4" V 1485 6700 50  0000 C CNN
@@ -807,14 +763,14 @@ F 3 "" H 1600 6700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_01X02 J7
+L stepcraft_controller-rescue:CONN_01X02 J7
 U 1 1 59B2FAE9
-P 700 5500
-F 0 "J7" V 572 5628 50  0000 L CNN
-F 1 "Serial" V 663 5628 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Angled_2x01_Pitch2.54mm" H 700 5500 50  0001 C CNN
-F 3 "" H 700 5500 50  0001 C CNN
-	1    700  5500
+P 700 4750
+F 0 "J7" V 572 4878 50  0000 L CNN
+F 1 "Serial" V 663 4878 50  0000 L CNN
+F 2 "Pin_Headers:Pin_Header_Angled_2x01_Pitch2.54mm" H 700 4750 50  0001 C CNN
+F 3 "" H 700 4750 50  0001 C CNN
+	1    700  4750
 	-1   0    0    1   
 $EndComp
 Text Label 10250 3050 0    60   ~ 0
@@ -854,7 +810,7 @@ D12_MISO
 Text Label 8050 6050 2    60   ~ 0
 D13_SCK
 $Comp
-L C C15
+L Device:C C15
 U 1 1 59B35539
 P 8250 2050
 F 0 "C15" H 8300 1950 50  0000 L CNN
@@ -891,7 +847,7 @@ SC_REF_XYZ
 Text Label 5950 7450 0    60   ~ 0
 SC_REF_4
 $Comp
-L R R12
+L Device:R R12
 U 1 1 59B35B24
 P 5650 5950
 F 0 "R12" V 5750 5950 50  0001 C CNN
@@ -902,7 +858,7 @@ F 3 "" H 5650 5950 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R15
+L Device:R R15
 U 1 1 59B363CB
 P 5650 6150
 F 0 "R15" V 5750 6150 50  0001 C CNN
@@ -913,7 +869,7 @@ F 3 "" H 5650 6150 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R16
+L Device:R R16
 U 1 1 59B36436
 P 5650 6250
 F 0 "R16" V 5750 6250 50  0001 C CNN
@@ -924,7 +880,7 @@ F 3 "" H 5650 6250 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R17
+L Device:R R17
 U 1 1 59B364A1
 P 5650 6350
 F 0 "R17" V 5750 6350 50  0001 C CNN
@@ -935,7 +891,7 @@ F 3 "" H 5650 6350 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R18
+L Device:R R18
 U 1 1 59B3650C
 P 5650 6450
 F 0 "R18" V 5750 6450 50  0001 C CNN
@@ -946,7 +902,7 @@ F 3 "" H 5650 6450 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R19
+L Device:R R19
 U 1 1 59B36577
 P 5650 6550
 F 0 "R19" V 5750 6550 50  0001 C CNN
@@ -957,7 +913,7 @@ F 3 "" H 5650 6550 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R20
+L Device:R R20
 U 1 1 59B365E2
 P 5650 6650
 F 0 "R20" V 5750 6650 50  0001 C CNN
@@ -968,7 +924,7 @@ F 3 "" H 5650 6650 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R24
+L Device:R R24
 U 1 1 59B3664D
 P 5650 7250
 F 0 "R24" V 5750 7250 50  0001 C CNN
@@ -979,7 +935,7 @@ F 3 "" H 5650 7250 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R25
+L Device:R R25
 U 1 1 59B366B8
 P 5650 7350
 F 0 "R25" V 5750 7350 50  0001 C CNN
@@ -990,7 +946,7 @@ F 3 "" H 5650 7350 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R22
+L Device:R R22
 U 1 1 59B36723
 P 5650 6950
 F 0 "R22" V 5750 6950 50  0001 C CNN
@@ -1001,7 +957,7 @@ F 3 "" H 5650 6950 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R23
+L Device:R R23
 U 1 1 59B3678E
 P 5650 7050
 F 0 "R23" V 5750 7050 50  0001 C CNN
@@ -1012,7 +968,7 @@ F 3 "" H 5650 7050 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R21
+L Device:R R21
 U 1 1 59B367F9
 P 5650 6750
 F 0 "R21" V 5750 6750 50  0001 C CNN
@@ -1023,7 +979,7 @@ F 3 "" H 5650 6750 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R26
+L Device:R R26
 U 1 1 59B36864
 P 5650 7450
 F 0 "R26" V 5750 7450 50  0001 C CNN
@@ -1038,7 +994,7 @@ SC_RELAY3
 Text Label 5950 5850 0    60   ~ 0
 SC_RELAY2
 $Comp
-L R R14
+L Device:R R14
 U 1 1 59B37BAF
 P 5650 5750
 F 0 "R14" V 5750 5750 50  0001 C CNN
@@ -1049,7 +1005,7 @@ F 3 "" H 5650 5750 50  0001 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R13
+L Device:R R13
 U 1 1 59B37BB5
 P 5650 5850
 F 0 "R13" V 5750 5850 50  0001 C CNN
@@ -1076,7 +1032,7 @@ SpinPWM
 Text Label 2750 6700 0    60   ~ 0
 SpinDir/Cool
 $Comp
-L CONN_01X03 J4
+L stepcraft_controller-rescue:CONN_01X03 J4
 U 1 1 59B3957E
 P 2950 7350
 F 0 "J4" H 2869 7573 50  0000 C CNN
@@ -1095,7 +1051,7 @@ Probe
 Text Label 5300 6750 2    60   ~ 0
 D9
 $Comp
-L C C7
+L Device:C C7
 U 1 1 59B3ACBA
 P 4000 6500
 F 0 "C7" H 4115 6546 50  0000 L CNN
@@ -1106,7 +1062,7 @@ F 3 "" H 4000 6500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR010
+L power:GNDD #PWR010
 U 1 1 59B3AFB8
 P 4000 6750
 F 0 "#PWR010" H 4000 6500 50  0001 C CNN
@@ -1117,7 +1073,7 @@ F 3 "" H 4000 6750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_02X03 J6
+L stepcraft_controller-rescue:CONN_02X03 J6
 U 1 1 59B3B278
 P 5150 5850
 F 0 "J6" H 5150 6165 50  0000 C CNN
@@ -1138,7 +1094,7 @@ A2
 Text Label 5300 7050 2    60   ~ 0
 A0
 $Comp
-L CONN_01X03 J10
+L stepcraft_controller-rescue:CONN_01X03 J10
 U 1 1 59B3E4E1
 P 5100 7350
 F 0 "J10" H 5178 7299 50  0000 L CNN
@@ -1149,7 +1105,7 @@ F 3 "" H 5100 7350 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Jumper JP2
+L Device:Jumper JP2
 U 1 1 59B3F819
 P 4950 6950
 F 0 "JP2" H 4950 7214 50  0000 C CNN
@@ -1162,7 +1118,7 @@ $EndComp
 Text Label 4550 6950 2    60   ~ 0
 A5
 $Comp
-L CONN_02X03 J11
+L stepcraft_controller-rescue:CONN_02X03 J11
 U 1 1 59B3FC96
 P 5150 5150
 F 0 "J11" H 5150 5465 50  0000 C CNN
@@ -1177,7 +1133,7 @@ D10
 Text Label 2750 6150 0    60   ~ 0
 Input2
 $Comp
-L C C16
+L Device:C C16
 U 1 1 59B41E3A
 P 4200 5600
 F 0 "C16" H 4315 5646 50  0000 L CNN
@@ -1188,7 +1144,7 @@ F 3 "" H 4200 5600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR026
+L power:GNDD #PWR026
 U 1 1 59B41E41
 P 4200 5850
 F 0 "#PWR026" H 4200 5600 50  0001 C CNN
@@ -1199,7 +1155,7 @@ F 3 "" H 4200 5850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L power:GND #PWR04
 U 1 1 59978008
 P 2000 4350
 F 0 "#PWR04" H 2000 4100 50  0001 C CNN
@@ -1216,7 +1172,7 @@ D12_MISO
 Text Label 3450 6600 0    60   ~ 0
 D11_MOSI
 $Comp
-L +5VP #PWR027
+L power:+5VP #PWR027
 U 1 1 59B3E12D
 P 1750 1900
 F 0 "#PWR027" H 1750 1750 50  0001 C CNN
@@ -1229,7 +1185,7 @@ $EndComp
 Text Label 4750 5850 2    60   ~ 0
 D13_SCK
 $Comp
-L CP2102N-A01-GQFN24 U1
+L stepcraft_controller-rescue:CP2102N-A01-GQFN24 U1
 U 1 1 59C2AFC5
 P 3050 3050
 F 0 "U1" H 2650 2200 50  0000 C CNN
@@ -1243,7 +1199,7 @@ NoConn ~ 2450 2850
 NoConn ~ 2450 2750
 NoConn ~ 2450 2450
 $Comp
-L GND #PWR02
+L power:GND #PWR02
 U 1 1 59C2E309
 P 2050 2850
 F 0 "#PWR02" H 2050 2600 50  0001 C CNN
@@ -1253,9 +1209,9 @@ F 3 "" H 2050 2850 50  0001 C CNN
 	1    2050 2850
 	1    0    0    -1  
 $EndComp
-Text Label 1300 5550 0    60   ~ 0
+Text Label 1300 4800 0    60   ~ 0
 AVR_TX
-Text Label 1300 5450 0    60   ~ 0
+Text Label 1300 4700 0    60   ~ 0
 AVR_RX
 Wire Wire Line
 	4900 5250 4750 5250
@@ -1356,17 +1312,17 @@ Wire Wire Line
 Wire Wire Line
 	8250 2400 8250 2200
 Wire Wire Line
-	1300 5550 900  5550
+	1300 4800 900  4800
 Wire Wire Line
-	900  5450 1300 5450
+	900  4700 1300 4700
 Wire Wire Line
-	1750 6700 3250 6700
+	1750 6700 2700 6700
 Wire Wire Line
-	1750 6600 3450 6600
+	1750 6600 2450 6600
 Wire Wire Line
-	1750 6250 4100 6250
+	1750 6250 2200 6250
 Wire Wire Line
-	1750 6150 3900 6150
+	1750 6150 1950 6150
 Connection ~ 2450 7400
 Wire Wire Line
 	2450 7400 2450 7250
@@ -1378,7 +1334,7 @@ Wire Wire Line
 	1950 7250 1950 7400
 Connection ~ 1200 7400
 Wire Wire Line
-	1200 7400 2700 7400
+	1200 7400 1950 7400
 Wire Wire Line
 	2700 7400 2700 7250
 Connection ~ 1200 6850
@@ -1391,43 +1347,39 @@ Wire Wire Line
 Wire Wire Line
 	1200 6850 650  6850
 Wire Wire Line
-	1200 6450 1200 7500
+	1200 6450 1200 6850
 Wire Wire Line
-	6400 1000 5450 1000
-Connection ~ 6400 1900
+	6375 1000 5450 1000
+Connection ~ 6375 1900
 Wire Wire Line
-	6400 1900 6400 1000
+	6375 1900 6375 1000
 Wire Wire Line
-	5700 1900 6500 1900
+	5700 1900 6375 1900
 Wire Wire Line
 	5750 2200 5750 2050
 Wire Wire Line
-	2800 1200 2800 1350
+	3650 1000 3650 1150
 Wire Wire Line
-	2750 1200 2800 1200
+	3600 1000 3650 1000
 Wire Wire Line
-	2400 1200 2450 1200
+	3250 1000 3300 1000
 Wire Wire Line
-	2400 1350 2400 1200
+	3250 1150 3250 1000
 Wire Wire Line
 	5800 3400 5800 3250
 Wire Wire Line
-	4450 3500 4450 3600
+	4450 3500 4450 3550
 Wire Wire Line
-	4400 2350 4400 2450
+	4400 2350 4400 2400
 Wire Wire Line
-	5700 2750 6050 2750
+	5700 2750 5850 2750
 Wire Wire Line
 	6050 2750 6050 2550
 Connection ~ 6050 2050
 Connection ~ 5850 2750
 Wire Wire Line
-	6050 1750 6050 2250
+	6050 1750 6050 2050
 Connection ~ 5850 1350
-Wire Wire Line
-	6050 1350 5850 1350
-Wire Wire Line
-	6050 1450 6050 1350
 Connection ~ 6750 3100
 Wire Wire Line
 	6750 3950 6750 3100
@@ -1438,7 +1390,7 @@ Connection ~ 5750 2050
 Wire Wire Line
 	5700 1700 6500 1700
 Wire Wire Line
-	5850 1250 5850 1550
+	5850 1250 5850 1350
 Wire Wire Line
 	5850 1550 5700 1550
 Wire Wire Line
@@ -1446,11 +1398,11 @@ Wire Wire Line
 Wire Wire Line
 	5700 3100 6200 3100
 Wire Wire Line
-	5700 2050 6050 2050
+	5700 2050 5750 2050
 Wire Wire Line
-	2250 3050 2250 3850
+	2250 3050 2250 3250
 Wire Wire Line
-	1700 3250 2250 3250
+	1700 3250 2000 3250
 Wire Wire Line
 	1200 3250 1400 3250
 Connection ~ 900  3900
@@ -1459,10 +1411,10 @@ Wire Wire Line
 Wire Wire Line
 	800  3850 800  3900
 Wire Wire Line
-	900  3850 900  3950
+	900  3850 900  3900
 Connection ~ 2000 4250
 Wire Wire Line
-	2000 4150 2000 4350
+	2000 4150 2000 4250
 Wire Wire Line
 	2250 4250 2250 4150
 Connection ~ 8400 5250
@@ -1471,7 +1423,7 @@ Wire Wire Line
 Wire Wire Line
 	8400 5250 8400 5350
 Wire Wire Line
-	8100 5250 8700 5250
+	8100 5250 8400 5250
 Wire Wire Line
 	8100 5150 8100 5250
 Wire Wire Line
@@ -1484,7 +1436,7 @@ Wire Wire Line
 	8550 4750 8700 4750
 Connection ~ 7050 6050
 Wire Wire Line
-	7050 6000 7050 6150
+	7050 6000 7050 6050
 Wire Wire Line
 	7300 6050 7050 6050
 Wire Wire Line
@@ -1505,15 +1457,15 @@ Wire Wire Line
 	8850 5950 9100 5950
 Connection ~ 7050 4900
 Wire Wire Line
-	7050 4750 7050 5000
+	7050 4750 7050 4900
 Wire Wire Line
 	7050 4450 7050 4400
 Wire Wire Line
 	5850 2750 5850 2650
 Wire Wire Line
-	6500 2900 6900 2900
+	6500 2900 6600 2900
 Wire Wire Line
-	6500 3100 6900 3100
+	6500 3100 6750 3100
 Wire Wire Line
 	5700 2900 6200 2900
 Connection ~ 8000 3250
@@ -1527,7 +1479,7 @@ Wire Wire Line
 	8000 3450 8350 3450
 Connection ~ 8000 1800
 Wire Wire Line
-	8000 1700 8000 3750
+	8000 1700 8000 1800
 Wire Wire Line
 	7700 1800 8000 1800
 Wire Wire Line
@@ -1538,20 +1490,20 @@ Wire Wire Line
 	7700 1150 7700 1400
 Connection ~ 8250 1150
 Wire Wire Line
-	7700 1150 8350 1150
+	7700 1150 8250 1150
 Connection ~ 8250 1250
 Wire Wire Line
-	8000 1250 8350 1250
+	8000 1250 8250 1250
 Wire Wire Line
 	8250 1450 8350 1450
 Wire Wire Line
-	8250 1000 8250 1450
+	8250 1000 8250 1150
 Wire Wire Line
 	10850 6250 10850 6150
 Wire Wire Line
-	1200 3550 2450 3550
+	1200 3550 1650 3550
 Wire Wire Line
-	1200 3450 2450 3450
+	1200 3450 1400 3450
 Wire Wire Line
 	10850 4750 10850 4850
 Connection ~ 10600 4650
@@ -1571,11 +1523,11 @@ Wire Wire Line
 	10600 4850 10450 4850
 Connection ~ 10600 4750
 Wire Wire Line
-	10450 4750 10850 4750
+	10450 4750 10600 4750
 Wire Wire Line
 	10600 4550 10450 4550
 Wire Wire Line
-	10600 4550 10600 5250
+	10600 4550 10600 4650
 Wire Wire Line
 	10600 5250 10450 5250
 Wire Wire Line
@@ -1585,7 +1537,7 @@ Wire Wire Line
 Wire Wire Line
 	4850 5150 4850 5350
 Wire Wire Line
-	3900 5350 5450 5350
+	3900 5350 4200 5350
 Wire Wire Line
 	5450 5350 5450 5150
 Connection ~ 4850 5350
@@ -1619,7 +1571,7 @@ Connection ~ 2700 6700
 Wire Wire Line
 	2450 3050 2250 3050
 Wire Wire Line
-	1400 4250 3150 4250
+	1400 4250 1650 4250
 Wire Wire Line
 	1400 4100 1400 4250
 Wire Wire Line
@@ -1645,16 +1597,16 @@ Wire Wire Line
 	3050 3950 3050 4250
 Connection ~ 3050 4250
 Wire Wire Line
-	2050 2500 2050 2850
+	2050 2500 2050 2750
 Wire Wire Line
 	2050 2750 1750 2750
 Wire Wire Line
 	1750 2750 1750 2500
 Connection ~ 2050 2750
 Wire Wire Line
-	1750 1900 1750 2200
+	1750 1900 1750 2000
 Wire Wire Line
-	1750 2000 3050 2000
+	1750 2000 2050 2000
 Wire Wire Line
 	3050 2000 3050 2150
 Wire Wire Line
@@ -1672,13 +1624,13 @@ Wire Wire Line
 Wire Wire Line
 	4800 2900 4200 2900
 Wire Wire Line
-	4200 2750 4200 3800
+	4200 2750 4200 2900
 Wire Wire Line
 	4200 2750 3650 2750
 Wire Wire Line
 	3650 2850 4100 2850
 Wire Wire Line
-	4100 2850 4100 3950
+	4100 2850 4100 3100
 Wire Wire Line
 	4100 3100 4800 3100
 Wire Wire Line
@@ -1690,14 +1642,14 @@ Wire Wire Line
 Wire Wire Line
 	4000 3050 3650 3050
 Wire Wire Line
-	4000 1000 4000 3050
+	4000 1000 4000 1900
 Wire Wire Line
 	4000 1900 4800 1900
 Connection ~ 1750 2000
 Wire Wire Line
 	4450 2750 4450 3200
 Wire Wire Line
-	4450 2750 4800 2750
+	4450 2750 4700 2750
 Wire Wire Line
 	4700 3250 4800 3250
 Wire Wire Line
@@ -1706,7 +1658,7 @@ Wire Wire Line
 	4700 3550 4450 3550
 Connection ~ 4450 3550
 Wire Wire Line
-	4400 1450 4400 2050
+	4400 1450 4400 1550
 Wire Wire Line
 	4400 1550 4800 1550
 Wire Wire Line
@@ -1717,7 +1669,7 @@ Wire Wire Line
 	4700 2050 4800 2050
 Connection ~ 4400 2400
 $Comp
-L +5VP #PWR07
+L power:+5VP #PWR07
 U 1 1 59C361B2
 P 4400 1450
 F 0 "#PWR07" H 4400 1300 50  0001 C CNN
@@ -1729,7 +1681,7 @@ F 3 "" H 4400 1450 50  0001 C CNN
 $EndComp
 Connection ~ 4400 1550
 $Comp
-L +5VP #PWR08
+L power:+5VP #PWR08
 U 1 1 59C36369
 P 4700 2700
 F 0 "#PWR08" H 4700 2550 50  0001 C CNN
@@ -1752,12 +1704,12 @@ Wire Wire Line
 	5150 1000 4000 1000
 Connection ~ 4000 1900
 Wire Wire Line
-	6800 1700 7000 1700
+	6800 1700 6900 1700
 Wire Wire Line
 	6900 1700 6900 1900
 Wire Wire Line
 	6900 1900 6800 1900
-Text Label 7000 1700 0    60   ~ 0
+Text Label 7075 1700 0    60   ~ 0
 AVR_RST
 Connection ~ 6900 1700
 NoConn ~ 3650 3150
@@ -1769,7 +1721,7 @@ NoConn ~ 3650 2650
 NoConn ~ 3650 2550
 NoConn ~ 3650 2450
 $Comp
-L D_Schottky D7
+L Device:D_Schottky D7
 U 1 1 59FC710B
 P 10600 6250
 F 0 "D7" H 10600 6034 50  0000 C CNN
@@ -1783,4 +1735,163 @@ Wire Wire Line
 	10350 6250 10450 6250
 Wire Wire Line
 	10750 6250 10850 6250
+Wire Wire Line
+	4000 6250 4100 6250
+Wire Wire Line
+	8000 2400 8000 3250
+Wire Wire Line
+	2450 7400 2700 7400
+Wire Wire Line
+	2200 7400 2450 7400
+Wire Wire Line
+	1950 7400 2200 7400
+Wire Wire Line
+	1200 7400 1200 7500
+Wire Wire Line
+	1200 6850 1200 7400
+Wire Wire Line
+	6375 1900 6500 1900
+Wire Wire Line
+	6050 2050 6050 2250
+Wire Wire Line
+	5850 2750 6050 2750
+Wire Wire Line
+	5850 1350 5850 1550
+Wire Wire Line
+	6750 3100 6900 3100
+Wire Wire Line
+	6600 2900 6900 2900
+Wire Wire Line
+	5750 2050 6050 2050
+Wire Wire Line
+	900  3900 900  3950
+Wire Wire Line
+	2000 4250 2000 4350
+Wire Wire Line
+	2000 4250 2250 4250
+Wire Wire Line
+	8400 5250 8700 5250
+Wire Wire Line
+	7050 6050 7050 6150
+Wire Wire Line
+	7050 4900 7050 5000
+Wire Wire Line
+	8000 3250 8000 3350
+Wire Wire Line
+	8000 3350 8000 3450
+Wire Wire Line
+	8000 3450 8000 3750
+Wire Wire Line
+	8000 1800 8000 2400
+Wire Wire Line
+	8250 1150 8350 1150
+Wire Wire Line
+	8250 1150 8250 1250
+Wire Wire Line
+	8250 1250 8350 1250
+Wire Wire Line
+	8250 1250 8250 1450
+Wire Wire Line
+	10600 4650 10600 4750
+Wire Wire Line
+	10600 5150 10600 5250
+Wire Wire Line
+	10600 5050 10600 5150
+Wire Wire Line
+	10600 4950 10600 5050
+Wire Wire Line
+	10600 4850 10600 4950
+Wire Wire Line
+	10600 4750 10850 4750
+Wire Wire Line
+	10600 4750 10600 4850
+Wire Wire Line
+	4850 5350 5450 5350
+Wire Wire Line
+	4200 5350 4850 5350
+Wire Wire Line
+	1950 6150 3900 6150
+Wire Wire Line
+	2200 6250 4000 6250
+Wire Wire Line
+	2450 6600 3450 6600
+Wire Wire Line
+	2700 6700 3250 6700
+Wire Wire Line
+	1650 4250 2000 4250
+Wire Wire Line
+	1400 3450 2450 3450
+Wire Wire Line
+	1650 3550 2450 3550
+Wire Wire Line
+	2250 3250 2250 3350
+Wire Wire Line
+	2000 3250 2250 3250
+Wire Wire Line
+	2250 3350 2250 3850
+Wire Wire Line
+	2250 4250 3050 4250
+Wire Wire Line
+	3050 4250 3150 4250
+Wire Wire Line
+	2050 2750 2050 2850
+Wire Wire Line
+	2950 2000 3050 2000
+Wire Wire Line
+	2050 2000 2950 2000
+Wire Wire Line
+	1750 2000 1750 2200
+Wire Wire Line
+	4450 3550 4450 3600
+Wire Wire Line
+	4400 2400 4400 2450
+Wire Wire Line
+	4400 1550 4400 2050
+Wire Wire Line
+	4700 2750 4800 2750
+Wire Wire Line
+	4100 3100 4100 3950
+Wire Wire Line
+	4200 2900 4200 3800
+Wire Wire Line
+	4000 1900 4000 3050
+Wire Wire Line
+	6900 1700 7075 1700
+$Comp
+L Device:D_TVS D3
+U 1 1 59B2B616
+P 1950 7100
+F 0 "D3" V 1904 7022 50  0000 R CNN
+F 1 "TVS Diode" V 2400 7500 50  0000 R CNN
+F 2 "Diode_SMD:D_0603_1608Metric" H 1950 7100 50  0001 C CNN
+F 3 "" H 1950 7100 50  0001 C CNN
+	1    1950 7100
+	0    1    1    0   
+$EndComp
+Text Notes 1300 5850 0    47   ~ 0
+TVS Diodes, use for example Wurth 82356050050 \nProbably any 5V TVS/ESD suppressor will work\n\nFor added protection input resistors R1 and R2 may\nbe increased to a higher value. In that case one could\nprobably rely on the internat ESD protection in the ATMega.
+Text Notes 775  1450 0    59   ~ 0
+For use without galvanic separation:\n\n- Do not place U2 and U3 \n- Do not place C5, C6, C8, C9, R9, R10, R11\n- Place R5, R6, R7, R8 
+$Comp
+L Device:R R29
+U 1 1 637AAE20
+P 6625 1350
+F 0 "R29" V 6418 1350 50  0000 C CNN
+F 1 "10k (DNP)" V 6509 1350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 6555 1350 50  0001 C CNN
+F 3 "" H 6625 1350 50  0001 C CNN
+	1    6625 1350
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	6775 1350 6900 1350
+Wire Wire Line
+	6900 1350 6900 1700
+Wire Wire Line
+	5850 1350 6050 1350
+Wire Wire Line
+	6050 1450 6050 1350
+Connection ~ 6050 1350
+Wire Wire Line
+	6050 1350 6475 1350
 $EndSCHEMATC
diff --git a/sym-lib-table b/sym-lib-table
new file mode 100644
index 0000000..606fe76
--- /dev/null
+++ b/sym-lib-table
@@ -0,0 +1,5 @@
+(sym_lib_table
+  (lib (name stepcraft_controller-rescue)(type Legacy)(uri ${KIPRJMOD}/stepcraft_controller-rescue.lib)(options "")(descr ""))
+  (lib (name iotta_wsn_rev2)(type Legacy)(uri C:/code/Hardware/iotta-kicad-libs/iotta_wsn_rev2.lib)(options "")(descr ""))
+  (lib (name w_connectors)(type Legacy)(uri C:/code/Hardware/iotta-kicad-libs/smisioto.no-ip.org/w_connectors.lib)(options "")(descr ""))
+)