diff --git a/library/satnogs.dcm b/library/satnogs.dcm
index f970e6f..8afc9a7 100644
--- a/library/satnogs.dcm
+++ b/library/satnogs.dcm
@@ -25,7 +25,7 @@ D RS485 Transceiver
 $ENDCMP
 #
 $CMP TC74
-D Temperature sensor, I2C
+D Temperature sensor - I2C
 $ENDCMP
 #
 $CMP TCST2103
diff --git a/satnogs-rotator-controller-bom.ods b/satnogs-rotator-controller-bom.ods
index bb8fb1f..521892e 100644
Binary files a/satnogs-rotator-controller-bom.ods and b/satnogs-rotator-controller-bom.ods differ
diff --git a/satnogs_controller/satnogs_controller.csv b/satnogs_controller/satnogs_controller.csv
index eb21641..7fd59ad 100644
--- a/satnogs_controller/satnogs_controller.csv
+++ b/satnogs_controller/satnogs_controller.csv
@@ -1,65 +1,54 @@
-Reference, Value, Footprint, Datasheet, Mnf., Price
-P4,I2C,Pin_Headers:Pin_Header_Straight_2x04,,,
-C1,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-P2,End-Stops,Pin_Headers:Pin_Header_Straight_2x03,,,
-C3,100u,Capacitors_SMD:c_elec_6.3x5.3,,,EXV107M016A9GAA,0.443,
-JP1,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-JP2,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-JP3,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-R4,100k,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805100KJNEA,0.091,
-P7,Motor1,satnogs:MKDS_1.5-4,,,Phoenix 1985467,0.7,
-C4,100u,Capacitors_SMD:c_elec_6.3x5.3,,,EXV107M016A9GAA,0.443,
-JP4,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-JP5,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-JP6,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-R7,100k,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805100KJNEA,0.091,
-P8,Motor2,satnogs:MKDS_1.5-4,,,Phoenix 1985467,0.7,
-R1,120,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805120RJNEA,0.091,
-R3,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-R2,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-R6,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-R5,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-R9,10,Resistors_SMD:R_0805_HandSoldering,,,CRCW080510R0JNEA,0.091,
-JP8,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-JP7,Jumper_NO_Small,Resistors_SMD:R_0805_HandSoldering,,,CRCW08050000Z0EA,0.094,
-FB1,FILTER,Resistors_SMD:R_0805_HandSoldering,,,BLM21PG221SN1D,0.104,
-F1,FUSE,Fuse_Holders_and_Fuses:Fuse_SMD1206_HandSoldering,,,Littelfuse 1206SFS200F/63-2,0.6,
-C5,100u,Capacitors_SMD:c_elec_6.3x5.3,,,EXV107M016A9GAA,0.443,
-D2,D_Schottky,satnogs:DO-214AB_Handsoldering,,,CDBC560-G,0.67,
-U5,TPS54360DDA,satnogs:HSOP-8,,,TPS54360DDAR,4,
-R12,147k,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805147KFKEA,0.091,
-C9,47u,Capacitors_SMD:C_1210_HandSoldering,,,GRM32ER61C476ME15L,0.851,
-C8,10p,Capacitors_SMD:C_0805_HandSoldering,,,C0805C100K5GACTU,0.091,
-C7,7.5n,Capacitors_SMD:C_0805_HandSoldering,,,GRM2195C1H752JA01D,0.244,
-R13,10.5k,Resistors_SMD:R_0805_HandSoldering,,,CRCW080510K5FKEA,0.091,
-R11,26.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW080526K7FKEA,0.091,
-R10,221k,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805221KFKEA,0.091,
-L1,27u,satnogs:Inductor_Bourns-SRR1210_HandSoldering,,,SRR1210-270M,1,
-D1,D_Schottky,satnogs:DO-214AB_Handsoldering,,,CDBC560-G,0.67,
-C2,2.2u,Capacitors_SMD:C_1210_HandSoldering,,,C3225X7R2A225K230AB,0.697,
-C6,100n,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-C11,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-C10,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-R14,200,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805200RJNEA,0.091,
-R15,200,Resistors_SMD:R_0805_HandSoldering,,,CRCW0805200RJNEA,0.091,
-FB2,FILTER,Resistors_SMD:R_0805_HandSoldering,,,BLM21AG221SN1D,0.141,
-U7,PCA9540B,satnogs:TSSOP-8_3x3mm_Pitch0.65mm_HandSoldering,,,PCA9540BDP 118,1.23,
-R17,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-R16,4.7k,Resistors_SMD:R_0805_HandSoldering,,,CRCW08054K70JNEA,0.091,
-C12,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-P1,DEV-PINS,Pin_Headers:Pin_Header_Straight_2x04,,,
-P3,IN-PINS,Pin_Headers:Pin_Header_Straight_2x04,,,
-P5,GND-PAD,Mounting_Holes:MountingHole_2.2mm_M2_DIN965_Pad,,,
-D3,D_TVS_x2_AAC,TO_SOT_Packages_SMD:SOT-23_Handsoldering,,,CDSOT23-SM712,1.53,
-R8,10,Resistors_SMD:R_0805_HandSoldering,,,CRCW080510R0JNEA,0.091,
-R18,10k,Resistors_SMD:R_0805_HandSoldering,,,CRCW080510K0JNEA,0.091,
-U4,Pololu_A4988,satnogs:Pololu_A4988,,,
-U3,Pololu_A4988,satnogs:Pololu_A4988,,,
-U1,Arduino_Pro_Mini,satnogs:Arduino_Pro_Mini,,,
-U6,Pololu_Dual_MC33926,satnogs:Pololu_Dual_MC33926,,,
-C13,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-U2,SN65HVD485EDR,satnogs:SOIC-8_3.9x4.9mm_Pitch1.27mm_HandSoldering,,,SN65HVD485EDR,1.74,
-U8,TC74,satnogs:SOT-23-5_HandSoldering,,,TC74A0-5.0VCTTR,0.886,
-C14,0.1u,Capacitors_SMD:C_0805_HandSoldering,,,08053C104KAT2A,0.094,
-C15,100u,satnogs:CP_Radial_D10.0mm_P5.00mm,,,RGA101M1JBK-1012G,0.248,
-D4,D_TVS,satnogs:DO-214AB_Handsoldering,,,SMCJ48A-E3/57T,0.472,
+Component,Description,Part,References,Value,Footprint,Quantity Per PCB,Datasheet,Mnf.,Price
+1,b'',b'C_Small',b'C1 C6 C10 C11 C12 C13 C14',b'0.1u',b'C_0805_HandSoldering',b'7',b'',b'08053C104KAT2A',b'0.094'
+2,b'',b'CP',b'C15',b'100u',b'CP_Radial_D10.0mm_P5.00mm',b'1',b'',b'RGA101M1JBK-1012G',b'0.248'
+3,b'',b'CP',b'C3 C4 C5',b'100u',b'c_elec_6.3x5.3',b'3',b'',b'EXV107M016A9GAA',b'0.443'
+4,b'',b'C_Small',b'C8',b'10p',b'C_0805_HandSoldering',b'1',b'',b'C0805C100K5GACTU',b'0.091'
+5,b'',b'C_Small',b'C2',b'2.2u',b'C_1210_HandSoldering',b'1',b'',b'C3225X7R2A225K230AB',b'0.697'
+6,b'',b'C_Small',b'C9',b'47u',b'C_1210_HandSoldering',b'1',b'',b'GRM32ER61C476ME15L',b'0.851'
+7,b'',b'C_Small',b'C7',b'7.5n',b'C_0805_HandSoldering',b'1',b'',b'GRM2195C1H752JA01D',b'0.244'
+8,b'',b'D_Schottky',b'D1 D2',b'D_Schottky',b'DO-214AB_Handsoldering',b'2',b'',b'CDBC560-G',b'0.67'
+9,b'',b'D_TVS',b'D4',b'D_TVS',b'DO-214AB_Handsoldering',b'1',b'',b'SMCJ48A',b'0.442'
+10,b'',b'D_TVS_x2_AAC',b'D3',b'D_TVS_x2_AAC',b'SOT-23_Handsoldering',b'1',b'',b'CDSOT23-SM712',b'1.53'
+11,b'',b'FUSE',b'F1',b'FUSE',b'Fuse_SMD1206_HandSoldering',b'1',b'',b'Littelfuse 1206SFS200F/63-2',b'0.6'
+12,b'',b'FILTER',b'FB2',b'FILTER',b'R_0805_HandSoldering',b'1',b'',b'BLM21AG221SN1D',b'0.141'
+13,b'',b'FILTER',b'FB1',b'FILTER - POWER',b'R_0805_HandSoldering',b'1',b'',b'BLM21PG221SN1D',b'0.104'
+14,b'',b'Jumper_NO_Small',b'JP1 JP2 JP3 JP4 JP5 JP6 JP7 JP8',b'Jumper_NO_Small',b'R_0805_HandSoldering',b'8',b'',b'CRCW08050000Z0EA',b'0.094'
+15,b'',b'INDUCTOR_SMALL',b'L1',b'27u',b'Inductor_Bourns-SRR1210_HandSoldering',b'1',b'',b'SRR1210-270M',b'1'
+16,b'',b'CONN_02X04',b'P1',b'DEV-PINS',b'Pin_Header_Straight_2x04',b'1',b'',b'',b''
+17,b'',b'CONN_02X03',b'P2',b'End-Stops',b'Pin_Header_Straight_2x03',b'1',b'',b'',b''
+18,b'',b'CONN_02X04',b'P4',b'I2C',b'Pin_Header_Straight_2x04',b'1',b'',b'',b''
+19,b'',b'Conn_02x05_Odd_Even',b'P3',b'INPUT',b'Pin_Header_Straight_2x05_Pitch2.54mm',b'1',b'',b'Amphenol-861400402YO2LF',b'1.18'
+20,b'',b'CONN_02X03',b'P6',b'ISP',b'Pin_Header_Straight_2x03_Pitch2.54mm',b'1',b'',b'',b''
+21,b'',b'CONN_01X04',b'P7 P8',b'Motor',b'MKDS_1.5-4',b'2',b'',b'Amphenol-VI0421550000G',b'0.84'
+22,b'',b'R',b'R8 R9',b'10',b'R_0805_HandSoldering',b'2',b'',b'CRCW080510R0JNEA',b'0.091'
+23,b'',b'R',b'R13',b'10.5k',b'R_0805_HandSoldering',b'1',b'',b'CRCW080510K5FKEA',b'0.091'
+24,b'',b'R',b'R4 R7',b'100k',b'R_0805_HandSoldering',b'2',b'',b'CRCW0805100KJNEA',b'0.091'
+25,b'',b'R',b'R18',b'10k',b'R_0805_HandSoldering',b'1',b'',b'CRCW080510K0JNEA',b'0.091'
+26,b'',b'R',b'R1',b'120',b'R_0805_HandSoldering',b'1',b'',b'CRCW0805120RJNEA',b'0.091'
+27,b'',b'R',b'R12',b'147k',b'R_0805_HandSoldering',b'1',b'',b'CRCW0805147KFKEA',b'0.091'
+28,b'',b'R',b'R14 R15',b'200',b'R_0805_HandSoldering',b'2',b'',b'CRCW0805200RJNEA',b'0.091'
+29,b'',b'R',b'R10',b'221k',b'R_0805_HandSoldering',b'1',b'',b'CRCW0805221KFKEA',b'0.091'
+30,b'',b'R',b'R11',b'26.7k',b'R_0805_HandSoldering',b'1',b'',b'CRCW080526K7FKEA',b'0.091'
+31,b'',b'R',b'R2 R3 R5 R6 R16 R17',b'4.7k',b'R_0805_HandSoldering',b'6',b'',b'CRCW08054K70JNEA',b'0.091'
+32,b'Arduino Pro Mini - ATmega328p',b'Arduino_Pro_Mini',b'U1',b'Arduino_Pro_Mini',b'Arduino_Pro_Mini',b'1',b'',b'3M-929974-01-30-RK',b'1.98'
+33,b'I2C Multiplexer',b'PCA9540B',b'U7',b'PCA9540B',b'TSSOP-8_3x3mm_Pitch0.65mm_HandSoldering',b'1',b'',b'PCA9540BDP 118',b'1.23'
+34,b'Stepper Motor Driver',b'Pololu_A4988',b'U3 U4',b'Pololu_A4988',b'Pololu_A4988',b'2',b'',b'3M-929974-01-30-RK',b'1.98'
+35,b'Dual DC Motor Driver',b'Pololu_Dual_MC33926',b'U6',b'Pololu_Dual_MC33926',b'Pololu_Dual_MC33926',b'1',b'',b'Wurth-61304011121',b'1.31'
+36,b'RS485 Transceiver',b'SN65HVD485EDR',b'U2',b'SN65HVD485EDR',b'SOIC-8_3.9x4.9mm_Pitch1.27mm_HandSoldering',b'1',b'',b'SN65HVD485EDR',b'1.74'
+37,b'Temperature sensor - I2C',b'TC74',b'U8',b'TC74',b'SOT-23-5_HandSoldering',b'1',b'',b'TC74A05.0VCTTR',b'0.886'
+38,b'',b'TPS54360DDA',b'U5',b'TPS54360DDA',b'HSOP-8',b'1',b'',b'TPS54360DDAR',b'4'
+
+
+
+
+
+Component Groups:,38
+Component Count:,64
+Fitted Components:,64
+Number of PCBs:,1
+Total components:,64
+Schematic Version:,v2
+Schematic Date:,2018-01-21
+BoM Date:,b'Sun 21 Jan 2018 06:33:01 PM EET'
+Schematic Source:,b'/home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_controller/satnogs_controller.sch'
+KiCad Version:,b'Eeschema 4.0.7'
diff --git a/satnogs_controller/satnogs_controller.kicad_pcb b/satnogs_controller/satnogs_controller.kicad_pcb
index a0046b7..64a7be7 100644
--- a/satnogs_controller/satnogs_controller.kicad_pcb
+++ b/satnogs_controller/satnogs_controller.kicad_pcb
@@ -5,7 +5,7 @@
     (no_connects 0)
     (area 89.165715 39.24 194.044285 131.015)
     (thickness 1.6)
-    (drawings 66)
+    (drawings 68)
     (tracks 587)
     (zones 0)
     (modules 106)
@@ -1681,7 +1681,7 @@
     (fp_text reference FB1 (at -3.89 0 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value FILTER (at 0 2.1 270) (layer F.Fab) hide
+    (fp_text value "FILTER - POWER" (at 0 2.1 270) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -2.4 -1) (end 2.4 -1) (layer F.CrtYd) (width 0.05))
@@ -3270,7 +3270,7 @@
     (fp_text reference P8 (at 9.398 -6.35 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.2)))
     )
-    (fp_text value Motor2 (at 0 5.588 180) (layer F.SilkS)
+    (fp_text value Motor (at 0 5.588 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.2)))
     )
     (fp_line (start 10.16 -5.334) (end -10.16 -5.334) (layer F.Fab) (width 0.1))
@@ -3313,7 +3313,7 @@
     (fp_text reference P7 (at 9.525 -6.35 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.2)))
     )
-    (fp_text value Motor1 (at 0 5.588 180) (layer F.SilkS)
+    (fp_text value Motor (at 0 5.588 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.2)))
     )
     (fp_line (start 10.16 -5.334) (end -10.16 -5.334) (layer F.Fab) (width 0.1))
@@ -3660,7 +3660,7 @@
     (fp_text reference P3 (at 1.27 -2.33 270) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value ISP (at 1.27 12.49 270) (layer F.Fab)
+    (fp_text value INPUT (at 1.27 12.49 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
@@ -3821,6 +3821,12 @@
     )
   )
 
+  (gr_text 1 (at 170.942 43.053) (layer F.SilkS) (tstamp 5A64C26E)
+    (effects (font (size 0.8 0.8) (thickness 0.2)))
+  )
+  (gr_text 2 (at 148.336 42.9895) (layer F.SilkS) (tstamp 5A64C244)
+    (effects (font (size 0.8 0.8) (thickness 0.2)))
+  )
   (gr_text GND (at 125.857 111.76 90) (layer F.SilkS) (tstamp 5A0C2A37)
     (effects (font (size 0.8 0.8) (thickness 0.2)))
   )
diff --git a/satnogs_controller/satnogs_controller.net b/satnogs_controller/satnogs_controller.net
index 349b071..5fc65e7 100644
--- a/satnogs_controller/satnogs_controller.net
+++ b/satnogs_controller/satnogs_controller.net
@@ -1,14 +1,14 @@
 (export (version D)
   (design
     (source /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_controller/satnogs_controller.sch)
-    (date "Thu 07 Dec 2017 19:02:59 EET")
+    (date "Sun 21 Jan 2018 06:37:46 PM EET")
     (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "SatNOGS Rotator Controller")
         (company "Libre Space Foundation")
         (rev v2)
-        (date 2016-12-11)
+        (date 2018-01-21)
         (source satnogs_controller.sch)
         (comment (number 1) (value ""))
         (comment (number 2) (value ""))
@@ -27,7 +27,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 568D2DE9))
     (comp (ref P2)
@@ -42,7 +42,7 @@
       (fields
         (field (name Mnf.) EXV107M016A9GAA)
         (field (name Price) 0.443))
-      (libsource (lib device) (part CP))
+      (libsource (lib satnogs_controller-cache) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BF91ED))
     (comp (ref JP1)
@@ -51,7 +51,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFB286))
     (comp (ref JP2)
@@ -60,7 +60,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFB387))
     (comp (ref JP3)
@@ -69,7 +69,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFB3DE))
     (comp (ref R4)
@@ -78,15 +78,15 @@
       (fields
         (field (name Mnf.) CRCW0805100KJNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFCE50))
     (comp (ref P7)
-      (value Motor1)
+      (value Motor)
       (footprint satnogs:MKDS_1.5-4)
       (fields
-        (field (name Mnf.) "Phoenix 1985467")
-        (field (name Price) 0.7))
+        (field (name Mnf.) Amphenol-VI0421550000G)
+        (field (name Price) 0.84))
       (libsource (lib satnogs_controller-cache) (part CONN_01X04))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFEE7D))
@@ -96,7 +96,7 @@
       (fields
         (field (name Mnf.) EXV107M016A9GAA)
         (field (name Price) 0.443))
-      (libsource (lib device) (part CP))
+      (libsource (lib satnogs_controller-cache) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001B2))
     (comp (ref JP4)
@@ -105,7 +105,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001C9))
     (comp (ref JP5)
@@ -114,7 +114,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001CF))
     (comp (ref JP6)
@@ -123,7 +123,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001D5))
     (comp (ref R7)
@@ -132,15 +132,15 @@
       (fields
         (field (name Mnf.) CRCW0805100KJNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001EB))
     (comp (ref P8)
-      (value Motor2)
+      (value Motor)
       (footprint satnogs:MKDS_1.5-4)
       (fields
-        (field (name Mnf.) "Phoenix 1985467")
-        (field (name Price) 0.7))
+        (field (name Mnf.) Amphenol-VI0421550000G)
+        (field (name Price) 0.84))
       (libsource (lib satnogs_controller-cache) (part CONN_01X04))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C001FC))
@@ -150,7 +150,7 @@
       (fields
         (field (name Mnf.) CRCW0805120RJNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFE1A7))
     (comp (ref R3)
@@ -159,7 +159,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFFBA2))
     (comp (ref R2)
@@ -168,7 +168,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BFFDF0))
     (comp (ref R6)
@@ -177,7 +177,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C00C2A))
     (comp (ref R5)
@@ -186,7 +186,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C00C30))
     (comp (ref R9)
@@ -195,7 +195,7 @@
       (fields
         (field (name Mnf.) CRCW080510R0JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57044C41))
     (comp (ref JP8)
@@ -204,7 +204,7 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57E516D1))
     (comp (ref JP7)
@@ -213,11 +213,11 @@
       (fields
         (field (name Mnf.) CRCW08050000Z0EA)
         (field (name Price) 0.094))
-      (libsource (lib device) (part Jumper_NO_Small))
+      (libsource (lib satnogs_controller-cache) (part Jumper_NO_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57E52083))
     (comp (ref FB1)
-      (value FILTER)
+      (value "FILTER - POWER")
       (footprint Resistors_SMD:R_0805_HandSoldering)
       (fields
         (field (name Mnf.) BLM21PG221SN1D)
@@ -240,7 +240,7 @@
       (fields
         (field (name Mnf.) EXV107M016A9GAA)
         (field (name Price) 0.443))
-      (libsource (lib device) (part CP))
+      (libsource (lib satnogs_controller-cache) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 57E7EF06))
     (comp (ref D2)
@@ -249,7 +249,7 @@
       (fields
         (field (name Mnf.) CDBC560-G)
         (field (name Price) 0.67))
-      (libsource (lib device) (part D_Schottky))
+      (libsource (lib satnogs_controller-cache) (part D_Schottky))
       (sheetpath (names /) (tstamps /))
       (tstamp 57E9650D))
     (comp (ref U5)
@@ -258,7 +258,7 @@
       (fields
         (field (name Mnf.) TPS54360DDAR)
         (field (name Price) 4))
-      (libsource (lib dc-dc) (part TPS54360DDA))
+      (libsource (lib satnogs_controller-cache) (part TPS54360DDA))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF2C6B))
     (comp (ref R12)
@@ -267,7 +267,7 @@
       (fields
         (field (name Mnf.) CRCW0805147KFKEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF3A8B))
     (comp (ref C9)
@@ -276,7 +276,7 @@
       (fields
         (field (name Mnf.) GRM32ER61C476ME15L)
         (field (name Price) 0.851))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF47B6))
     (comp (ref C8)
@@ -285,7 +285,7 @@
       (fields
         (field (name Mnf.) C0805C100K5GACTU)
         (field (name Price) 0.091))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF4969))
     (comp (ref C7)
@@ -294,7 +294,7 @@
       (fields
         (field (name Mnf.) GRM2195C1H752JA01D)
         (field (name Price) 0.244))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF4E01))
     (comp (ref R13)
@@ -303,7 +303,7 @@
       (fields
         (field (name Mnf.) CRCW080510K5FKEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF4F79))
     (comp (ref R11)
@@ -312,7 +312,7 @@
       (fields
         (field (name Mnf.) CRCW080526K7FKEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF5028))
     (comp (ref R10)
@@ -321,7 +321,7 @@
       (fields
         (field (name Mnf.) CRCW0805221KFKEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF5103))
     (comp (ref L1)
@@ -339,7 +339,7 @@
       (fields
         (field (name Mnf.) CDBC560-G)
         (field (name Price) 0.67))
-      (libsource (lib device) (part D_Schottky))
+      (libsource (lib satnogs_controller-cache) (part D_Schottky))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EF65F4))
     (comp (ref C2)
@@ -348,7 +348,7 @@
       (fields
         (field (name Mnf.) C3225X7R2A225K230AB)
         (field (name Price) 0.697))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57F1A1A0))
     (comp (ref C6)
@@ -357,7 +357,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 57EFA4E3))
     (comp (ref C11)
@@ -366,7 +366,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 58177ADA))
     (comp (ref C10)
@@ -375,7 +375,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 5817856C))
     (comp (ref R14)
@@ -384,7 +384,7 @@
       (fields
         (field (name Mnf.) CRCW0805200RJNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 5817CDE5))
     (comp (ref R15)
@@ -393,7 +393,7 @@
       (fields
         (field (name Mnf.) CRCW0805200RJNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 5817CF15))
     (comp (ref FB2)
@@ -420,7 +420,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 58244E4E))
     (comp (ref R16)
@@ -429,7 +429,7 @@
       (fields
         (field (name Mnf.) CRCW08054K70JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 58244E56))
     (comp (ref C12)
@@ -438,7 +438,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 58249D79))
     (comp (ref P1)
@@ -459,7 +459,7 @@
       (fields
         (field (name Mnf.) CDSOT23-SM712)
         (field (name Price) 1.53))
-      (libsource (lib device) (part D_TVS_x2_AAC))
+      (libsource (lib satnogs_controller-cache) (part D_TVS_x2_AAC))
       (sheetpath (names /) (tstamps /))
       (tstamp 5872753A))
     (comp (ref R8)
@@ -468,7 +468,7 @@
       (fields
         (field (name Mnf.) CRCW080510R0JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 57044B38))
     (comp (ref R18)
@@ -477,30 +477,42 @@
       (fields
         (field (name Mnf.) CRCW080510K0JNEA)
         (field (name Price) 0.091))
-      (libsource (lib device) (part R))
+      (libsource (lib satnogs_controller-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 5872EB0E))
     (comp (ref U4)
       (value Pololu_A4988)
       (footprint satnogs:Pololu_A4988)
+      (fields
+        (field (name Mnf.) 3M-929974-01-30-RK)
+        (field (name Price) 1.98))
       (libsource (lib satnogs) (part Pololu_A4988))
       (sheetpath (names /) (tstamps /))
       (tstamp 58744594))
     (comp (ref U3)
       (value Pololu_A4988)
       (footprint satnogs:Pololu_A4988)
+      (fields
+        (field (name Mnf.) 3M-929974-01-30-RK)
+        (field (name Price) 1.98))
       (libsource (lib satnogs) (part Pololu_A4988))
       (sheetpath (names /) (tstamps /))
       (tstamp 58744BCB))
     (comp (ref U1)
       (value Arduino_Pro_Mini)
       (footprint satnogs:Arduino_Pro_Mini)
+      (fields
+        (field (name Mnf.) 3M-929974-01-30-RK)
+        (field (name Price) 1.98))
       (libsource (lib satnogs) (part Arduino_Pro_Mini))
       (sheetpath (names /) (tstamps /))
       (tstamp 5874513D))
     (comp (ref U6)
       (value Pololu_Dual_MC33926)
       (footprint satnogs:Pololu_Dual_MC33926)
+      (fields
+        (field (name Mnf.) Wurth-61304011121)
+        (field (name Price) 1.31))
       (libsource (lib satnogs) (part Pololu_Dual_MC33926))
       (sheetpath (names /) (tstamps /))
       (tstamp 58743FEF))
@@ -510,7 +522,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 587BF76D))
     (comp (ref U2)
@@ -526,7 +538,7 @@
       (value TC74)
       (footprint satnogs:SOT-23-5_HandSoldering)
       (fields
-        (field (name Mnf.) TC74A0-5.0VCTTR)
+        (field (name Mnf.) TC74A05.0VCTTR)
         (field (name Price) 0.886))
       (libsource (lib satnogs) (part TC74))
       (sheetpath (names /) (tstamps /))
@@ -537,7 +549,7 @@
       (fields
         (field (name Mnf.) 08053C104KAT2A)
         (field (name Price) 0.094))
-      (libsource (lib device) (part C_Small))
+      (libsource (lib satnogs_controller-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 5888D6B0))
     (comp (ref C15)
@@ -546,16 +558,16 @@
       (fields
         (field (name Mnf.) RGA101M1JBK-1012G)
         (field (name Price) 0.248))
-      (libsource (lib device) (part CP))
+      (libsource (lib satnogs_controller-cache) (part CP))
       (sheetpath (names /) (tstamps /))
       (tstamp 589F63F7))
     (comp (ref D4)
       (value D_TVS)
       (footprint satnogs:DO-214AB_Handsoldering)
       (fields
-        (field (name Mnf.) SMCJ48A-E3/57T)
-        (field (name Price) 0.472))
-      (libsource (lib device) (part D_TVS))
+        (field (name Mnf.) SMCJ48A)
+        (field (name Price) 0.442))
+      (libsource (lib satnogs_controller-cache) (part D_TVS))
       (sheetpath (names /) (tstamps /))
       (tstamp 58A4445A))
     (comp (ref P6)
@@ -565,9 +577,12 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5A089C1D))
     (comp (ref P3)
-      (value ISP)
+      (value INPUT)
       (footprint Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm)
-      (libsource (lib conn) (part Conn_02x05_Odd_Even))
+      (fields
+        (field (name Mnf.) Amphenol-861400402YO2LF)
+        (field (name Price) 1.18))
+      (libsource (lib satnogs_controller-cache) (part Conn_02x05_Odd_Even))
       (sheetpath (names /) (tstamps /))
       (tstamp 5A0C6521)))
   (libparts
@@ -664,8 +679,7 @@
         (pin (num 6) (name P6) (type passive))
         (pin (num 7) (name P7) (type passive))
         (pin (num 8) (name P8) (type passive))))
-    (libpart (lib device) (part CP)
-      (description "Polarised capacitor")
+    (libpart (lib satnogs_controller-cache) (part CP)
       (footprints
         (fp CP_*))
       (fields
@@ -674,8 +688,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part C_Small)
-      (description "Unpolarized capacitor")
+    (libpart (lib satnogs_controller-cache) (part C_Small)
       (footprints
         (fp C_*))
       (fields
@@ -684,9 +697,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib conn) (part Conn_02x05_Odd_Even)
-      (description "Generic connector, double row, 02x05, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers)")
-      (docs ~)
+    (libpart (lib satnogs_controller-cache) (part Conn_02x05_Odd_Even)
       (footprints
         (fp Connector*:*2x??x*mm*)
         (fp Connector*:*2x???Pitch*)
@@ -708,8 +719,7 @@
         (pin (num 8) (name Pin_8) (type passive))
         (pin (num 9) (name Pin_9) (type passive))
         (pin (num 10) (name Pin_10) (type passive))))
-    (libpart (lib device) (part D_Schottky)
-      (description "Schottky diode")
+    (libpart (lib satnogs_controller-cache) (part D_Schottky)
       (footprints
         (fp TO-???*)
         (fp *SingleDiode)
@@ -722,9 +732,7 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib device) (part D_TVS)
-      (description "Bidirectional transient-voltage-suppression (TVS) diode")
-      (docs https://en.wikipedia.org/wiki/Transient-voltage-suppression_diode)
+    (libpart (lib satnogs_controller-cache) (part D_TVS)
       (footprints
         (fp TO-???*)
         (fp *SingleDiode)
@@ -737,9 +745,7 @@
       (pins
         (pin (num 1) (name A1) (type passive))
         (pin (num 2) (name A2) (type passive))))
-    (libpart (lib device) (part D_TVS_x2_AAC)
-      (description "Bidirectional dual transient-voltage-suppression (TVS) diode (center=pin3)")
-      (docs https://en.wikipedia.org/wiki/Transient-voltage-suppression_diode)
+    (libpart (lib satnogs_controller-cache) (part D_TVS_x2_AAC)
       (fields
         (field (name Reference) D)
         (field (name Value) D_TVS_x2_AAC))
@@ -771,8 +777,7 @@
       (pins
         (pin (num 1) (name 1) (type input))
         (pin (num 2) (name 2) (type input))))
-    (libpart (lib device) (part Jumper_NO_Small)
-      (description "Jumper, normally open")
+    (libpart (lib satnogs_controller-cache) (part Jumper_NO_Small)
       (fields
         (field (name Reference) JP)
         (field (name Value) Jumper_NO_Small))
@@ -848,8 +853,7 @@
         (pin (num 25) (name VDD) (type power_out))
         (pin (num 26) (name VMOT) (type power_in))
         (pin (num 27) (name GND) (type power_in))))
-    (libpart (lib device) (part R)
-      (description Resistor)
+    (libpart (lib satnogs_controller-cache) (part R)
       (footprints
         (fp R_*)
         (fp R_*))
@@ -874,7 +878,7 @@
         (pin (num 7) (name B) (type BiDi))
         (pin (num 8) (name VDD) (type power_in))))
     (libpart (lib satnogs) (part TC74)
-      (description "Temperature sensor, I2C")
+      (description "Temperature sensor - I2C")
       (fields
         (field (name Reference) U)
         (field (name Value) TC74))
@@ -884,11 +888,9 @@
         (pin (num 3) (name VDD) (type power_in))
         (pin (num 4) (name SCLK) (type BiDi))
         (pin (num 5) (name SDA) (type BiDi))))
-    (libpart (lib dc-dc) (part TPS54360DDA)
+    (libpart (lib satnogs_controller-cache) (part TPS54360DDA)
       (aliases
         (alias TPS54340DDA))
-      (description "60V 3.5 A, Step Down DC-DC Converter with Eco-mode, HSOIC8")
-      (docs http://www.ti.com/lit/ds/symlink/tps54360.pdf)
       (footprints
         (fp *SO*))
       (fields
@@ -906,12 +908,6 @@
         (pin (num 8) (name SW) (type output))
         (pin (num 9) (name PAD) (type passive)))))
   (libraries
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
-    (library (logical dc-dc)
-      (uri /usr/share/kicad/library/dc-dc.lib))
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
     (library (logical satnogs)
       (uri /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/library/satnogs.lib))
     (library (logical satnogs_controller-cache)
diff --git a/satnogs_controller/satnogs_controller.sch b/satnogs_controller/satnogs_controller.sch
index 921a291..acb148d 100644
--- a/satnogs_controller/satnogs_controller.sch
+++ b/satnogs_controller/satnogs_controller.sch
@@ -1,79 +1,4 @@
 EESchema Schematic File Version 2
-LIBS:74xgxx
-LIBS:74xx
-LIBS:ac-dc
-LIBS:actel
-LIBS:adc-dac
-LIBS:Altera
-LIBS:analog_devices
-LIBS:analog_switches
-LIBS:atmel
-LIBS:audio
-LIBS:brooktre
-LIBS:cmos4000
-LIBS:cmos_ieee
-LIBS:conn
-LIBS:contrib
-LIBS:cypress
-LIBS:dc-dc
-LIBS:device
-LIBS:digital-audio
-LIBS:diode
-LIBS:display
-LIBS:dsp
-LIBS:elec-unifil
-LIBS:ESD_Protection
-LIBS:ftdi
-LIBS:gennum
-LIBS:hc11
-LIBS:intel
-LIBS:interface
-LIBS:ir
-LIBS:Lattice
-LIBS:linear
-LIBS:maxim
-LIBS:memory
-LIBS:microchip
-LIBS:microchip_dspic33dsc
-LIBS:microchip_pic10mcu
-LIBS:microchip_pic12mcu
-LIBS:microchip_pic16mcu
-LIBS:microchip_pic18mcu
-LIBS:microchip_pic32mcu
-LIBS:microcontrollers
-LIBS:motor_drivers
-LIBS:motorola
-LIBS:msp430
-LIBS:nordicsemi
-LIBS:nxp_armmcu
-LIBS:onsemi
-LIBS:opto
-LIBS:Oscillators
-LIBS:philips
-LIBS:power
-LIBS:powerint
-LIBS:Power_Management
-LIBS:pspice
-LIBS:references
-LIBS:regul
-LIBS:relays
-LIBS:rfcom
-LIBS:sensors
-LIBS:silabs
-LIBS:siliconi
-LIBS:stm8
-LIBS:stm32
-LIBS:supertex
-LIBS:switches
-LIBS:texas
-LIBS:transf
-LIBS:transistors
-LIBS:ttl_ieee
-LIBS:valves
-LIBS:video
-LIBS:Xicor
-LIBS:xilinx
-LIBS:Zilog
 LIBS:satnogs
 LIBS:satnogs_controller-cache
 EELAYER 25 0
@@ -82,7 +7,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "SatNOGS Rotator Controller"
-Date "2016-12-11"
+Date "2018-01-21"
 Rev "v2"
 Comp "Libre Space Foundation"
 Comment1 ""
@@ -348,11 +273,11 @@ L CONN_01X04 P7
 U 1 1 56BFEE7D
 P 7320 5380
 F 0 "P7" H 7320 5140 50  0000 C CNN
-F 1 "Motor1" V 7420 5380 50  0000 C CNN
+F 1 "Motor" V 7420 5380 50  0000 C CNN
 F 2 "satnogs:MKDS_1.5-4" H 7320 5380 50  0001 C CNN
 F 3 "" H 7320 5380 50  0001 C CNN
-F 4 "Phoenix 1985467" H 7320 5380 60  0001 C CNN "Mnf."
-F 5 "0.7" H 7320 5380 60  0001 C CNN "Price"
+F 4 "Amphenol-VI0421550000G" H 7320 5380 60  0001 C CNN "Mnf."
+F 5 "0.84" H 7320 5380 60  0001 C CNN "Price"
 	1    7320 5380
 	-1   0    0    -1  
 $EndComp
@@ -442,11 +367,11 @@ L CONN_01X04 P8
 U 1 1 56C001FC
 P 7300 3850
 F 0 "P8" H 7300 3610 50  0000 C CNN
-F 1 "Motor2" V 7400 3850 50  0000 C CNN
+F 1 "Motor" V 7400 3850 50  0000 C CNN
 F 2 "satnogs:MKDS_1.5-4" H 7300 3850 50  0001 C CNN
 F 3 "" H 7300 3850 50  0001 C CNN
-F 4 "Phoenix 1985467" H 7300 3850 60  0001 C CNN "Mnf."
-F 5 "0.7" H 7300 3850 60  0001 C CNN "Price"
+F 4 "Amphenol-VI0421550000G" H 7300 3850 60  0001 C CNN "Mnf."
+F 5 "0.84" H 7300 3850 60  0001 C CNN "Price"
 	1    7300 3850
 	-1   0    0    -1  
 $EndComp
@@ -590,7 +515,7 @@ L FILTER FB1
 U 1 1 57E7000D
 P 1475 5920
 F 0 "FB1" H 1475 6070 50  0000 C CNN
-F 1 "FILTER" H 1475 5820 50  0000 C CNN
+F 1 "FILTER - POWER" H 1475 5820 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" H 1475 5920 50  0001 C CNN
 F 3 "" H 1475 5920 50  0001 C CNN
 F 4 "BLM21PG221SN1D" H 1475 5920 60  0001 C CNN "Mnf."
@@ -1207,6 +1132,8 @@ F 0 "U4" H 8370 3850 50  0000 C CNN
 F 1 "Pololu_A4988" H 8370 3250 50  0000 C CNN
 F 2 "satnogs:Pololu_A4988" H 8370 3850 60  0001 C CNN
 F 3 "" H 8370 3850 60  0000 C CNN
+F 4 "3M-929974-01-30-RK" H 8370 3850 60  0001 C CNN "Mnf."
+F 5 "1.98" H 8370 3850 60  0001 C CNN "Price"
 	1    8370 3850
 	1    0    0    -1  
 $EndComp
@@ -1218,6 +1145,8 @@ F 0 "U3" H 8370 5380 50  0000 C CNN
 F 1 "Pololu_A4988" H 8370 4780 50  0000 C CNN
 F 2 "satnogs:Pololu_A4988" H 8370 5380 60  0001 C CNN
 F 3 "" H 8370 5380 60  0000 C CNN
+F 4 "3M-929974-01-30-RK" H 8370 5380 60  0001 C CNN "Mnf."
+F 5 "1.98" H 8370 5380 60  0001 C CNN "Price"
 	1    8370 5380
 	1    0    0    -1  
 $EndComp
@@ -1229,6 +1158,8 @@ F 0 "U1" H 3080 1830 50  0000 C CNN
 F 1 "Arduino_Pro_Mini" H 3080 830 50  0000 C CNN
 F 2 "satnogs:Arduino_Pro_Mini" H 3080 1730 60  0001 C CNN
 F 3 "" H 3080 1730 60  0000 C CNN
+F 4 "3M-929974-01-30-RK" H 3080 1830 60  0001 C CNN "Mnf."
+F 5 "1.98" H 3080 1830 60  0001 C CNN "Price"
 	1    3080 1830
 	1    0    0    -1  
 $EndComp
@@ -1262,6 +1193,8 @@ F 0 "U6" H 8120 1880 50  0000 C CNN
 F 1 "Pololu_Dual_MC33926" H 8720 980 50  0000 C CNN
 F 2 "satnogs:Pololu_Dual_MC33926" H 8120 1880 60  0001 C CNN
 F 3 "" H 8120 1880 60  0001 C CNN
+F 4 "Wurth-61304011121" H 8120 1880 60  0001 C CNN "Mnf."
+F 5 "1.31" H 8120 1880 60  0001 C CNN "Price"
 	1    8120 1880
 	1    0    0    -1  
 $EndComp
@@ -1421,7 +1354,7 @@ F 0 "U8" H 4320 4470 60  0000 C CNN
 F 1 "TC74" H 4520 4070 60  0000 C CNN
 F 2 "satnogs:SOT-23-5_HandSoldering" H 4220 4370 60  0001 C CNN
 F 3 "" H 4320 4470 60  0001 C CNN
-F 4 "TC74A0-5.0VCTTR" H 4320 4470 60  0001 C CNN "Mnf."
+F 4 "TC74A05.0VCTTR" H 4320 4470 60  0001 C CNN "Mnf."
 F 5 "0.886" H 4320 4470 60  0001 C CNN "Price"
 	1    4320 4470
 	1    0    0    -1  
@@ -1763,8 +1696,8 @@ F 0 "D4" H 1080 6260 50  0000 C CNN
 F 1 "D_TVS" H 1080 6060 50  0000 C CNN
 F 2 "satnogs:DO-214AB_Handsoldering" H 1080 6160 50  0001 C CNN
 F 3 "" H 1080 6160 50  0000 C CNN
-F 4 "SMCJ48A-E3/57T" H 1080 6160 60  0001 C CNN "Mnf."
-F 5 "0.472" H 1080 6160 60  0001 C CNN "Price"
+F 4 "SMCJ48A" H 1080 6160 60  0001 C CNN "Mnf."
+F 5 "0.442" H 1080 6160 60  0001 C CNN "Price"
 	1    1080 6160
 	0    1    1    0   
 $EndComp
@@ -2356,9 +2289,11 @@ L Conn_02x05_Odd_Even P3
 U 1 1 5A0C6521
 P 1165 4580
 F 0 "P3" H 1215 4880 50  0000 C CNN
-F 1 "ISP" H 1215 4280 50  0000 C CNN
+F 1 "INPUT" H 1215 4280 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm" H 1165 4580 50  0001 C CNN
 F 3 "" H 1165 4580 50  0001 C CNN
+F 4 "Amphenol-861400402YO2LF" H 1165 4580 60  0001 C CNN "Mnf."
+F 5 "1.18" H 1165 4580 60  0001 C CNN "Price"
 	1    1165 4580
 	1    0    0    -1  
 $EndComp
diff --git a/satnogs_encoder/encoder_as5601/encoder_as5601.csv b/satnogs_encoder/encoder_as5601/encoder_as5601.csv
index d73a482..8e33114 100644
--- a/satnogs_encoder/encoder_as5601/encoder_as5601.csv
+++ b/satnogs_encoder/encoder_as5601/encoder_as5601.csv
@@ -1,8 +1,22 @@
-Reference, Value, Footprint, Datasheet, Distributor, Manufacturer, Package, Notes, Price
-U1,AS5601,Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm,www.mouser.com/ds/2/588/AS5601_Datasheet-771178.pdf,,Mouser 985-AS5601-ASOM,AS5601-ASOM,SOIC-8,-,2.78€,
-C1,100n,Capacitors_SMD:C_0805_HandSoldering,-,,-,-,0805,-,0.1€,
-C2,1u,Capacitors_SMD:C_0805_HandSoldering,-,,-,-,0805,-,0.1 €,
-P1,CONN_02X05,Pin_Headers:Pin_Header_Straight_2x05,https://cdn.sparkfun.com/datasheets/Prototyping/01103.pdf,,SparkFun COM-12792,-,2x40 pin right-angle PTH pitch 2.54,-,1.85€,
-R1,4k7,Resistors_SMD:R_0805_HandSoldering,-,,-,-,0805,-,0.1 €,
-R2,4k7,Resistors_SMD:R_0805_HandSoldering,-,,-,-,0805,-,0.1 €,
-Q1,Q_NMOS_GSD,TO_SOT_Packages_SMD:SOT-23_Handsoldering,http://www.mouser.com/ds/2/427/SI2312CD-244454.pdf,,Mouser 781-SI2312CDS-T1-GE3,SI2312CDS-T1-GE3,SOT-23-3,-,0.398,
+Component,Description,Part,References,Value,Footprint,Quantity Per PCB,Datasheet,Mnf.,Price
+1,b'',b'C_Small',b'C1',b'100n',b'C_0805_HandSoldering',b'1',b'',b'08053C104KAT2A',b'0.09'
+2,b'',b'C_Small',b'C2',b'1u',b'C_0805_HandSoldering',b'1',b'',b'CC0805KKX7R7BB105',b'0.085'
+3,b'',b'CONN_02X05',b'P1',b'CONN_02X05',b'Pin_Header_Straight_2x05_Pitch2.54mm',b'1',b'',b'Amphenol-861400402YO2LF',b'1.18'
+4,b'',b'Q_NMOS_GSD',b'Q1',b'Q_NMOS_GSD',b'SOT-23_Handsoldering',b'1',b'',b'SI2312CDS-T1-GE3',b'0.398'
+5,b'',b'R',b'R1 R2',b'4k7',b'R_0805_HandSoldering',b'2',b'',b'CRCW08054K70JNEA',b'0.091'
+6,b'',b'AS5601-RESCUE-encoder_as5601',b'U1',b'AS5601',b'SOIC-8_3.9x4.9mm_Pitch1.27mm',b'1',b'',b'AS5601-ASOM',b'2.78'
+
+
+
+
+
+Component Groups:,6
+Component Count:,7
+Fitted Components:,7
+Number of PCBs:,1
+Total components:,7
+Schematic Version:,
+Schematic Date:,2018-01-21
+BoM Date:,b'Sun 21 Jan 2018 07:08:43 PM EET'
+Schematic Source:,b'/home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_encoder/encoder_as5601/encoder_as5601.sch'
+KiCad Version:,b'Eeschema 4.0.7'
diff --git a/satnogs_encoder/encoder_as5601/encoder_as5601.kicad_pcb b/satnogs_encoder/encoder_as5601/encoder_as5601.kicad_pcb
index c7df5ba..63f0163 100644
--- a/satnogs_encoder/encoder_as5601/encoder_as5601.kicad_pcb
+++ b/satnogs_encoder/encoder_as5601/encoder_as5601.kicad_pcb
@@ -3,7 +3,7 @@
   (general
     (links 26)
     (no_connects 0)
-    (area 113.632857 72.66 153.067143 104.605)
+    (area 120.574999 76.124999 146.125001 101.675001)
     (thickness 1.6)
     (drawings 9)
     (tracks 61)
diff --git a/satnogs_encoder/encoder_as5601/encoder_as5601.net b/satnogs_encoder/encoder_as5601/encoder_as5601.net
index 855ce71..2ee9195 100644
--- a/satnogs_encoder/encoder_as5601/encoder_as5601.net
+++ b/satnogs_encoder/encoder_as5601/encoder_as5601.net
@@ -1,14 +1,14 @@
 (export (version D)
   (design
     (source /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_encoder/encoder_as5601/encoder_as5601.sch)
-    (date "Thu 09 Nov 2017 10:51:22 EET")
+    (date "Sun 21 Jan 2018 07:09:45 PM EET")
     (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
-        (title)
-        (company)
+        (title "AS5601 - Encoder")
+        (company "Libre Space Foundation")
         (rev)
-        (date)
+        (date 2018-01-21)
         (source encoder_as5601.sch)
         (comment (number 1) (value ""))
         (comment (number 2) (value ""))
@@ -18,92 +18,64 @@
     (comp (ref U1)
       (value AS5601)
       (footprint Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm)
-      (datasheet www.mouser.com/ds/2/588/AS5601_Datasheet-771178.pdf)
       (fields
-        (field (name Distributor) "Mouser 985-AS5601-ASOM")
-        (field (name Manufacturer) AS5601-ASOM)
-        (field (name Package) SOIC-8)
-        (field (name Notes) -)
-        (field (name Price) 2.78€))
+        (field (name Mnf.) AS5601-ASOM)
+        (field (name Price) 2.78))
       (libsource (lib encoder_as5601-rescue) (part AS5601-RESCUE-encoder_as5601))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9A895))
     (comp (ref C1)
       (value 100n)
       (footprint Capacitors_SMD:C_0805_HandSoldering)
-      (datasheet -)
       (fields
-        (field (name Distributor) -)
-        (field (name Manufacturer) -)
-        (field (name Package) 0805)
-        (field (name Notes) -)
-        (field (name Price) 0.1€))
-      (libsource (lib device) (part C_Small))
+        (field (name Mnf.) 08053C104KAT2A)
+        (field (name Price) 0.09))
+      (libsource (lib encoder_as5601-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9AC87))
     (comp (ref C2)
       (value 1u)
       (footprint Capacitors_SMD:C_0805_HandSoldering)
-      (datasheet -)
       (fields
-        (field (name Distributor) -)
-        (field (name Manufacturer) -)
-        (field (name Package) 0805)
-        (field (name Notes) -)
-        (field (name Price) "0.1 €"))
-      (libsource (lib device) (part C_Small))
+        (field (name Mnf.) CC0805KKX7R7BB105)
+        (field (name Price) 0.085))
+      (libsource (lib encoder_as5601-cache) (part C_Small))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9ACF0))
     (comp (ref P1)
       (value CONN_02X05)
       (footprint Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm)
-      (datasheet https://cdn.sparkfun.com/datasheets/Prototyping/01103.pdf)
       (fields
-        (field (name Distributor) "SparkFun COM-12792")
-        (field (name Manufacturer) -)
-        (field (name Package) "2x40 pin right-angle PTH pitch 2.54")
-        (field (name Notes) -)
-        (field (name Price) 1.85€))
+        (field (name Mnf.) Amphenol-861400402YO2LF)
+        (field (name Price) 1.18))
       (libsource (lib encoder_as5601-cache) (part CONN_02X05))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9CF83))
     (comp (ref R1)
       (value 4k7)
       (footprint Resistors_SMD:R_0805_HandSoldering)
-      (datasheet -)
       (fields
-        (field (name Distributor) -)
-        (field (name Manufacturer) -)
-        (field (name Package) 0805)
-        (field (name Notes) -)
-        (field (name Price) "0.1 €"))
-      (libsource (lib device) (part R))
+        (field (name Mnf.) CRCW08054K70JNEA)
+        (field (name Price) 0.091))
+      (libsource (lib encoder_as5601-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9DE8B))
     (comp (ref R2)
       (value 4k7)
       (footprint Resistors_SMD:R_0805_HandSoldering)
-      (datasheet -)
       (fields
-        (field (name Distributor) -)
-        (field (name Manufacturer) -)
-        (field (name Package) 0805)
-        (field (name Notes) -)
-        (field (name Price) "0.1 €"))
-      (libsource (lib device) (part R))
+        (field (name Mnf.) CRCW08054K70JNEA)
+        (field (name Price) 0.091))
+      (libsource (lib encoder_as5601-cache) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56B9DECB))
     (comp (ref Q1)
       (value Q_NMOS_GSD)
       (footprint TO_SOT_Packages_SMD:SOT-23_Handsoldering)
-      (datasheet http://www.mouser.com/ds/2/427/SI2312CD-244454.pdf)
       (fields
-        (field (name Distributor) "Mouser 781-SI2312CDS-T1-GE3")
-        (field (name Manufacturer) SI2312CDS-T1-GE3)
-        (field (name Package) SOT-23-3)
-        (field (name Notes) -)
+        (field (name Mnf.) SI2312CDS-T1-GE3)
         (field (name Price) 0.398))
-      (libsource (lib device) (part Q_NMOS_GSD))
+      (libsource (lib encoder_as5601-cache) (part Q_NMOS_GSD))
       (sheetpath (names /) (tstamps /))
       (tstamp 5703C90F)))
   (libparts
@@ -140,8 +112,7 @@
         (pin (num 8) (name P8) (type passive))
         (pin (num 9) (name P9) (type passive))
         (pin (num 10) (name P10) (type passive))))
-    (libpart (lib device) (part C_Small)
-      (description "Unpolarized capacitor")
+    (libpart (lib encoder_as5601-cache) (part C_Small)
       (footprints
         (fp C_*))
       (fields
@@ -150,8 +121,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part Q_NMOS_GSD)
-      (description "Transistor N-MOSFETwith substrate diode (general)")
+    (libpart (lib encoder_as5601-cache) (part Q_NMOS_GSD)
       (fields
         (field (name Reference) Q)
         (field (name Value) Q_NMOS_GSD))
@@ -159,8 +129,7 @@
         (pin (num 1) (name G) (type input))
         (pin (num 2) (name S) (type passive))
         (pin (num 3) (name D) (type passive))))
-    (libpart (lib device) (part R)
-      (description Resistor)
+    (libpart (lib encoder_as5601-cache) (part R)
       (footprints
         (fp R_*)
         (fp R_*))
@@ -174,9 +143,7 @@
     (library (logical encoder_as5601-cache)
       (uri /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_encoder/encoder_as5601/encoder_as5601-cache.lib))
     (library (logical encoder_as5601-rescue)
-      (uri /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_encoder/encoder_as5601/encoder_as5601-rescue.lib))
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib)))
+      (uri /home/azisi/Documents/SatNOGS/satnogs-rotator-controller/satnogs_encoder/encoder_as5601/encoder_as5601-rescue.lib)))
   (nets
     (net (code 1) (name +5V)
       (node (ref Q1) (pin 1))
diff --git a/satnogs_encoder/encoder_as5601/encoder_as5601.sch b/satnogs_encoder/encoder_as5601/encoder_as5601.sch
index bc60fb6..c743ffa 100644
--- a/satnogs_encoder/encoder_as5601/encoder_as5601.sch
+++ b/satnogs_encoder/encoder_as5601/encoder_as5601.sch
@@ -1,45 +1,16 @@
 EESchema Schematic File Version 2
 LIBS:encoder_as5601-rescue
 LIBS:satnogs
-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:encoder_as5601-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
-Title ""
-Date ""
+Title "AS5601 - Encoder"
+Date "2018-01-21"
 Rev ""
-Comp ""
+Comp "Libre Space Foundation"
 Comment1 ""
 Comment2 ""
 Comment3 ""
@@ -52,12 +23,9 @@ P 5510 3460
 F 0 "U1" H 5510 3460 60  0000 C CNN
 F 1 "AS5601" H 5510 3160 60  0000 C CNN
 F 2 "Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm" H 5510 3460 60  0001 C CNN
-F 3 "www.mouser.com/ds/2/588/AS5601_Datasheet-771178.pdf" H 5510 3460 60  0001 C CNN
-F 4 "Mouser 985-AS5601-ASOM" H 5510 3460 60  0001 C CNN "Distributor"
-F 5 "AS5601-ASOM" H 5510 3460 60  0001 C CNN "Manufacturer"
-F 6 "SOIC-8" H 5510 3460 60  0001 C CNN "Package"
-F 7 "-" H 5510 3460 60  0001 C CNN "Notes"
-F 8 "2.78€" H 5510 3460 60  0001 C CNN "Price"
+F 3 "" H 5510 3460 60  0001 C CNN
+F 4 "AS5601-ASOM" H 5510 3460 60  0001 C CNN "Mnf."
+F 5 "2.78" H 5510 3460 60  0001 C CNN "Price"
 	1    5510 3460
 	1    0    0    -1  
 $EndComp
@@ -71,12 +39,9 @@ P 4110 3560
 F 0 "C1" H 4120 3630 50  0000 L CNN
 F 1 "100n" H 4120 3480 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4110 3560 50  0001 C CNN
-F 3 "-" H 4110 3560 50  0001 C CNN
-F 4 "-" H 4110 3560 60  0001 C CNN "Distributor"
-F 5 "-" H 4110 3560 60  0001 C CNN "Manufacturer"
-F 6 "0805" H 4110 3560 60  0001 C CNN "Package"
-F 7 "-" H 4110 3560 60  0001 C CNN "Notes"
-F 8 "0.1€" H 4110 3560 60  0001 C CNN "Price"
+F 3 "" H 4110 3560 50  0001 C CNN
+F 4 "08053C104KAT2A" H 4110 3560 60  0001 C CNN "Mnf."
+F 5 "0.09" H 4110 3560 60  0001 C CNN "Price"
 	1    4110 3560
 	1    0    0    -1  
 $EndComp
@@ -87,12 +52,9 @@ P 4710 3560
 F 0 "C2" H 4720 3630 50  0000 L CNN
 F 1 "1u" H 4720 3480 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4710 3560 50  0001 C CNN
-F 3 "-" H 4710 3560 50  0001 C CNN
-F 4 "-" H 4710 3560 60  0001 C CNN "Distributor"
-F 5 "-" H 4710 3560 60  0001 C CNN "Manufacturer"
-F 6 "0805" H 4710 3560 60  0001 C CNN "Package"
-F 7 "-" H 4710 3560 60  0001 C CNN "Notes"
-F 8 "0.1 €" H 4710 3560 60  0001 C CNN "Price"
+F 3 "" H 4710 3560 50  0001 C CNN
+F 4 "CC0805KKX7R7BB105" H 4710 3560 60  0001 C CNN "Mnf."
+F 5 "0.085" H 4710 3560 60  0001 C CNN "Price"
 	1    4710 3560
 	1    0    0    -1  
 $EndComp
@@ -140,12 +102,9 @@ P 5510 4610
 F 0 "P1" H 5510 4910 50  0000 C CNN
 F 1 "CONN_02X05" H 5510 4310 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch2.54mm" H 5510 3410 50  0001 C CNN
-F 3 "https://cdn.sparkfun.com/datasheets/Prototyping/01103.pdf" H 5510 3410 50  0001 C CNN
-F 4 "SparkFun COM-12792" H 5510 4610 60  0001 C CNN "Distributor"
-F 5 "-" H 5510 4610 60  0001 C CNN "Manufacturer"
-F 6 "2x40 pin right-angle PTH pitch 2.54" H 5510 4610 60  0001 C CNN "Package"
-F 7 "-" H 5510 4610 60  0001 C CNN "Notes"
-F 8 "1.85€" H 5510 4610 60  0001 C CNN "Price"
+F 3 "" H 5510 3410 50  0001 C CNN
+F 4 "Amphenol-861400402YO2LF" H 5510 4610 60  0001 C CNN "Mnf."
+F 5 "1.18" H 5510 4610 60  0001 C CNN "Price"
 	1    5510 4610
 	-1   0    0    1   
 $EndComp
@@ -225,12 +184,9 @@ P 6410 3160
 F 0 "R1" V 6490 3160 50  0000 C CNN
 F 1 "4k7" V 6410 3160 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 6340 3160 50  0001 C CNN
-F 3 "-" H 6410 3160 50  0001 C CNN
-F 4 "-" V 6410 3160 60  0001 C CNN "Distributor"
-F 5 "-" V 6410 3160 60  0001 C CNN "Manufacturer"
-F 6 "0805" V 6410 3160 60  0001 C CNN "Package"
-F 7 "-" V 6410 3160 60  0001 C CNN "Notes"
-F 8 "0.1 €" V 6410 3160 60  0001 C CNN "Price"
+F 3 "" H 6410 3160 50  0001 C CNN
+F 4 "CRCW08054K70JNEA" V 6410 3160 60  0001 C CNN "Mnf."
+F 5 "0.091" V 6410 3160 60  0001 C CNN "Price"
 	1    6410 3160
 	1    0    0    -1  
 $EndComp
@@ -241,12 +197,9 @@ P 6710 3160
 F 0 "R2" V 6790 3160 50  0000 C CNN
 F 1 "4k7" V 6710 3160 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 6640 3160 50  0001 C CNN
-F 3 "-" H 6710 3160 50  0001 C CNN
-F 4 "-" V 6710 3160 60  0001 C CNN "Distributor"
-F 5 "-" V 6710 3160 60  0001 C CNN "Manufacturer"
-F 6 "0805" V 6710 3160 60  0001 C CNN "Package"
-F 7 "-" V 6710 3160 60  0001 C CNN "Notes"
-F 8 "0.1 €" V 6710 3160 60  0001 C CNN "Price"
+F 3 "" H 6710 3160 50  0001 C CNN
+F 4 "CRCW08054K70JNEA" V 6710 3160 60  0001 C CNN "Mnf."
+F 5 "0.091" V 6710 3160 60  0001 C CNN "Price"
 	1    6710 3160
 	1    0    0    -1  
 $EndComp
@@ -333,12 +286,9 @@ P 6315 4610
 F 0 "Q1" H 6615 4660 50  0000 R CNN
 F 1 "Q_NMOS_GSD" H 6965 4560 50  0000 R CNN
 F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 6515 4710 50  0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/SI2312CD-244454.pdf" H 6315 4610 50  0001 C CNN
-F 4 "Mouser 781-SI2312CDS-T1-GE3" H 6315 4610 60  0001 C CNN "Distributor"
-F 5 "SI2312CDS-T1-GE3" H 6315 4610 60  0001 C CNN "Manufacturer"
-F 6 "SOT-23-3" H 6315 4610 60  0001 C CNN "Package"
-F 7 "-" H 6315 4610 60  0001 C CNN "Notes"
-F 8 "0.398" H 6315 4610 60  0001 C CNN "Price"
+F 3 "" H 6315 4610 50  0001 C CNN
+F 4 "SI2312CDS-T1-GE3" H 6315 4610 60  0001 C CNN "Mnf."
+F 5 "0.398" H 6315 4610 60  0001 C CNN "Price"
 	1    6315 4610
 	0    -1   1    0   
 $EndComp
diff --git a/satnogs_encoder/encoder_as5601/encoder_as5601.xml b/satnogs_encoder/encoder_as5601/encoder_as5601.xml
deleted file mode 100644
index 604ad5f..0000000
--- a/satnogs_encoder/encoder_as5601/encoder_as5601.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<export version="D">
-  <design>
-    <source>/home/azisi/Documents/SatNOGS/satnogs-rotator-controller/PCB/SatNOGS_Encoder/encoder_as5601/encoder_as5601.sch</source>
-    <date>Sat 09 Apr 2016 00:48:51 EEST</date>
-    <tool>Eeschema 4.0.2-stable</tool>
-    <sheet number="1" name="/" tstamps="/">
-      <title_block>
-        <title/>
-        <company/>
-        <rev/>
-        <date/>
-        <source>encoder_as5601.sch</source>
-        <comment number="1" value=""/>
-        <comment number="2" value=""/>
-        <comment number="3" value=""/>
-        <comment number="4" value=""/>
-      </title_block>
-    </sheet>
-  </design>
-  <components>
-    <comp ref="U1">
-      <value>AS5601</value>
-      <footprint>Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm</footprint>
-      <datasheet>www.mouser.com/ds/2/588/AS5601_Datasheet-771178.pdf</datasheet>
-      <fields>
-        <field name="Distributor">Mouser 985-AS5601-ASOM</field>
-        <field name="Manufacturer">AS5601-ASOM</field>
-        <field name="Package">SOIC-8</field>
-        <field name="Notes">-</field>
-        <field name="Price">2.78€</field>
-      </fields>
-      <libsource lib="satnogs" part="AS5601"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9A895</tstamp>
-    </comp>
-    <comp ref="C1">
-      <value>100n</value>
-      <footprint>Capacitors_SMD:C_0805_HandSoldering</footprint>
-      <datasheet>-</datasheet>
-      <fields>
-        <field name="Distributor">-</field>
-        <field name="Manufacturer">-</field>
-        <field name="Package">0805</field>
-        <field name="Notes">-</field>
-        <field name="Price">0.1€</field>
-      </fields>
-      <libsource lib="device" part="C_Small"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9AC87</tstamp>
-    </comp>
-    <comp ref="C2">
-      <value>1u</value>
-      <footprint>Capacitors_SMD:C_0805_HandSoldering</footprint>
-      <datasheet>-</datasheet>
-      <fields>
-        <field name="Distributor">-</field>
-        <field name="Manufacturer">-</field>
-        <field name="Package">0805</field>
-        <field name="Notes">-</field>
-        <field name="Price">0.1 €</field>
-      </fields>
-      <libsource lib="device" part="C_Small"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9ACF0</tstamp>
-    </comp>
-    <comp ref="P1">
-      <value>CONN_02X05</value>
-      <footprint>Pin_Headers:Pin_Header_Straight_2x05</footprint>
-      <datasheet>https://cdn.sparkfun.com/datasheets/Prototyping/01103.pdf</datasheet>
-      <fields>
-        <field name="Distributor">SparkFun COM-12792</field>
-        <field name="Manufacturer">-</field>
-        <field name="Package">2x40 pin right-angle PTH pitch 2.54</field>
-        <field name="Notes">-</field>
-        <field name="Price">1.85€</field>
-      </fields>
-      <libsource lib="conn" part="CONN_02X05"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9CF83</tstamp>
-    </comp>
-    <comp ref="R1">
-      <value>4k7</value>
-      <footprint>Resistors_SMD:R_0805_HandSoldering</footprint>
-      <datasheet>-</datasheet>
-      <fields>
-        <field name="Distributor">-</field>
-        <field name="Manufacturer">-</field>
-        <field name="Package">0805</field>
-        <field name="Notes">-</field>
-        <field name="Price">0.1 €</field>
-      </fields>
-      <libsource lib="device" part="R"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9DE8B</tstamp>
-    </comp>
-    <comp ref="R2">
-      <value>4k7</value>
-      <footprint>Resistors_SMD:R_0805_HandSoldering</footprint>
-      <datasheet>-</datasheet>
-      <fields>
-        <field name="Distributor">-</field>
-        <field name="Manufacturer">-</field>
-        <field name="Package">0805</field>
-        <field name="Notes">-</field>
-        <field name="Price">0.1 €</field>
-      </fields>
-      <libsource lib="device" part="R"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>56B9DECB</tstamp>
-    </comp>
-    <comp ref="Q1">
-      <value>Q_NMOS_GSD</value>
-      <footprint>TO_SOT_Packages_SMD:SOT-23_Handsoldering</footprint>
-      <datasheet>http://www.mouser.com/ds/2/427/SI2312CD-244454.pdf</datasheet>
-      <fields>
-        <field name="Distributor">Mouser 781-SI2312CDS-T1-GE3</field>
-        <field name="Manufacturer">SI2312CDS-T1-GE3</field>
-        <field name="Package">SOT-23-3</field>
-        <field name="Notes">-</field>
-        <field name="Price">0.398</field>
-      </fields>
-      <libsource lib="device" part="Q_NMOS_GSD"/>
-      <sheetpath names="/" tstamps="/"/>
-      <tstamp>5703C90F</tstamp>
-    </comp>
-  </components>
-  <libparts>
-    <libpart lib="satnogs" part="AS5601">
-      <fields>
-        <field name="Reference">U</field>
-        <field name="Value">AS5601</field>
-      </fields>
-      <pins>
-        <pin num="1" name="5V" type="power_in"/>
-        <pin num="2" name="3V3" type="power_in"/>
-        <pin num="3" name="PUSH" type="output"/>
-        <pin num="4" name="GND" type="power_in"/>
-        <pin num="5" name="B" type="output"/>
-        <pin num="6" name="SDA" type="BiDi"/>
-        <pin num="7" name="SCL" type="input"/>
-        <pin num="8" name="A" type="output"/>
-      </pins>
-    </libpart>
-    <libpart lib="conn" part="CONN_02X05">
-      <description>Connector 02x05</description>
-      <footprints>
-        <fp>Pin_Header_Straight_2X05</fp>
-        <fp>Pin_Header_Angled_2X05</fp>
-        <fp>Socket_Strip_Straight_2X05</fp>
-        <fp>Socket_Strip_Angled_2X05</fp>
-      </footprints>
-      <fields>
-        <field name="Reference">P</field>
-        <field name="Value">CONN_02X05</field>
-      </fields>
-      <pins>
-        <pin num="1" name="P1" type="passive"/>
-        <pin num="2" name="P2" type="passive"/>
-        <pin num="3" name="P3" type="passive"/>
-        <pin num="4" name="P4" type="passive"/>
-        <pin num="5" name="P5" type="passive"/>
-        <pin num="6" name="P6" type="passive"/>
-        <pin num="7" name="P7" type="passive"/>
-        <pin num="8" name="P8" type="passive"/>
-        <pin num="9" name="P9" type="passive"/>
-        <pin num="10" name="P10" type="passive"/>
-      </pins>
-    </libpart>
-    <libpart lib="device" part="C_Small">
-      <description>Unpolarized capacitor</description>
-      <footprints>
-        <fp>C?</fp>
-        <fp>C_????_*</fp>
-        <fp>C_????</fp>
-        <fp>SMD*_c</fp>
-        <fp>Capacitor*</fp>
-      </footprints>
-      <fields>
-        <field name="Reference">C</field>
-        <field name="Value">C_Small</field>
-      </fields>
-      <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
-      </pins>
-    </libpart>
-    <libpart lib="device" part="Q_NMOS_GSD">
-      <description>Transistor N-MOSFET (general)</description>
-      <fields>
-        <field name="Reference">Q</field>
-        <field name="Value">Q_NMOS_GSD</field>
-      </fields>
-      <pins>
-        <pin num="1" name="G" type="input"/>
-        <pin num="2" name="S" type="passive"/>
-        <pin num="3" name="D" type="passive"/>
-      </pins>
-    </libpart>
-    <libpart lib="device" part="R">
-      <description>Resistor</description>
-      <footprints>
-        <fp>R_*</fp>
-        <fp>Resistor_*</fp>
-      </footprints>
-      <fields>
-        <field name="Reference">R</field>
-        <field name="Value">R</field>
-      </fields>
-      <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
-      </pins>
-    </libpart>
-  </libparts>
-  <libraries>
-    <library logical="satnogs">
-      <uri>/home/azisi/Documents/SatNOGS/satnogs-rotator-controller/PCB/library/satnogs.lib</uri>
-    </library>
-    <library logical="conn">
-      <uri>/usr/share/kicad/library/conn.lib</uri>
-    </library>
-    <library logical="device">
-      <uri>/usr/share/kicad/library/device.lib</uri>
-    </library>
-  </libraries>
-  <nets>
-    <net code="1" name="+5V">
-      <node ref="Q1" pin="1"/>
-      <node ref="P1" pin="2"/>
-      <node ref="P1" pin="4"/>
-      <node ref="C1" pin="1"/>
-      <node ref="U1" pin="1"/>
-      <node ref="P1" pin="6"/>
-      <node ref="R2" pin="1"/>
-      <node ref="R1" pin="1"/>
-    </net>
-    <net code="2" name="Net-(P1-Pad1)">
-      <node ref="P1" pin="3"/>
-      <node ref="P1" pin="1"/>
-      <node ref="Q1" pin="3"/>
-      <node ref="P1" pin="5"/>
-    </net>
-    <net code="3" name="/SCL">
-      <node ref="U1" pin="7"/>
-      <node ref="P1" pin="10"/>
-      <node ref="P1" pin="8"/>
-      <node ref="R1" pin="2"/>
-    </net>
-    <net code="4" name="/SDA">
-      <node ref="P1" pin="7"/>
-      <node ref="P1" pin="9"/>
-      <node ref="U1" pin="6"/>
-      <node ref="R2" pin="2"/>
-    </net>
-    <net code="5" name="GND">
-      <node ref="Q1" pin="2"/>
-      <node ref="C1" pin="2"/>
-      <node ref="U1" pin="4"/>
-      <node ref="C2" pin="2"/>
-    </net>
-    <net code="6" name="Net-(U1-Pad3)">
-      <node ref="U1" pin="3"/>
-    </net>
-    <net code="7" name="Net-(U1-Pad5)">
-      <node ref="U1" pin="5"/>
-    </net>
-    <net code="8" name="Net-(U1-Pad8)">
-      <node ref="U1" pin="8"/>
-    </net>
-    <net code="9" name="Net-(C2-Pad1)">
-      <node ref="U1" pin="2"/>
-      <node ref="C2" pin="1"/>
-    </net>
-  </nets>
-</export>