diff --git a/bmi-8ch-cache.lib b/bmi-8ch-cache.lib
index 879825e..01dddc0 100644
--- a/bmi-8ch-cache.lib
+++ b/bmi-8ch-cache.lib
@@ -187,6 +187,27 @@ X GNDA 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+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 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 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
+#
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
@@ -281,6 +302,30 @@ X ~ 2 0 -100 30 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SW_SP3T
+#
+DEF SW_SP3T SW 0 0 Y N 1 F N
+F0 "SW" 0 200 50 H V C CNN
+F1 "SW_SP3T" 0 -200 50 H V C CNN
+F2 "" -625 175 50 H I C CNN
+F3 "" -625 175 50 H I C CNN
+$FPLIST
+ SW*
+ SP3T*
+$ENDFPLIST
+DRAW
+C -80 0 18 0 1 0 N
+C 80 -100 18 0 1 0 N
+C 80 0 18 0 1 0 N
+C 80 100 18 0 1 0 N
+P 2 0 1 0 -65 10 65 90 N
+X 1 1 200 100 100 L 50 50 1 1 P
+X 2 2 200 0 100 L 50 50 1 1 P
+X 3 3 -200 0 100 R 50 50 1 1 P
+X 4 4 200 -100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # TEST_1P
 #
 DEF TEST_1P J 0 30 N N 1 F N
diff --git a/bmi-8ch.pro b/bmi-8ch.pro
index a6c9bd7..9b80939 100644
--- a/bmi-8ch.pro
+++ b/bmi-8ch.pro
@@ -1,4 +1,4 @@
-update=Fri 31 Mar 2017 01:02:37 PM EDT
+update=Fri 31 Mar 2017 04:20:35 PM EDT
 version=1
 last_client=kicad
 [cvpcb]
@@ -6,9 +6,38 @@ version=1
 NetIExt=net
 [general]
 version=1
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=bmi-8ch.net
+PadDrill=0.762
+PadDrillOvalY=0.762
+PadSizeH=1.524
+PadSizeV=1.524
+PcbTextSizeV=1.5
+PcbTextSizeH=1.5
+PcbTextThickness=0.3
+ModuleTextSizeV=1
+ModuleTextSizeH=1
+ModuleTextSizeThickness=0.15
+SolderMaskClearance=0.1778
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.2
+BoardOutlineThickness=0.15
+ModuleOutlineThickness=0.15
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=/home/nock/devel/bmi/bmi-8ch/pdf/
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=Pcbnew
+SpiceForceRefPrefix=0
+SpiceUseNetNumbers=0
+LabSize=60
 [eeschema]
 version=1
-LibDir=../../kicad/symbols
+LibDir=../../kicad/symbols;../../kicad-library/library
 [eeschema/libraries]
 LibName1=power
 LibName2=device
@@ -40,32 +69,4 @@ LibName27=atmel
 LibName28=contrib
 LibName29=valves
 LibName30=/home/nock/devel/kicad/symbols/nocko
-[pcbnew]
-version=1
-PageLayoutDescrFile=
-LastNetListRead=bmi-8ch.net
-PadDrill=0.762
-PadDrillOvalY=0.762
-PadSizeH=1.524
-PadSizeV=1.524
-PcbTextSizeV=1.5
-PcbTextSizeH=1.5
-PcbTextThickness=0.3
-ModuleTextSizeV=1
-ModuleTextSizeH=1
-ModuleTextSizeThickness=0.15
-SolderMaskClearance=0.1778
-SolderMaskMinWidth=0
-DrawSegmentWidth=0.2
-BoardOutlineThickness=0.15
-ModuleOutlineThickness=0.15
-[schematic_editor]
-version=1
-PageLayoutDescrFile=
-PlotDirectoryName=/home/nock/devel/bmi/bmi-8ch/pdf/
-SubpartIdSeparator=0
-SubpartFirstId=65
-NetFmtName=Pcbnew
-SpiceForceRefPrefix=0
-SpiceUseNetNumbers=0
-LabSize=60
+LibName31=/home/nock/devel/kicad-library/library/switches
diff --git a/bmi-8ch.sch b/bmi-8ch.sch
index 62a9377..c7eb782 100644
--- a/bmi-8ch.sch
+++ b/bmi-8ch.sch
@@ -29,6 +29,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:nocko
+LIBS:switches
 LIBS:bmi-8ch-cache
 EELAYER 25 0
 EELAYER END
@@ -92,15 +93,15 @@ F 3 "" H 4670 1730 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG01
+L PWR_FLAG #FLG101
 U 1 1 58D603F8
-P 5620 1680
-F 0 "#FLG01" H 5620 1755 50  0001 C CNN
-F 1 "PWR_FLAG" H 5420 1780 50  0001 C CNN
-F 2 "" H 5620 1680 50  0001 C CNN
-F 3 "" H 5620 1680 50  0001 C CNN
-	1    5620 1680
-	-1   0    0    1   
+P 6020 1580
+F 0 "#FLG101" H 6020 1655 50  0001 C CNN
+F 1 "PWR_FLAG" H 5820 1680 50  0001 C CNN
+F 2 "" H 6020 1580 50  0001 C CNN
+F 3 "" H 6020 1580 50  0001 C CNN
+	1    6020 1580
+	0    1    1    0   
 $EndComp
 $Sheet
 S 1230 3090 950  480 
@@ -171,10 +172,10 @@ F 3 "" H 9490 1480 50  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR02
+L GNDA #PWR103
 U 1 1 58D7085C
 P 9190 2080
-F 0 "#PWR02" H 9190 1830 50  0001 C CNN
+F 0 "#PWR103" H 9190 1830 50  0001 C CNN
 F 1 "GNDA" H 9190 1930 50  0000 C CNN
 F 2 "" H 9190 2080 50  0001 C CNN
 F 3 "" H 9190 2080 50  0001 C CNN
@@ -206,10 +207,10 @@ F 3 "" H 3170 3740 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR03
+L GNDA #PWR105
 U 1 1 58D76D50
 P 2970 3390
-F 0 "#PWR03" H 2970 3140 50  0001 C CNN
+F 0 "#PWR105" H 2970 3140 50  0001 C CNN
 F 1 "GNDA" H 2970 3240 50  0000 C CNN
 F 2 "" H 2970 3390 50  0001 C CNN
 F 3 "" H 2970 3390 50  0001 C CNN
@@ -217,10 +218,10 @@ F 3 "" H 2970 3390 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDA #PWR04
+L GNDA #PWR106
 U 1 1 58D76DD7
 P 2970 3690
-F 0 "#PWR04" H 2970 3440 50  0001 C CNN
+F 0 "#PWR106" H 2970 3440 50  0001 C CNN
 F 1 "GNDA" H 2970 3540 50  0000 C CNN
 F 2 "" H 2970 3690 50  0001 C CNN
 F 3 "" H 2970 3690 50  0001 C CNN
@@ -228,10 +229,10 @@ F 3 "" H 2970 3690 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDA #PWR05
+L GNDA #PWR110
 U 1 1 58D77F82
 P 2970 4290
-F 0 "#PWR05" H 2970 4040 50  0001 C CNN
+F 0 "#PWR110" H 2970 4040 50  0001 C CNN
 F 1 "GNDA" H 2970 4140 50  0000 C CNN
 F 2 "" H 2970 4290 50  0001 C CNN
 F 3 "" H 2970 4290 50  0001 C CNN
@@ -239,10 +240,10 @@ F 3 "" H 2970 4290 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDA #PWR06
+L GNDA #PWR108
 U 1 1 58D78218
 P 2970 3990
-F 0 "#PWR06" H 2970 3740 50  0001 C CNN
+F 0 "#PWR108" H 2970 3740 50  0001 C CNN
 F 1 "GNDA" H 2970 3840 50  0000 C CNN
 F 2 "" H 2970 3990 50  0001 C CNN
 F 3 "" H 2970 3990 50  0001 C CNN
@@ -250,10 +251,10 @@ F 3 "" H 2970 3990 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L V+ #PWR07
+L V+ #PWR104
 U 1 1 58D7E8FC
 P 4720 3310
-F 0 "#PWR07" H 4720 3160 50  0001 C CNN
+F 0 "#PWR104" H 4720 3160 50  0001 C CNN
 F 1 "V+" H 4720 3450 50  0000 C CNN
 F 2 "" H 4720 3310 50  0000 C CNN
 F 3 "" H 4720 3310 50  0000 C CNN
@@ -261,10 +262,10 @@ F 3 "" H 4720 3310 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR08
+L V- #PWR109
 U 1 1 58D7EC90
 P 4720 4210
-F 0 "#PWR08" H 4720 4060 50  0001 C CNN
+F 0 "#PWR109" H 4720 4060 50  0001 C CNN
 F 1 "V-" H 4720 4350 50  0000 C CNN
 F 2 "" H 4720 4210 50  0000 C CNN
 F 3 "" H 4720 4210 50  0000 C CNN
@@ -272,10 +273,10 @@ F 3 "" H 4720 4210 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR09
+L GNDA #PWR107
 U 1 1 58D7EF65
 P 6920 3810
-F 0 "#PWR09" H 6920 3560 50  0001 C CNN
+F 0 "#PWR107" H 6920 3560 50  0001 C CNN
 F 1 "GNDA" H 6920 3660 50  0000 C CNN
 F 2 "" H 6920 3810 50  0001 C CNN
 F 3 "" H 6920 3810 50  0001 C CNN
@@ -294,21 +295,21 @@ F 3 "" H 5770 3810 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR010
+L V+ #PWR101
 U 1 1 58D80748
-P 5620 1680
-F 0 "#PWR010" H 5620 1530 50  0001 C CNN
-F 1 "V+" H 5620 1820 50  0000 C CNN
-F 2 "" H 5620 1680 50  0000 C CNN
-F 3 "" H 5620 1680 50  0000 C CNN
-	1    5620 1680
+P 6020 1580
+F 0 "#PWR101" H 6020 1430 50  0001 C CNN
+F 1 "V+" H 6020 1720 50  0000 C CNN
+F 2 "" H 6020 1580 50  0000 C CNN
+F 3 "" H 6020 1580 50  0000 C CNN
+	1    6020 1580
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR011
+L V- #PWR102
 U 1 1 58D807E6
 P 5620 2080
-F 0 "#PWR011" H 5620 1930 50  0001 C CNN
+F 0 "#PWR102" H 5620 1930 50  0001 C CNN
 F 1 "V-" H 5620 2220 50  0000 C CNN
 F 2 "" H 5620 2080 50  0000 C CNN
 F 3 "" H 5620 2080 50  0000 C CNN
@@ -327,10 +328,10 @@ F 3 "" H 8950 5670 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR012
+L V+ #PWR111
 U 1 1 58D81C02
 P 8900 5420
-F 0 "#PWR012" H 8900 5270 50  0001 C CNN
+F 0 "#PWR111" H 8900 5270 50  0001 C CNN
 F 1 "V+" H 8900 5560 50  0000 C CNN
 F 2 "" H 8900 5420 50  0000 C CNN
 F 3 "" H 8900 5420 50  0000 C CNN
@@ -338,10 +339,10 @@ F 3 "" H 8900 5420 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR013
+L V- #PWR113
 U 1 1 58D81C79
 P 8900 5920
-F 0 "#PWR013" H 8900 5770 50  0001 C CNN
+F 0 "#PWR113" H 8900 5770 50  0001 C CNN
 F 1 "V-" H 8900 6060 50  0000 C CNN
 F 2 "" H 8900 5920 50  0000 C CNN
 F 3 "" H 8900 5920 50  0000 C CNN
@@ -349,10 +350,10 @@ F 3 "" H 8900 5920 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR014
+L GNDA #PWR112
 U 1 1 58D81D91
 P 8650 5570
-F 0 "#PWR014" H 8650 5320 50  0001 C CNN
+F 0 "#PWR112" H 8650 5320 50  0001 C CNN
 F 1 "GNDA" H 8650 5420 50  0000 C CNN
 F 2 "" H 8650 5570 50  0001 C CNN
 F 3 "" H 8650 5570 50  0001 C CNN
@@ -362,10 +363,10 @@ $EndComp
 Text Notes 8380 5270 0    60   ~ 0
 Unused
 $Comp
-L PWR_FLAG #FLG015
+L PWR_FLAG #FLG102
 U 1 1 58D93F01
 P 5620 2080
-F 0 "#FLG015" H 5620 2155 50  0001 C CNN
+F 0 "#FLG102" H 5620 2155 50  0001 C CNN
 F 1 "PWR_FLAG" H 5420 2180 50  0001 C CNN
 F 2 "" H 5620 2080 50  0001 C CNN
 F 3 "" H 5620 2080 50  0001 C CNN
@@ -445,7 +446,7 @@ Wire Wire Line
 	6070 3810 6920 3810
 Connection ~ 6720 3810
 Wire Wire Line
-	4870 2080 5620 2080
+	4870 2080 6490 2080
 Connection ~ 5720 4210
 Connection ~ 6320 3810
 Wire Wire Line
@@ -526,4 +527,45 @@ Wire Wire Line
 	4720 3310 6470 3310
 Wire Wire Line
 	4720 4210 6470 4210
+$Comp
+L SW_SP3T SW101
+U 1 1 58DEFA27
+P 5820 1680
+F 0 "SW101" H 5710 1770 50  0000 C CNN
+F 1 "SW_SP3T" H 5710 1560 50  0000 C CNN
+F 2 "" H 5195 1855 50  0001 C CNN
+F 3 "" H 5195 1855 50  0001 C CNN
+	1    5820 1680
+	1    0    0    -1  
+$EndComp
+NoConn ~ 6020 1780
+$Comp
+L LED D102
+U 1 1 58DF01CB
+P 6340 1680
+F 0 "D102" H 6340 1780 50  0000 C CNN
+F 1 "LED" H 6340 1580 50  0000 C CNN
+F 2 "" H 6340 1680 50  0001 C CNN
+F 3 "" H 6340 1680 50  0001 C CNN
+	1    6340 1680
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R101
+U 1 1 58DF037A
+P 6490 1880
+F 0 "R101" V 6570 1880 50  0000 C CNN
+F 1 "1.4k" V 6490 1880 50  0000 C CNN
+F 2 "" V 6420 1880 50  0001 C CNN
+F 3 "" H 6490 1880 50  0001 C CNN
+	1    6490 1880
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6490 1730 6490 1680
+Wire Wire Line
+	6020 1680 6190 1680
+Wire Wire Line
+	6490 2080 6490 2030
+Connection ~ 5620 2080
 $EndSCHEMATC
diff --git a/channel0.sch b/channel0.sch
index 656e72c..dfbfc3d 100644
--- a/channel0.sch
+++ b/channel0.sch
@@ -29,6 +29,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:nocko
+LIBS:switches
 LIBS:bmi-8ch-cache
 EELAYER 25 0
 EELAYER END
@@ -83,7 +84,7 @@ U 1 1 58D46616
 P 900 1200
 F 0 "J201" H 830 1040 50  0000 C CNN
 F 1 "Sensor" V 1000 1200 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
 F 3 "" H 900 1200 50  0001 C CNN
 	1    900  1200
 	-1   0    0    -1  
@@ -94,7 +95,7 @@ U 1 1 58D47450
 P 2200 1400
 F 0 "C206" V 2250 1450 50  0000 L CNN
 F 1 "0.1µF" V 2050 1300 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1250 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1250 50  0001 C CNN
 F 3 "" H 2200 1400 50  0001 C CNN
 	1    2200 1400
 	0    1    1    0   
@@ -105,7 +106,7 @@ U 1 1 58D47535
 P 2200 1800
 F 0 "C208" V 2150 1850 50  0000 L CNN
 F 1 "0.1µF" V 2350 1700 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1650 50  0001 C CNN
 F 3 "" H 2200 1800 50  0001 C CNN
 	1    2200 1800
 	0    1    1    0   
@@ -373,10 +374,10 @@ $EndComp
 Connection ~ 4400 1600
 Connection ~ 8650 1700
 $Comp
-L V+ #PWR016
+L V+ #PWR204
 U 1 1 58D823EA
 P 3250 1300
-F 0 "#PWR016" H 3250 1150 50  0001 C CNN
+F 0 "#PWR204" H 3250 1150 50  0001 C CNN
 F 1 "V+" H 3250 1440 50  0000 C CNN
 F 2 "" H 3250 1300 50  0000 C CNN
 F 3 "" H 3250 1300 50  0000 C CNN
@@ -384,10 +385,10 @@ F 3 "" H 3250 1300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR017
+L V- #PWR208
 U 1 1 58D82473
 P 3250 1900
-F 0 "#PWR017" H 3250 1750 50  0001 C CNN
+F 0 "#PWR208" H 3250 1750 50  0001 C CNN
 F 1 "V-" H 3250 2040 50  0000 C CNN
 F 2 "" H 3250 1900 50  0000 C CNN
 F 3 "" H 3250 1900 50  0000 C CNN
@@ -395,10 +396,10 @@ F 3 "" H 3250 1900 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR018
+L GNDA #PWR209
 U 1 1 58D82634
 P 3600 1900
-F 0 "#PWR018" H 3600 1650 50  0001 C CNN
+F 0 "#PWR209" H 3600 1650 50  0001 C CNN
 F 1 "GNDA" H 3600 1750 50  0000 C CNN
 F 2 "" H 3600 1900 50  0001 C CNN
 F 3 "" H 3600 1900 50  0001 C CNN
@@ -406,10 +407,10 @@ F 3 "" H 3600 1900 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR019
+L V- #PWR211
 U 1 1 58D82892
 P 1600 1950
-F 0 "#PWR019" H 1600 1800 50  0001 C CNN
+F 0 "#PWR211" H 1600 1800 50  0001 C CNN
 F 1 "V-" H 1600 2090 50  0000 C CNN
 F 2 "" H 1600 1950 50  0000 C CNN
 F 3 "" H 1600 1950 50  0000 C CNN
@@ -417,10 +418,10 @@ F 3 "" H 1600 1950 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR020
+L V+ #PWR202
 U 1 1 58D8291B
 P 1600 1050
-F 0 "#PWR020" H 1600 900 50  0001 C CNN
+F 0 "#PWR202" H 1600 900 50  0001 C CNN
 F 1 "V+" H 1600 1190 50  0000 C CNN
 F 2 "" H 1600 1050 50  0000 C CNN
 F 3 "" H 1600 1050 50  0000 C CNN
@@ -428,10 +429,10 @@ F 3 "" H 1600 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR021
+L V+ #PWR205
 U 1 1 58D82B50
 P 6900 1450
-F 0 "#PWR021" H 6900 1300 50  0001 C CNN
+F 0 "#PWR205" H 6900 1300 50  0001 C CNN
 F 1 "V+" H 6900 1590 50  0000 C CNN
 F 2 "" H 6900 1450 50  0000 C CNN
 F 3 "" H 6900 1450 50  0000 C CNN
@@ -439,10 +440,10 @@ F 3 "" H 6900 1450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR022
+L V- #PWR212
 U 1 1 58D82BD9
 P 6900 2000
-F 0 "#PWR022" H 6900 1850 50  0001 C CNN
+F 0 "#PWR212" H 6900 1850 50  0001 C CNN
 F 1 "V-" H 6900 2140 50  0000 C CNN
 F 2 "" H 6900 2000 50  0000 C CNN
 F 3 "" H 6900 2000 50  0000 C CNN
@@ -450,10 +451,10 @@ F 3 "" H 6900 2000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR023
+L GNDA #PWR207
 U 1 1 58D83F65
 P 2400 1600
-F 0 "#PWR023" H 2400 1350 50  0001 C CNN
+F 0 "#PWR207" H 2400 1350 50  0001 C CNN
 F 1 "GNDA" H 2400 1450 50  0000 C CNN
 F 2 "" H 2400 1600 50  0001 C CNN
 F 3 "" H 2400 1600 50  0001 C CNN
@@ -523,7 +524,7 @@ U 1 1 58D86C3F
 P 900 3000
 F 0 "J202" H 840 2840 50  0000 C CNN
 F 1 "Sensor" V 1000 3000 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
 F 3 "" H 900 3000 50  0001 C CNN
 	1    900  3000
 	-1   0    0    -1  
@@ -534,7 +535,7 @@ U 1 1 58D86C48
 P 2200 3200
 F 0 "C210" V 2250 3250 50  0000 L CNN
 F 1 "0.1µF" V 2050 3100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3050 50  0001 C CNN
 F 3 "" H 2200 3200 50  0001 C CNN
 	1    2200 3200
 	0    1    1    0   
@@ -545,7 +546,7 @@ U 1 1 58D86C4E
 P 2200 3600
 F 0 "C212" V 2150 3650 50  0000 L CNN
 F 1 "0.1µF" V 2350 3500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3450 50  0001 C CNN
 F 3 "" H 2200 3600 50  0001 C CNN
 	1    2200 3600
 	0    1    1    0   
@@ -749,10 +750,10 @@ $EndComp
 Connection ~ 4400 3400
 Connection ~ 8650 3500
 $Comp
-L V+ #PWR024
+L V+ #PWR215
 U 1 1 58D86CD7
 P 3250 3100
-F 0 "#PWR024" H 3250 2950 50  0001 C CNN
+F 0 "#PWR215" H 3250 2950 50  0001 C CNN
 F 1 "V+" H 3250 3240 50  0000 C CNN
 F 2 "" H 3250 3100 50  0000 C CNN
 F 3 "" H 3250 3100 50  0000 C CNN
@@ -760,10 +761,10 @@ F 3 "" H 3250 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR025
+L V- #PWR218
 U 1 1 58D86CDD
 P 3250 3700
-F 0 "#PWR025" H 3250 3550 50  0001 C CNN
+F 0 "#PWR218" H 3250 3550 50  0001 C CNN
 F 1 "V-" H 3250 3840 50  0000 C CNN
 F 2 "" H 3250 3700 50  0000 C CNN
 F 3 "" H 3250 3700 50  0000 C CNN
@@ -771,10 +772,10 @@ F 3 "" H 3250 3700 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR026
+L GNDA #PWR219
 U 1 1 58D86CE3
 P 3600 3700
-F 0 "#PWR026" H 3600 3450 50  0001 C CNN
+F 0 "#PWR219" H 3600 3450 50  0001 C CNN
 F 1 "GNDA" H 3600 3550 50  0000 C CNN
 F 2 "" H 3600 3700 50  0001 C CNN
 F 3 "" H 3600 3700 50  0001 C CNN
@@ -782,10 +783,10 @@ F 3 "" H 3600 3700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR027
+L V- #PWR221
 U 1 1 58D86CE9
 P 1600 3750
-F 0 "#PWR027" H 1600 3600 50  0001 C CNN
+F 0 "#PWR221" H 1600 3600 50  0001 C CNN
 F 1 "V-" H 1600 3890 50  0000 C CNN
 F 2 "" H 1600 3750 50  0000 C CNN
 F 3 "" H 1600 3750 50  0000 C CNN
@@ -793,10 +794,10 @@ F 3 "" H 1600 3750 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR028
+L V+ #PWR214
 U 1 1 58D86CEF
 P 1600 2850
-F 0 "#PWR028" H 1600 2700 50  0001 C CNN
+F 0 "#PWR214" H 1600 2700 50  0001 C CNN
 F 1 "V+" H 1600 2990 50  0000 C CNN
 F 2 "" H 1600 2850 50  0000 C CNN
 F 3 "" H 1600 2850 50  0000 C CNN
@@ -804,10 +805,10 @@ F 3 "" H 1600 2850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR029
+L V+ #PWR216
 U 1 1 58D86CF5
 P 6900 3250
-F 0 "#PWR029" H 6900 3100 50  0001 C CNN
+F 0 "#PWR216" H 6900 3100 50  0001 C CNN
 F 1 "V+" H 6900 3390 50  0000 C CNN
 F 2 "" H 6900 3250 50  0000 C CNN
 F 3 "" H 6900 3250 50  0000 C CNN
@@ -815,10 +816,10 @@ F 3 "" H 6900 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR030
+L V- #PWR222
 U 1 1 58D86CFB
 P 6900 3800
-F 0 "#PWR030" H 6900 3650 50  0001 C CNN
+F 0 "#PWR222" H 6900 3650 50  0001 C CNN
 F 1 "V-" H 6900 3940 50  0000 C CNN
 F 2 "" H 6900 3800 50  0000 C CNN
 F 3 "" H 6900 3800 50  0000 C CNN
@@ -826,10 +827,10 @@ F 3 "" H 6900 3800 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR031
+L GNDA #PWR217
 U 1 1 58D86D01
 P 2400 3400
-F 0 "#PWR031" H 2400 3150 50  0001 C CNN
+F 0 "#PWR217" H 2400 3150 50  0001 C CNN
 F 1 "GNDA" H 2400 3250 50  0000 C CNN
 F 2 "" H 2400 3400 50  0001 C CNN
 F 3 "" H 2400 3400 50  0001 C CNN
@@ -861,10 +862,10 @@ $EndComp
 Wire Wire Line
 	6900 3800 6900 3750
 $Comp
-L V+ #PWR032
+L V+ #PWR201
 U 1 1 58D8E38F
 P 9900 850
-F 0 "#PWR032" H 9900 700 50  0001 C CNN
+F 0 "#PWR201" H 9900 700 50  0001 C CNN
 F 1 "V+" H 9900 990 50  0000 C CNN
 F 2 "" H 9900 850 50  0000 C CNN
 F 3 "" H 9900 850 50  0000 C CNN
@@ -872,10 +873,10 @@ F 3 "" H 9900 850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR033
+L V- #PWR206
 U 1 1 58D8E424
 P 9900 1450
-F 0 "#PWR033" H 9900 1300 50  0001 C CNN
+F 0 "#PWR206" H 9900 1300 50  0001 C CNN
 F 1 "V-" H 9900 1590 50  0000 C CNN
 F 2 "" H 9900 1450 50  0000 C CNN
 F 3 "" H 9900 1450 50  0000 C CNN
@@ -894,10 +895,10 @@ F 3 "" H 6950 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR034
+L GNDA #PWR213
 U 1 1 58D918AB
 P 8050 2200
-F 0 "#PWR034" H 8050 1950 50  0001 C CNN
+F 0 "#PWR213" H 8050 1950 50  0001 C CNN
 F 1 "GNDA" H 8050 2050 50  0000 C CNN
 F 2 "" H 8050 2200 50  0001 C CNN
 F 3 "" H 8050 2200 50  0001 C CNN
@@ -905,10 +906,10 @@ F 3 "" H 8050 2200 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDA #PWR035
+L GNDA #PWR223
 U 1 1 58D91F1A
 P 8050 4000
-F 0 "#PWR035" H 8050 3750 50  0001 C CNN
+F 0 "#PWR223" H 8050 3750 50  0001 C CNN
 F 1 "GNDA" H 8050 3850 50  0000 C CNN
 F 2 "" H 8050 4000 50  0001 C CNN
 F 3 "" H 8050 4000 50  0001 C CNN
@@ -916,10 +917,10 @@ F 3 "" H 8050 4000 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDA #PWR036
+L GNDA #PWR220
 U 1 1 58D92467
 P 6250 3700
-F 0 "#PWR036" H 6250 3450 50  0001 C CNN
+F 0 "#PWR220" H 6250 3450 50  0001 C CNN
 F 1 "GNDA" H 6250 3550 50  0000 C CNN
 F 2 "" H 6250 3700 50  0001 C CNN
 F 3 "" H 6250 3700 50  0001 C CNN
@@ -927,10 +928,10 @@ F 3 "" H 6250 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR037
+L GNDA #PWR210
 U 1 1 58D924F3
 P 6250 1900
-F 0 "#PWR037" H 6250 1650 50  0001 C CNN
+F 0 "#PWR210" H 6250 1650 50  0001 C CNN
 F 1 "GNDA" H 6250 1750 50  0000 C CNN
 F 2 "" H 6250 1900 50  0001 C CNN
 F 3 "" H 6250 1900 50  0001 C CNN
@@ -959,10 +960,10 @@ Wire Wire Line
 	2050 1400 1400 1400
 Connection ~ 1400 1400
 $Comp
-L GNDA #PWR038
+L GNDA #PWR203
 U 1 1 58DDAD59
 P 9420 1150
-F 0 "#PWR038" H 9420 900 50  0001 C CNN
+F 0 "#PWR203" H 9420 900 50  0001 C CNN
 F 1 "GNDA" H 9420 1000 50  0000 C CNN
 F 2 "" H 9420 1150 50  0001 C CNN
 F 3 "" H 9420 1150 50  0001 C CNN
diff --git a/channel2.sch b/channel2.sch
index 5018c6d..bb9a08b 100644
--- a/channel2.sch
+++ b/channel2.sch
@@ -29,6 +29,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:nocko
+LIBS:switches
 LIBS:bmi-8ch-cache
 EELAYER 25 0
 EELAYER END
@@ -83,7 +84,7 @@ U 1 1 58D9830A
 P 900 1200
 F 0 "J301" H 870 1030 50  0000 C CNN
 F 1 "Sensor" V 1000 1200 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
 F 3 "" H 900 1200 50  0001 C CNN
 	1    900  1200
 	-1   0    0    -1  
@@ -94,7 +95,7 @@ U 1 1 58D9830B
 P 2200 1400
 F 0 "C306" V 2250 1450 50  0000 L CNN
 F 1 "0.1µF" V 2050 1300 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1250 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1250 50  0001 C CNN
 F 3 "" H 2200 1400 50  0001 C CNN
 	1    2200 1400
 	0    1    1    0   
@@ -105,7 +106,7 @@ U 1 1 58D9830C
 P 2200 1800
 F 0 "C308" V 2150 1850 50  0000 L CNN
 F 1 "0.1µF" V 2350 1700 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1650 50  0001 C CNN
 F 3 "" H 2200 1800 50  0001 C CNN
 	1    2200 1800
 	0    1    1    0   
@@ -155,7 +156,7 @@ F 3 "" H 5600 1600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 Text Notes 750  5450 0    87   ~ 0
-Notes:\n\nR503, R513: 0.1%\nOther R: 1%\nC305, C306, C307, C308, C309, C310, C311, C312: 50V NP0\nBypass Caps: 50V X7R or X5R
+Notes:\n\nR303, R313: 0.1%\nOther R: 1%\nC305, C306, C307, C308, C309, C310, C311, C312: 50V NP0\nBypass Caps: 50V X7R or X5R
 $Comp
 L R R308
 U 1 1 58D98311
@@ -260,10 +261,10 @@ F 3 "" H 8850 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR039
+L V+ #PWR304
 U 1 1 58D9831A
 P 3250 1300
-F 0 "#PWR039" H 3250 1150 50  0001 C CNN
+F 0 "#PWR304" H 3250 1150 50  0001 C CNN
 F 1 "V+" H 3250 1440 50  0000 C CNN
 F 2 "" H 3250 1300 50  0000 C CNN
 F 3 "" H 3250 1300 50  0000 C CNN
@@ -271,10 +272,10 @@ F 3 "" H 3250 1300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR040
+L V- #PWR308
 U 1 1 58D9831B
 P 3250 1900
-F 0 "#PWR040" H 3250 1750 50  0001 C CNN
+F 0 "#PWR308" H 3250 1750 50  0001 C CNN
 F 1 "V-" H 3250 2040 50  0000 C CNN
 F 2 "" H 3250 1900 50  0000 C CNN
 F 3 "" H 3250 1900 50  0000 C CNN
@@ -282,10 +283,10 @@ F 3 "" H 3250 1900 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR041
+L GNDA #PWR309
 U 1 1 58D9831C
 P 3600 1900
-F 0 "#PWR041" H 3600 1650 50  0001 C CNN
+F 0 "#PWR309" H 3600 1650 50  0001 C CNN
 F 1 "GNDA" H 3600 1750 50  0000 C CNN
 F 2 "" H 3600 1900 50  0001 C CNN
 F 3 "" H 3600 1900 50  0001 C CNN
@@ -293,10 +294,10 @@ F 3 "" H 3600 1900 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR042
+L V- #PWR311
 U 1 1 58D9831D
 P 1600 1950
-F 0 "#PWR042" H 1600 1800 50  0001 C CNN
+F 0 "#PWR311" H 1600 1800 50  0001 C CNN
 F 1 "V-" H 1600 2090 50  0000 C CNN
 F 2 "" H 1600 1950 50  0000 C CNN
 F 3 "" H 1600 1950 50  0000 C CNN
@@ -304,10 +305,10 @@ F 3 "" H 1600 1950 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR043
+L V+ #PWR302
 U 1 1 58D9831E
 P 1600 1050
-F 0 "#PWR043" H 1600 900 50  0001 C CNN
+F 0 "#PWR302" H 1600 900 50  0001 C CNN
 F 1 "V+" H 1600 1190 50  0000 C CNN
 F 2 "" H 1600 1050 50  0000 C CNN
 F 3 "" H 1600 1050 50  0000 C CNN
@@ -315,10 +316,10 @@ F 3 "" H 1600 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR044
+L V+ #PWR305
 U 1 1 58D9831F
 P 6900 1450
-F 0 "#PWR044" H 6900 1300 50  0001 C CNN
+F 0 "#PWR305" H 6900 1300 50  0001 C CNN
 F 1 "V+" H 6900 1590 50  0000 C CNN
 F 2 "" H 6900 1450 50  0000 C CNN
 F 3 "" H 6900 1450 50  0000 C CNN
@@ -326,10 +327,10 @@ F 3 "" H 6900 1450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR045
+L V- #PWR312
 U 1 1 58D98320
 P 6900 2000
-F 0 "#PWR045" H 6900 1850 50  0001 C CNN
+F 0 "#PWR312" H 6900 1850 50  0001 C CNN
 F 1 "V-" H 6900 2140 50  0000 C CNN
 F 2 "" H 6900 2000 50  0000 C CNN
 F 3 "" H 6900 2000 50  0000 C CNN
@@ -337,10 +338,10 @@ F 3 "" H 6900 2000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR046
+L GNDA #PWR307
 U 1 1 58D98321
 P 2400 1600
-F 0 "#PWR046" H 2400 1350 50  0001 C CNN
+F 0 "#PWR307" H 2400 1350 50  0001 C CNN
 F 1 "GNDA" H 2400 1450 50  0000 C CNN
 F 2 "" H 2400 1600 50  0001 C CNN
 F 3 "" H 2400 1600 50  0001 C CNN
@@ -408,7 +409,7 @@ U 1 1 58D98327
 P 900 3000
 F 0 "J304" H 850 2800 50  0000 C CNN
 F 1 "Sensor" V 1000 3000 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
 F 3 "" H 900 3000 50  0001 C CNN
 	1    900  3000
 	-1   0    0    -1  
@@ -419,7 +420,7 @@ U 1 1 58D98328
 P 2200 3200
 F 0 "C310" V 2250 3250 50  0000 L CNN
 F 1 "0.1µF" V 2050 3100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3050 50  0001 C CNN
 F 3 "" H 2200 3200 50  0001 C CNN
 	1    2200 3200
 	0    1    1    0   
@@ -430,7 +431,7 @@ U 1 1 58D98329
 P 2200 3600
 F 0 "C312" V 2150 3650 50  0000 L CNN
 F 1 "0.1µF" V 2350 3500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3450 50  0001 C CNN
 F 3 "" H 2200 3600 50  0001 C CNN
 	1    2200 3600
 	0    1    1    0   
@@ -559,10 +560,10 @@ F 3 "" H 8850 3500 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR047
+L V+ #PWR315
 U 1 1 58D98335
 P 3250 3100
-F 0 "#PWR047" H 3250 2950 50  0001 C CNN
+F 0 "#PWR315" H 3250 2950 50  0001 C CNN
 F 1 "V+" H 3250 3240 50  0000 C CNN
 F 2 "" H 3250 3100 50  0000 C CNN
 F 3 "" H 3250 3100 50  0000 C CNN
@@ -570,10 +571,10 @@ F 3 "" H 3250 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR048
+L V- #PWR318
 U 1 1 58D98336
 P 3250 3700
-F 0 "#PWR048" H 3250 3550 50  0001 C CNN
+F 0 "#PWR318" H 3250 3550 50  0001 C CNN
 F 1 "V-" H 3250 3840 50  0000 C CNN
 F 2 "" H 3250 3700 50  0000 C CNN
 F 3 "" H 3250 3700 50  0000 C CNN
@@ -581,10 +582,10 @@ F 3 "" H 3250 3700 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR049
+L GNDA #PWR319
 U 1 1 58D98337
 P 3600 3700
-F 0 "#PWR049" H 3600 3450 50  0001 C CNN
+F 0 "#PWR319" H 3600 3450 50  0001 C CNN
 F 1 "GNDA" H 3600 3550 50  0000 C CNN
 F 2 "" H 3600 3700 50  0001 C CNN
 F 3 "" H 3600 3700 50  0001 C CNN
@@ -592,10 +593,10 @@ F 3 "" H 3600 3700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR050
+L V- #PWR321
 U 1 1 58D98338
 P 1600 3750
-F 0 "#PWR050" H 1600 3600 50  0001 C CNN
+F 0 "#PWR321" H 1600 3600 50  0001 C CNN
 F 1 "V-" H 1600 3890 50  0000 C CNN
 F 2 "" H 1600 3750 50  0000 C CNN
 F 3 "" H 1600 3750 50  0000 C CNN
@@ -603,10 +604,10 @@ F 3 "" H 1600 3750 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR051
+L V+ #PWR314
 U 1 1 58D98339
 P 1600 2850
-F 0 "#PWR051" H 1600 2700 50  0001 C CNN
+F 0 "#PWR314" H 1600 2700 50  0001 C CNN
 F 1 "V+" H 1600 2990 50  0000 C CNN
 F 2 "" H 1600 2850 50  0000 C CNN
 F 3 "" H 1600 2850 50  0000 C CNN
@@ -614,10 +615,10 @@ F 3 "" H 1600 2850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR052
+L V+ #PWR316
 U 1 1 58D9833A
 P 6900 3250
-F 0 "#PWR052" H 6900 3100 50  0001 C CNN
+F 0 "#PWR316" H 6900 3100 50  0001 C CNN
 F 1 "V+" H 6900 3390 50  0000 C CNN
 F 2 "" H 6900 3250 50  0000 C CNN
 F 3 "" H 6900 3250 50  0000 C CNN
@@ -625,10 +626,10 @@ F 3 "" H 6900 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR053
+L V- #PWR322
 U 1 1 58D9833B
 P 6900 3800
-F 0 "#PWR053" H 6900 3650 50  0001 C CNN
+F 0 "#PWR322" H 6900 3650 50  0001 C CNN
 F 1 "V-" H 6900 3940 50  0000 C CNN
 F 2 "" H 6900 3800 50  0000 C CNN
 F 3 "" H 6900 3800 50  0000 C CNN
@@ -636,10 +637,10 @@ F 3 "" H 6900 3800 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR054
+L GNDA #PWR317
 U 1 1 58D9833C
 P 2400 3400
-F 0 "#PWR054" H 2400 3150 50  0001 C CNN
+F 0 "#PWR317" H 2400 3150 50  0001 C CNN
 F 1 "GNDA" H 2400 3250 50  0000 C CNN
 F 2 "" H 2400 3400 50  0001 C CNN
 F 3 "" H 2400 3400 50  0001 C CNN
@@ -669,10 +670,10 @@ F 3 "" H 7600 4240 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR055
+L V+ #PWR301
 U 1 1 58D9833F
 P 9900 850
-F 0 "#PWR055" H 9900 700 50  0001 C CNN
+F 0 "#PWR301" H 9900 700 50  0001 C CNN
 F 1 "V+" H 9900 990 50  0000 C CNN
 F 2 "" H 9900 850 50  0000 C CNN
 F 3 "" H 9900 850 50  0000 C CNN
@@ -680,10 +681,10 @@ F 3 "" H 9900 850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR056
+L V- #PWR306
 U 1 1 58D98340
 P 9900 1450
-F 0 "#PWR056" H 9900 1300 50  0001 C CNN
+F 0 "#PWR306" H 9900 1300 50  0001 C CNN
 F 1 "V-" H 9900 1590 50  0000 C CNN
 F 2 "" H 9900 1450 50  0000 C CNN
 F 3 "" H 9900 1450 50  0000 C CNN
@@ -702,10 +703,10 @@ F 3 "" H 6950 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR057
+L GNDA #PWR313
 U 1 1 58D98342
 P 7600 2570
-F 0 "#PWR057" H 7600 2320 50  0001 C CNN
+F 0 "#PWR313" H 7600 2320 50  0001 C CNN
 F 1 "GNDA" H 7600 2420 50  0000 C CNN
 F 2 "" H 7600 2570 50  0001 C CNN
 F 3 "" H 7600 2570 50  0001 C CNN
@@ -713,10 +714,10 @@ F 3 "" H 7600 2570 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR058
+L GNDA #PWR323
 U 1 1 58D98343
 P 7600 4390
-F 0 "#PWR058" H 7600 4140 50  0001 C CNN
+F 0 "#PWR323" H 7600 4140 50  0001 C CNN
 F 1 "GNDA" H 7600 4240 50  0000 C CNN
 F 2 "" H 7600 4390 50  0001 C CNN
 F 3 "" H 7600 4390 50  0001 C CNN
@@ -724,10 +725,10 @@ F 3 "" H 7600 4390 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR059
+L GNDA #PWR320
 U 1 1 58D98344
 P 6250 3700
-F 0 "#PWR059" H 6250 3450 50  0001 C CNN
+F 0 "#PWR320" H 6250 3450 50  0001 C CNN
 F 1 "GNDA" H 6250 3550 50  0000 C CNN
 F 2 "" H 6250 3700 50  0001 C CNN
 F 3 "" H 6250 3700 50  0001 C CNN
@@ -735,10 +736,10 @@ F 3 "" H 6250 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR060
+L GNDA #PWR310
 U 1 1 58D98345
 P 6250 1900
-F 0 "#PWR060" H 6250 1650 50  0001 C CNN
+F 0 "#PWR310" H 6250 1650 50  0001 C CNN
 F 1 "GNDA" H 6250 1750 50  0000 C CNN
 F 2 "" H 6250 1900 50  0001 C CNN
 F 3 "" H 6250 1900 50  0001 C CNN
@@ -801,10 +802,10 @@ F 3 "" H 9420 1300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR061
+L GNDA #PWR303
 U 1 1 58DE2C50
 P 9350 1150
-F 0 "#PWR061" H 9350 900 50  0001 C CNN
+F 0 "#PWR303" H 9350 900 50  0001 C CNN
 F 1 "GNDA" H 9350 1000 50  0000 C CNN
 F 2 "" H 9350 1150 50  0001 C CNN
 F 3 "" H 9350 1150 50  0001 C CNN
diff --git a/channel4.sch b/channel4.sch
index de68e73..5ed126d 100644
--- a/channel4.sch
+++ b/channel4.sch
@@ -29,6 +29,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:nocko
+LIBS:switches
 LIBS:bmi-8ch-cache
 EELAYER 25 0
 EELAYER END
@@ -83,7 +84,7 @@ U 1 1 58D998AD
 P 900 1200
 F 0 "J401" H 850 1050 50  0000 C CNN
 F 1 "Sensor" V 1000 1200 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
 F 3 "" H 900 1200 50  0001 C CNN
 	1    900  1200
 	-1   0    0    -1  
@@ -94,7 +95,7 @@ U 1 1 58D998AE
 P 2200 1400
 F 0 "C406" V 2250 1450 50  0000 L CNN
 F 1 "0.1µF" V 2050 1300 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1250 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1250 50  0001 C CNN
 F 3 "" H 2200 1400 50  0001 C CNN
 	1    2200 1400
 	0    1    1    0   
@@ -105,7 +106,7 @@ U 1 1 58D998AF
 P 2200 1800
 F 0 "C408" V 2150 1850 50  0000 L CNN
 F 1 "0.1µF" V 2350 1700 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1650 50  0001 C CNN
 F 3 "" H 2200 1800 50  0001 C CNN
 	1    2200 1800
 	0    1    1    0   
@@ -155,7 +156,7 @@ F 3 "" H 5600 1600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 Text Notes 750  5450 0    87   ~ 0
-Notes:\n\nR503, R513: 0.1%\nOther R: 1%\nC405, C406, C407, C408, C409, C410, C411, C412: 50V NP0\nBypass Caps: 50V X7R or X5R
+Notes:\n\nR403, R413: 0.1%\nOther R: 1%\nC405, C406, C407, C408, C409, C410, C411, C412: 50V NP0\nBypass Caps: 50V X7R or X5R
 $Comp
 L R R408
 U 1 1 58D998B4
@@ -339,10 +340,10 @@ $EndComp
 Connection ~ 4400 1600
 Connection ~ 8650 1700
 $Comp
-L V+ #PWR062
+L V+ #PWR404
 U 1 1 58D998BD
 P 3250 1300
-F 0 "#PWR062" H 3250 1150 50  0001 C CNN
+F 0 "#PWR404" H 3250 1150 50  0001 C CNN
 F 1 "V+" H 3250 1440 50  0000 C CNN
 F 2 "" H 3250 1300 50  0000 C CNN
 F 3 "" H 3250 1300 50  0000 C CNN
@@ -350,10 +351,10 @@ F 3 "" H 3250 1300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR063
+L V- #PWR408
 U 1 1 58D998BE
 P 3250 1900
-F 0 "#PWR063" H 3250 1750 50  0001 C CNN
+F 0 "#PWR408" H 3250 1750 50  0001 C CNN
 F 1 "V-" H 3250 2040 50  0000 C CNN
 F 2 "" H 3250 1900 50  0000 C CNN
 F 3 "" H 3250 1900 50  0000 C CNN
@@ -361,10 +362,10 @@ F 3 "" H 3250 1900 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR064
+L GNDA #PWR409
 U 1 1 58D998BF
 P 3600 1900
-F 0 "#PWR064" H 3600 1650 50  0001 C CNN
+F 0 "#PWR409" H 3600 1650 50  0001 C CNN
 F 1 "GNDA" H 3600 1750 50  0000 C CNN
 F 2 "" H 3600 1900 50  0001 C CNN
 F 3 "" H 3600 1900 50  0001 C CNN
@@ -372,10 +373,10 @@ F 3 "" H 3600 1900 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR065
+L V- #PWR411
 U 1 1 58D998C0
 P 1600 1950
-F 0 "#PWR065" H 1600 1800 50  0001 C CNN
+F 0 "#PWR411" H 1600 1800 50  0001 C CNN
 F 1 "V-" H 1600 2090 50  0000 C CNN
 F 2 "" H 1600 1950 50  0000 C CNN
 F 3 "" H 1600 1950 50  0000 C CNN
@@ -383,10 +384,10 @@ F 3 "" H 1600 1950 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR066
+L V+ #PWR402
 U 1 1 58D998C1
 P 1600 1050
-F 0 "#PWR066" H 1600 900 50  0001 C CNN
+F 0 "#PWR402" H 1600 900 50  0001 C CNN
 F 1 "V+" H 1600 1190 50  0000 C CNN
 F 2 "" H 1600 1050 50  0000 C CNN
 F 3 "" H 1600 1050 50  0000 C CNN
@@ -394,10 +395,10 @@ F 3 "" H 1600 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR067
+L V+ #PWR405
 U 1 1 58D998C2
 P 6900 1450
-F 0 "#PWR067" H 6900 1300 50  0001 C CNN
+F 0 "#PWR405" H 6900 1300 50  0001 C CNN
 F 1 "V+" H 6900 1590 50  0000 C CNN
 F 2 "" H 6900 1450 50  0000 C CNN
 F 3 "" H 6900 1450 50  0000 C CNN
@@ -405,10 +406,10 @@ F 3 "" H 6900 1450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR068
+L V- #PWR412
 U 1 1 58D998C3
 P 6900 2000
-F 0 "#PWR068" H 6900 1850 50  0001 C CNN
+F 0 "#PWR412" H 6900 1850 50  0001 C CNN
 F 1 "V-" H 6900 2140 50  0000 C CNN
 F 2 "" H 6900 2000 50  0000 C CNN
 F 3 "" H 6900 2000 50  0000 C CNN
@@ -416,10 +417,10 @@ F 3 "" H 6900 2000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR069
+L GNDA #PWR407
 U 1 1 58D998C4
 P 2400 1600
-F 0 "#PWR069" H 2400 1350 50  0001 C CNN
+F 0 "#PWR407" H 2400 1350 50  0001 C CNN
 F 1 "GNDA" H 2400 1450 50  0000 C CNN
 F 2 "" H 2400 1600 50  0001 C CNN
 F 3 "" H 2400 1600 50  0001 C CNN
@@ -489,7 +490,7 @@ U 1 1 58D998CA
 P 900 3000
 F 0 "J404" H 840 2830 50  0000 C CNN
 F 1 "Sensor" V 1000 3000 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
 F 3 "" H 900 3000 50  0001 C CNN
 	1    900  3000
 	-1   0    0    -1  
@@ -500,7 +501,7 @@ U 1 1 58D998CB
 P 2200 3200
 F 0 "C410" V 2250 3250 50  0000 L CNN
 F 1 "0.1µF" V 2050 3100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3050 50  0001 C CNN
 F 3 "" H 2200 3200 50  0001 C CNN
 	1    2200 3200
 	0    1    1    0   
@@ -511,7 +512,7 @@ U 1 1 58D998CC
 P 2200 3600
 F 0 "C412" V 2150 3650 50  0000 L CNN
 F 1 "0.1µF" V 2350 3500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3450 50  0001 C CNN
 F 3 "" H 2200 3600 50  0001 C CNN
 	1    2200 3600
 	0    1    1    0   
@@ -715,10 +716,10 @@ $EndComp
 Connection ~ 4400 3400
 Connection ~ 8650 3500
 $Comp
-L V+ #PWR070
+L V+ #PWR415
 U 1 1 58D998D8
 P 3250 3100
-F 0 "#PWR070" H 3250 2950 50  0001 C CNN
+F 0 "#PWR415" H 3250 2950 50  0001 C CNN
 F 1 "V+" H 3250 3240 50  0000 C CNN
 F 2 "" H 3250 3100 50  0000 C CNN
 F 3 "" H 3250 3100 50  0000 C CNN
@@ -726,10 +727,10 @@ F 3 "" H 3250 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR071
+L V- #PWR418
 U 1 1 58D998D9
 P 3250 3700
-F 0 "#PWR071" H 3250 3550 50  0001 C CNN
+F 0 "#PWR418" H 3250 3550 50  0001 C CNN
 F 1 "V-" H 3250 3840 50  0000 C CNN
 F 2 "" H 3250 3700 50  0000 C CNN
 F 3 "" H 3250 3700 50  0000 C CNN
@@ -737,10 +738,10 @@ F 3 "" H 3250 3700 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR072
+L GNDA #PWR419
 U 1 1 58D998DA
 P 3600 3700
-F 0 "#PWR072" H 3600 3450 50  0001 C CNN
+F 0 "#PWR419" H 3600 3450 50  0001 C CNN
 F 1 "GNDA" H 3600 3550 50  0000 C CNN
 F 2 "" H 3600 3700 50  0001 C CNN
 F 3 "" H 3600 3700 50  0001 C CNN
@@ -748,10 +749,10 @@ F 3 "" H 3600 3700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR073
+L V- #PWR421
 U 1 1 58D998DB
 P 1600 3750
-F 0 "#PWR073" H 1600 3600 50  0001 C CNN
+F 0 "#PWR421" H 1600 3600 50  0001 C CNN
 F 1 "V-" H 1600 3890 50  0000 C CNN
 F 2 "" H 1600 3750 50  0000 C CNN
 F 3 "" H 1600 3750 50  0000 C CNN
@@ -759,10 +760,10 @@ F 3 "" H 1600 3750 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR074
+L V+ #PWR414
 U 1 1 58D998DC
 P 1600 2850
-F 0 "#PWR074" H 1600 2700 50  0001 C CNN
+F 0 "#PWR414" H 1600 2700 50  0001 C CNN
 F 1 "V+" H 1600 2990 50  0000 C CNN
 F 2 "" H 1600 2850 50  0000 C CNN
 F 3 "" H 1600 2850 50  0000 C CNN
@@ -770,10 +771,10 @@ F 3 "" H 1600 2850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR075
+L V+ #PWR416
 U 1 1 58D998DD
 P 6900 3250
-F 0 "#PWR075" H 6900 3100 50  0001 C CNN
+F 0 "#PWR416" H 6900 3100 50  0001 C CNN
 F 1 "V+" H 6900 3390 50  0000 C CNN
 F 2 "" H 6900 3250 50  0000 C CNN
 F 3 "" H 6900 3250 50  0000 C CNN
@@ -781,10 +782,10 @@ F 3 "" H 6900 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR076
+L V- #PWR422
 U 1 1 58D998DE
 P 6900 3800
-F 0 "#PWR076" H 6900 3650 50  0001 C CNN
+F 0 "#PWR422" H 6900 3650 50  0001 C CNN
 F 1 "V-" H 6900 3940 50  0000 C CNN
 F 2 "" H 6900 3800 50  0000 C CNN
 F 3 "" H 6900 3800 50  0000 C CNN
@@ -792,10 +793,10 @@ F 3 "" H 6900 3800 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR077
+L GNDA #PWR417
 U 1 1 58D998DF
 P 2400 3400
-F 0 "#PWR077" H 2400 3150 50  0001 C CNN
+F 0 "#PWR417" H 2400 3150 50  0001 C CNN
 F 1 "GNDA" H 2400 3250 50  0000 C CNN
 F 2 "" H 2400 3400 50  0001 C CNN
 F 3 "" H 2400 3400 50  0001 C CNN
@@ -827,10 +828,10 @@ $EndComp
 Wire Wire Line
 	6900 3800 6900 3750
 $Comp
-L V+ #PWR078
+L V+ #PWR401
 U 1 1 58D998E2
 P 9900 850
-F 0 "#PWR078" H 9900 700 50  0001 C CNN
+F 0 "#PWR401" H 9900 700 50  0001 C CNN
 F 1 "V+" H 9900 990 50  0000 C CNN
 F 2 "" H 9900 850 50  0000 C CNN
 F 3 "" H 9900 850 50  0000 C CNN
@@ -838,10 +839,10 @@ F 3 "" H 9900 850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR079
+L V- #PWR406
 U 1 1 58D998E3
 P 9900 1450
-F 0 "#PWR079" H 9900 1300 50  0001 C CNN
+F 0 "#PWR406" H 9900 1300 50  0001 C CNN
 F 1 "V-" H 9900 1590 50  0000 C CNN
 F 2 "" H 9900 1450 50  0000 C CNN
 F 3 "" H 9900 1450 50  0000 C CNN
@@ -860,10 +861,10 @@ F 3 "" H 6950 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR080
+L GNDA #PWR413
 U 1 1 58D998E5
 P 7600 2550
-F 0 "#PWR080" H 7600 2300 50  0001 C CNN
+F 0 "#PWR413" H 7600 2300 50  0001 C CNN
 F 1 "GNDA" H 7600 2400 50  0000 C CNN
 F 2 "" H 7600 2550 50  0001 C CNN
 F 3 "" H 7600 2550 50  0001 C CNN
@@ -871,10 +872,10 @@ F 3 "" H 7600 2550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR081
+L GNDA #PWR423
 U 1 1 58D998E6
 P 7600 4370
-F 0 "#PWR081" H 7600 4120 50  0001 C CNN
+F 0 "#PWR423" H 7600 4120 50  0001 C CNN
 F 1 "GNDA" H 7600 4220 50  0000 C CNN
 F 2 "" H 7600 4370 50  0001 C CNN
 F 3 "" H 7600 4370 50  0001 C CNN
@@ -882,10 +883,10 @@ F 3 "" H 7600 4370 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR082
+L GNDA #PWR420
 U 1 1 58D998E7
 P 6250 3700
-F 0 "#PWR082" H 6250 3450 50  0001 C CNN
+F 0 "#PWR420" H 6250 3450 50  0001 C CNN
 F 1 "GNDA" H 6250 3550 50  0000 C CNN
 F 2 "" H 6250 3700 50  0001 C CNN
 F 3 "" H 6250 3700 50  0001 C CNN
@@ -893,10 +894,10 @@ F 3 "" H 6250 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR083
+L GNDA #PWR410
 U 1 1 58D998E8
 P 6250 1900
-F 0 "#PWR083" H 6250 1650 50  0001 C CNN
+F 0 "#PWR410" H 6250 1650 50  0001 C CNN
 F 1 "GNDA" H 6250 1750 50  0000 C CNN
 F 2 "" H 6250 1900 50  0001 C CNN
 F 3 "" H 6250 1900 50  0001 C CNN
@@ -973,10 +974,10 @@ Wire Wire Line
 Connection ~ 9650 1450
 Connection ~ 9900 1450
 $Comp
-L GNDA #PWR084
+L GNDA #PWR403
 U 1 1 58DE23DC
 P 9350 1150
-F 0 "#PWR084" H 9350 900 50  0001 C CNN
+F 0 "#PWR403" H 9350 900 50  0001 C CNN
 F 1 "GNDA" H 9350 1000 50  0000 C CNN
 F 2 "" H 9350 1150 50  0001 C CNN
 F 3 "" H 9350 1150 50  0001 C CNN
diff --git a/channel6.sch b/channel6.sch
index ead0e7e..9d70186 100644
--- a/channel6.sch
+++ b/channel6.sch
@@ -29,6 +29,7 @@ LIBS:atmel
 LIBS:contrib
 LIBS:valves
 LIBS:nocko
+LIBS:switches
 LIBS:bmi-8ch-cache
 EELAYER 25 0
 EELAYER END
@@ -83,7 +84,7 @@ U 1 1 58D9ABE8
 P 900 1200
 F 0 "J501" H 870 1030 50  0000 C CNN
 F 1 "Sensor" V 1000 1200 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 1200 50  0001 C CNN
 F 3 "" H 900 1200 50  0001 C CNN
 	1    900  1200
 	-1   0    0    -1  
@@ -94,7 +95,7 @@ U 1 1 58D9ABE9
 P 2200 1400
 F 0 "C506" V 2250 1450 50  0000 L CNN
 F 1 "0.1µF" V 2050 1300 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1250 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1250 50  0001 C CNN
 F 3 "" H 2200 1400 50  0001 C CNN
 	1    2200 1400
 	0    1    1    0   
@@ -105,7 +106,7 @@ U 1 1 58D9ABEA
 P 2200 1800
 F 0 "C508" V 2150 1850 50  0000 L CNN
 F 1 "0.1µF" V 2350 1700 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 1650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 1650 50  0001 C CNN
 F 3 "" H 2200 1800 50  0001 C CNN
 	1    2200 1800
 	0    1    1    0   
@@ -339,10 +340,10 @@ $EndComp
 Connection ~ 4400 1600
 Connection ~ 8650 1700
 $Comp
-L V+ #PWR085
+L V+ #PWR504
 U 1 1 58D9ABF8
 P 3250 1300
-F 0 "#PWR085" H 3250 1150 50  0001 C CNN
+F 0 "#PWR504" H 3250 1150 50  0001 C CNN
 F 1 "V+" H 3250 1440 50  0000 C CNN
 F 2 "" H 3250 1300 50  0000 C CNN
 F 3 "" H 3250 1300 50  0000 C CNN
@@ -350,10 +351,10 @@ F 3 "" H 3250 1300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR086
+L V- #PWR508
 U 1 1 58D9ABF9
 P 3250 1900
-F 0 "#PWR086" H 3250 1750 50  0001 C CNN
+F 0 "#PWR508" H 3250 1750 50  0001 C CNN
 F 1 "V-" H 3250 2040 50  0000 C CNN
 F 2 "" H 3250 1900 50  0000 C CNN
 F 3 "" H 3250 1900 50  0000 C CNN
@@ -361,10 +362,10 @@ F 3 "" H 3250 1900 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR087
+L GNDA #PWR509
 U 1 1 58D9ABFA
 P 3600 1900
-F 0 "#PWR087" H 3600 1650 50  0001 C CNN
+F 0 "#PWR509" H 3600 1650 50  0001 C CNN
 F 1 "GNDA" H 3600 1750 50  0000 C CNN
 F 2 "" H 3600 1900 50  0001 C CNN
 F 3 "" H 3600 1900 50  0001 C CNN
@@ -372,10 +373,10 @@ F 3 "" H 3600 1900 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR088
+L V- #PWR511
 U 1 1 58D9ABFB
 P 1600 1950
-F 0 "#PWR088" H 1600 1800 50  0001 C CNN
+F 0 "#PWR511" H 1600 1800 50  0001 C CNN
 F 1 "V-" H 1600 2090 50  0000 C CNN
 F 2 "" H 1600 1950 50  0000 C CNN
 F 3 "" H 1600 1950 50  0000 C CNN
@@ -383,10 +384,10 @@ F 3 "" H 1600 1950 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR089
+L V+ #PWR502
 U 1 1 58D9ABFC
 P 1600 1050
-F 0 "#PWR089" H 1600 900 50  0001 C CNN
+F 0 "#PWR502" H 1600 900 50  0001 C CNN
 F 1 "V+" H 1600 1190 50  0000 C CNN
 F 2 "" H 1600 1050 50  0000 C CNN
 F 3 "" H 1600 1050 50  0000 C CNN
@@ -394,10 +395,10 @@ F 3 "" H 1600 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR090
+L V+ #PWR505
 U 1 1 58D9ABFD
 P 6900 1450
-F 0 "#PWR090" H 6900 1300 50  0001 C CNN
+F 0 "#PWR505" H 6900 1300 50  0001 C CNN
 F 1 "V+" H 6900 1590 50  0000 C CNN
 F 2 "" H 6900 1450 50  0000 C CNN
 F 3 "" H 6900 1450 50  0000 C CNN
@@ -405,10 +406,10 @@ F 3 "" H 6900 1450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR091
+L V- #PWR512
 U 1 1 58D9ABFE
 P 6900 2000
-F 0 "#PWR091" H 6900 1850 50  0001 C CNN
+F 0 "#PWR512" H 6900 1850 50  0001 C CNN
 F 1 "V-" H 6900 2140 50  0000 C CNN
 F 2 "" H 6900 2000 50  0000 C CNN
 F 3 "" H 6900 2000 50  0000 C CNN
@@ -416,10 +417,10 @@ F 3 "" H 6900 2000 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR092
+L GNDA #PWR507
 U 1 1 58D9ABFF
 P 2400 1600
-F 0 "#PWR092" H 2400 1350 50  0001 C CNN
+F 0 "#PWR507" H 2400 1350 50  0001 C CNN
 F 1 "GNDA" H 2400 1450 50  0000 C CNN
 F 2 "" H 2400 1600 50  0001 C CNN
 F 3 "" H 2400 1600 50  0001 C CNN
@@ -489,7 +490,7 @@ U 1 1 58D9AC05
 P 900 3000
 F 0 "J504" H 860 2840 50  0000 C CNN
 F 1 "Sensor" V 1000 3000 50  0000 C CNN
-F 2 "nocko:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
+F 2 "footprints:TerminalBlock_Pheonix_PT-5mm_2pol" H 900 3000 50  0001 C CNN
 F 3 "" H 900 3000 50  0001 C CNN
 	1    900  3000
 	-1   0    0    -1  
@@ -500,7 +501,7 @@ U 1 1 58D9AC06
 P 2200 3200
 F 0 "C510" V 2250 3250 50  0000 L CNN
 F 1 "0.1µF" V 2050 3100 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3050 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3050 50  0001 C CNN
 F 3 "" H 2200 3200 50  0001 C CNN
 	1    2200 3200
 	0    1    1    0   
@@ -511,7 +512,7 @@ U 1 1 58D9AC07
 P 2200 3600
 F 0 "C512" V 2150 3650 50  0000 L CNN
 F 1 "0.1µF" V 2350 3500 50  0000 L CNN
-F 2 "Resistors_SMD:R_1206_HandSoldering" H 2238 3450 50  0001 C CNN
+F 2 "Capacitors_SMD:C_1206_HandSoldering" H 2238 3450 50  0001 C CNN
 F 3 "" H 2200 3600 50  0001 C CNN
 	1    2200 3600
 	0    1    1    0   
@@ -715,10 +716,10 @@ $EndComp
 Connection ~ 4400 3400
 Connection ~ 8650 3500
 $Comp
-L V+ #PWR093
+L V+ #PWR515
 U 1 1 58D9AC13
 P 3250 3100
-F 0 "#PWR093" H 3250 2950 50  0001 C CNN
+F 0 "#PWR515" H 3250 2950 50  0001 C CNN
 F 1 "V+" H 3250 3240 50  0000 C CNN
 F 2 "" H 3250 3100 50  0000 C CNN
 F 3 "" H 3250 3100 50  0000 C CNN
@@ -726,10 +727,10 @@ F 3 "" H 3250 3100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR094
+L V- #PWR518
 U 1 1 58D9AC14
 P 3250 3700
-F 0 "#PWR094" H 3250 3550 50  0001 C CNN
+F 0 "#PWR518" H 3250 3550 50  0001 C CNN
 F 1 "V-" H 3250 3840 50  0000 C CNN
 F 2 "" H 3250 3700 50  0000 C CNN
 F 3 "" H 3250 3700 50  0000 C CNN
@@ -737,10 +738,10 @@ F 3 "" H 3250 3700 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR095
+L GNDA #PWR519
 U 1 1 58D9AC15
 P 3600 3700
-F 0 "#PWR095" H 3600 3450 50  0001 C CNN
+F 0 "#PWR519" H 3600 3450 50  0001 C CNN
 F 1 "GNDA" H 3600 3550 50  0000 C CNN
 F 2 "" H 3600 3700 50  0001 C CNN
 F 3 "" H 3600 3700 50  0001 C CNN
@@ -748,10 +749,10 @@ F 3 "" H 3600 3700 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L V- #PWR096
+L V- #PWR521
 U 1 1 58D9AC16
 P 1600 3750
-F 0 "#PWR096" H 1600 3600 50  0001 C CNN
+F 0 "#PWR521" H 1600 3600 50  0001 C CNN
 F 1 "V-" H 1600 3890 50  0000 C CNN
 F 2 "" H 1600 3750 50  0000 C CNN
 F 3 "" H 1600 3750 50  0000 C CNN
@@ -759,10 +760,10 @@ F 3 "" H 1600 3750 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L V+ #PWR097
+L V+ #PWR514
 U 1 1 58D9AC17
 P 1600 2850
-F 0 "#PWR097" H 1600 2700 50  0001 C CNN
+F 0 "#PWR514" H 1600 2700 50  0001 C CNN
 F 1 "V+" H 1600 2990 50  0000 C CNN
 F 2 "" H 1600 2850 50  0000 C CNN
 F 3 "" H 1600 2850 50  0000 C CNN
@@ -770,10 +771,10 @@ F 3 "" H 1600 2850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V+ #PWR098
+L V+ #PWR516
 U 1 1 58D9AC18
 P 6900 3250
-F 0 "#PWR098" H 6900 3100 50  0001 C CNN
+F 0 "#PWR516" H 6900 3100 50  0001 C CNN
 F 1 "V+" H 6900 3390 50  0000 C CNN
 F 2 "" H 6900 3250 50  0000 C CNN
 F 3 "" H 6900 3250 50  0000 C CNN
@@ -781,10 +782,10 @@ F 3 "" H 6900 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR099
+L V- #PWR522
 U 1 1 58D9AC19
 P 6900 3800
-F 0 "#PWR099" H 6900 3650 50  0001 C CNN
+F 0 "#PWR522" H 6900 3650 50  0001 C CNN
 F 1 "V-" H 6900 3940 50  0000 C CNN
 F 2 "" H 6900 3800 50  0000 C CNN
 F 3 "" H 6900 3800 50  0000 C CNN
@@ -792,10 +793,10 @@ F 3 "" H 6900 3800 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDA #PWR0100
+L GNDA #PWR517
 U 1 1 58D9AC1A
 P 2400 3400
-F 0 "#PWR0100" H 2400 3150 50  0001 C CNN
+F 0 "#PWR517" H 2400 3150 50  0001 C CNN
 F 1 "GNDA" H 2400 3250 50  0000 C CNN
 F 2 "" H 2400 3400 50  0001 C CNN
 F 3 "" H 2400 3400 50  0001 C CNN
@@ -827,10 +828,10 @@ $EndComp
 Wire Wire Line
 	6900 3800 6900 3750
 $Comp
-L V+ #PWR0101
+L V+ #PWR501
 U 1 1 58D9AC1D
 P 9900 850
-F 0 "#PWR0101" H 9900 700 50  0001 C CNN
+F 0 "#PWR501" H 9900 700 50  0001 C CNN
 F 1 "V+" H 9900 990 50  0000 C CNN
 F 2 "" H 9900 850 50  0000 C CNN
 F 3 "" H 9900 850 50  0000 C CNN
@@ -849,10 +850,10 @@ F 3 "" H 6950 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR0102
+L GNDA #PWR513
 U 1 1 58D9AC20
 P 7600 2570
-F 0 "#PWR0102" H 7600 2320 50  0001 C CNN
+F 0 "#PWR513" H 7600 2320 50  0001 C CNN
 F 1 "GNDA" H 7600 2420 50  0000 C CNN
 F 2 "" H 7600 2570 50  0001 C CNN
 F 3 "" H 7600 2570 50  0001 C CNN
@@ -860,10 +861,10 @@ F 3 "" H 7600 2570 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR0103
+L GNDA #PWR523
 U 1 1 58D9AC21
 P 7600 4380
-F 0 "#PWR0103" H 7600 4130 50  0001 C CNN
+F 0 "#PWR523" H 7600 4130 50  0001 C CNN
 F 1 "GNDA" H 7600 4230 50  0000 C CNN
 F 2 "" H 7600 4380 50  0001 C CNN
 F 3 "" H 7600 4380 50  0001 C CNN
@@ -871,10 +872,10 @@ F 3 "" H 7600 4380 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR0104
+L GNDA #PWR520
 U 1 1 58D9AC22
 P 6250 3700
-F 0 "#PWR0104" H 6250 3450 50  0001 C CNN
+F 0 "#PWR520" H 6250 3450 50  0001 C CNN
 F 1 "GNDA" H 6250 3550 50  0000 C CNN
 F 2 "" H 6250 3700 50  0001 C CNN
 F 3 "" H 6250 3700 50  0001 C CNN
@@ -882,10 +883,10 @@ F 3 "" H 6250 3700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDA #PWR0105
+L GNDA #PWR510
 U 1 1 58D9AC23
 P 6250 1900
-F 0 "#PWR0105" H 6250 1650 50  0001 C CNN
+F 0 "#PWR510" H 6250 1650 50  0001 C CNN
 F 1 "GNDA" H 6250 1750 50  0000 C CNN
 F 2 "" H 6250 1900 50  0001 C CNN
 F 3 "" H 6250 1900 50  0001 C CNN
@@ -958,10 +959,10 @@ F 3 "" H 9420 1300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L V- #PWR0106
+L V- #PWR506
 U 1 1 58DE119D
 P 9900 1450
-F 0 "#PWR0106" H 9900 1300 50  0001 C CNN
+F 0 "#PWR506" H 9900 1300 50  0001 C CNN
 F 1 "V-" H 9900 1590 50  0000 C CNN
 F 2 "" H 9900 1450 50  0000 C CNN
 F 3 "" H 9900 1450 50  0000 C CNN
@@ -974,10 +975,10 @@ Connection ~ 9650 1450
 Connection ~ 9900 1450
 Connection ~ 9420 1150
 $Comp
-L GNDA #PWR0107
+L GNDA #PWR503
 U 1 1 58DE146F
 P 9300 1150
-F 0 "#PWR0107" H 9300 900 50  0001 C CNN
+F 0 "#PWR503" H 9300 900 50  0001 C CNN
 F 1 "GNDA" H 9300 1000 50  0000 C CNN
 F 2 "" H 9300 1150 50  0001 C CNN
 F 3 "" H 9300 1150 50  0001 C CNN
diff --git a/ltspice/BMI-signal-playground.asc b/ltspice/BMI-signal-playground.asc
index ebd0e23..2d0cde4 100644
--- a/ltspice/BMI-signal-playground.asc
+++ b/ltspice/BMI-signal-playground.asc
@@ -106,7 +106,7 @@ SYMBOL voltage -2176 -576 R0
 WINDOW 123 0 0 Left 2
 WINDOW 39 24 124 Left 2
 SYMATTR InstName V1
-SYMATTR Value PULSE(0 {KICK} 0.5 10ms 200ms 0.05 2 120)
+SYMATTR Value SINE(0 {KICK} 10 0.5 0 0 5)
 SYMBOL voltage -2656 -832 M0
 WINDOW 123 0 0 Left 2
 WINDOW 39 24 44 Left 2
@@ -150,23 +150,23 @@ SYMBOL res -1600 -1312 R90
 WINDOW 0 0 56 VBottom 2
 WINDOW 3 23 56 VTop 2
 SYMATTR InstName R1
-SYMATTR Value 3.29k
+SYMATTR Value 8k
 SYMBOL cap -1984 -1088 R90
 WINDOW 0 0 32 VBottom 2
 WINDOW 3 32 32 VTop 2
 SYMATTR InstName C3
-SYMATTR Value 482nF
+SYMATTR Value 0.1µ
 SYMBOL res -2000 -1088 R0
 SYMATTR InstName R16
-SYMATTR Value 1Meg
+SYMATTR Value 39Meg
 SYMBOL res -2000 -1008 R0
 SYMATTR InstName R7
-SYMATTR Value 1Meg
+SYMATTR Value 39Meg
 SYMBOL cap -1984 -1152 R90
 WINDOW 0 0 32 VBottom 2
 WINDOW 3 32 32 VTop 2
 SYMATTR InstName C2
-SYMATTR Value 482nF
+SYMATTR Value 0.1µ
 SYMBOL cap -1360 -592 R90
 WINDOW 0 0 32 VBottom 2
 WINDOW 3 32 32 VTop 2
@@ -210,9 +210,9 @@ WINDOW 3 36 40 Left 2
 SYMATTR InstName R9
 SYMATTR Value 121k
 SYMBOL bv -2320 -1152 R0
-WINDOW 3 -122 -95 Left 2
-SYMATTR InstName B1
+WINDOW 3 11 330 Left 2
 SYMATTR Value R={BR} + sin(2*{PI}*(0.28 + random(time/1.5)/10) * time)*0.1MEG
+SYMATTR InstName B1
 SYMBOL Opamps\\LT1167 -1648 -1088 R0
 SYMATTR InstName U2
 TEXT -1576 -408 Left 2 ;Sensor Slipage
@@ -226,8 +226,8 @@ TEXT -1640 -736 Left 2 ;.noise V(OUT) V2 dec 1000 0.1 1000
 TEXT -2816 -1208 Left 2 ;Respiration Model
 TEXT -1576 -384 Left 2 ;10% Change in sensor output, 100ms rise time
 TEXT -2320 -416 Left 2 ;0.1% change in sensor output\n20ms rise time, 50ms active, 200ms fall time
-TEXT -2104 -456 Left 2 !.step param KICK list 0 0.001
-TEXT -1642 -778 Left 2 !.tran 30
+TEXT -2104 -456 Left 2 !.param KICK=0.1
+TEXT -1640 -776 Left 2 !.tran 30
 LINE Normal -2544 -1056 -3184 -1056 2
 LINE Normal -2544 -480 -2544 -1056 2
 LINE Normal -3184 -480 -2544 -480 2
diff --git a/pdf/schematic.pdf b/pdf/schematic.pdf
index 873a717..93d4591 100644
Binary files a/pdf/schematic.pdf and b/pdf/schematic.pdf differ