diff --git a/PCB/Tinylab_proto1.bak b/PCB/Tinylab_proto1.bak
index ea16447e..d2dd0894 100644
--- a/PCB/Tinylab_proto1.bak
+++ b/PCB/Tinylab_proto1.bak
@@ -191,23 +191,23 @@ $EndComp
 $Comp
 L C_Small C2
 U 1 1 55CAB4DE
-P 1700 9700
-F 0 "C2" H 1710 9770 50  0000 L CNN
-F 1 "C" H 1710 9620 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 1700 9700 60  0001 C CNN
-F 3 "" H 1700 9700 60  0000 C CNN
-	1    1700 9700
+P 1550 9950
+F 0 "C2" H 1560 10020 50  0000 L CNN
+F 1 "C" H 1560 9870 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 1550 9950 60  0001 C CNN
+F 3 "" H 1550 9950 60  0000 C CNN
+	1    1550 9950
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C1
 U 1 1 55CAB611
-P 1700 9500
-F 0 "C1" H 1710 9570 50  0000 L CNN
-F 1 "C" H 1710 9420 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 1700 9500 60  0001 C CNN
-F 3 "" H 1700 9500 60  0000 C CNN
-	1    1700 9500
+P 1450 9300
+F 0 "C1" H 1460 9370 50  0000 L CNN
+F 1 "C" H 1460 9220 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 1450 9300 60  0001 C CNN
+F 3 "" H 1450 9300 60  0000 C CNN
+	1    1450 9300
 	0    1    1    0   
 $EndComp
 Text Label 3150 9500 0    60   ~ 0
@@ -873,39 +873,6 @@ F 3 "" H 10000 11400 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X02 P1
-U 1 1 56EA2C80
-P 1200 9250
-F 0 "P1" H 1200 9400 50  0000 C CNN
-F 1 "SCOPE_IN_CH1" V 1300 9250 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1200 9250 60  0001 C CNN
-F 3 "" H 1200 9250 60  0000 C CNN
-	1    1200 9250
-	-1   0    0    1   
-$EndComp
-$Comp
-L CONN_01X02 P9
-U 1 1 56EA2D2D
-P 1400 9600
-F 0 "P9" H 1400 9750 50  0000 C CNN
-F 1 "SCOPE_IN_AC" V 1500 9600 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1400 9600 60  0001 C CNN
-F 3 "" H 1400 9600 60  0000 C CNN
-	1    1400 9600
-	-1   0    0    1   
-$EndComp
-$Comp
-L CONN_01X02 P5
-U 1 1 56EA3310
-P 1200 9950
-F 0 "P5" H 1200 10100 50  0000 C CNN
-F 1 "SCOPE_IN_CH2" V 1300 9950 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1200 9950 60  0001 C CNN
-F 3 "" H 1200 9950 60  0000 C CNN
-	1    1200 9950
-	-1   0    0    1   
-$EndComp
-$Comp
 L CONN_01X02 P7
 U 1 1 56F2A93D
 P 14150 5350
@@ -1008,61 +975,84 @@ $EndComp
 Text Label 10150 5350 0    60   ~ 0
 PSU_PWM
 $Comp
-L Q_NMOS_GSD Q?
+L Q_NMOS_GSD Q1
 U 1 1 583120F2
 P 10650 5350
-F 0 "Q?" H 10950 5400 50  0000 R CNN
+F 0 "Q1" H 10950 5400 50  0000 R CNN
 F 1 "Q_NMOS_GSD" H 11300 5300 50  0000 R CNN
-F 2 "" H 10850 5450 50  0000 C CNN
+F 2 "SMD:SOT-23-3" H 10850 5450 50  0001 C CNN
 F 3 "" H 10650 5350 50  0000 C CNN
 	1    10650 5350
 	1    0    0    -1  
 $EndComp
 NoConn ~ 5250 5900
 $Comp
-L LED D?
+L LED D2
 U 1 1 5833E159
 P 14450 5450
-F 0 "D?" H 14450 5550 50  0000 C CNN
+F 0 "D2" H 14450 5550 50  0000 C CNN
 F 1 "LED" H 14450 5350 50  0000 C CNN
-F 2 "" H 14450 5450 50  0000 C CNN
+F 2 "LEDs:LED_0603" H 14450 5450 50  0001 C CNN
 F 3 "" H 14450 5450 50  0000 C CNN
 	1    14450 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R_Small R?
+L R_Small R32
 U 1 1 5833E34C
 P 14450 5150
-F 0 "R?" H 14480 5170 50  0000 L CNN
+F 0 "R32" H 14480 5170 50  0000 L CNN
 F 1 "R_Small" H 14480 5110 50  0000 L CNN
-F 2 "" H 14450 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" H 14450 5150 50  0001 C CNN
 F 3 "" H 14450 5150 50  0000 C CNN
 	1    14450 5150
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X03 P?
+L CONN_01X03 P10
 U 1 1 5837847B
 P 12800 4950
-F 0 "P?" H 12800 5150 50  0000 C CNN
+F 0 "P10" H 12800 5150 50  0000 C CNN
 F 1 "CONN_01X03" V 12900 4950 50  0000 C CNN
-F 2 "" H 12800 4950 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 12800 4950 50  0001 C CNN
 F 3 "" H 12800 4950 50  0000 C CNN
 	1    12800 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X03 P?
+L CONN_01X03 P11
 U 1 1 58378536
 P 13400 4950
-F 0 "P?" H 13400 5150 50  0000 C CNN
+F 0 "P11" H 13400 5150 50  0000 C CNN
 F 1 "CONN_01X03" V 13500 4950 50  0000 C CNN
-F 2 "" H 13400 4950 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 13400 4950 50  0001 C CNN
 F 3 "" H 13400 4950 50  0000 C CNN
 	1    13400 4950
 	1    0    0    -1  
 $EndComp
+NoConn ~ 13200 4850
+$Comp
+L CONN_01X04 P?
+U 1 1 5832064B
+P 1050 9250
+F 0 "P?" H 1050 9500 50  0000 C CNN
+F 1 "CONN_01X04" V 1150 9250 50  0000 C CNN
+F 2 "" H 1050 9250 50  0000 C CNN
+F 3 "" H 1050 9250 50  0000 C CNN
+	1    1050 9250
+	-1   0    0    1   
+$EndComp
+$Comp
+L CONN_01X04 P?
+U 1 1 58320706
+P 1050 9900
+F 0 "P?" H 1050 10150 50  0000 C CNN
+F 1 "CONN_01X04" V 1150 9900 50  0000 C CNN
+F 2 "" H 1050 9900 50  0000 C CNN
+F 3 "" H 1050 9900 50  0000 C CNN
+	1    1050 9900
+	-1   0    0    1   
+$EndComp
 Connection ~ 13950 5050
 Connection ~ 14450 5650
 Wire Wire Line
@@ -1129,18 +1119,6 @@ Wire Wire Line
 	1950 7050 4050 7050
 Connection ~ 9600 9250
 Connection ~ 10000 11550
-Connection ~ 1400 9950
-Wire Wire Line
-	1400 9900 1400 10000
-Wire Wire Line
-	1800 9950 1800 9700
-Wire Wire Line
-	1400 9950 1850 9950
-Connection ~ 1400 9250
-Wire Wire Line
-	1400 9200 1400 9300
-Wire Wire Line
-	1400 9250 1850 9250
 Wire Wire Line
 	6000 6600 6000 7100
 Wire Wire Line
@@ -1413,14 +1391,6 @@ Wire Wire Line
 	2350 9600 2850 9600
 Connection ~ 2850 9600
 Connection ~ 2350 9600
-Wire Wire Line
-	1600 9650 1600 9700
-Wire Wire Line
-	1600 9550 1600 9500
-Wire Wire Line
-	1800 9500 1800 9250
-Connection ~ 1800 9250
-Connection ~ 1800 9950
 Wire Wire Line
 	3700 8850 3700 9000
 Wire Wire Line
@@ -1482,21 +1452,35 @@ Wire Wire Line
 Connection ~ 13050 4600
 Wire Wire Line
 	13950 5300 13950 5050
-$Comp
-L CONN_01X02 P?
-U 1 1 5837E9FB
-P 13750 5350
-F 0 "P?" H 13750 5500 50  0000 C CNN
-F 1 "CONN_01X02" V 13850 5350 50  0000 C CNN
-F 2 "" H 13750 5350 50  0000 C CNN
-F 3 "" H 13750 5350 50  0000 C CNN
-	1    13750 5350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	13550 5300 13550 5650
-Connection ~ 13550 5650
-Connection ~ 13550 5400
 Wire Wire Line
 	13050 4950 13200 4950
+Wire Wire Line
+	1850 9100 1850 9400
+Wire Wire Line
+	1850 9100 1250 9100
+Wire Wire Line
+	1250 9200 1850 9200
+Connection ~ 1850 9200
+Wire Wire Line
+	1850 9400 1250 9400
+Connection ~ 1850 9250
+Wire Wire Line
+	1250 9300 1350 9300
+Wire Wire Line
+	1550 9300 1850 9300
+Connection ~ 1850 9300
+Wire Wire Line
+	1850 9950 1650 9950
+Wire Wire Line
+	1450 9950 1250 9950
+Wire Wire Line
+	1850 9750 1850 10050
+Wire Wire Line
+	1850 10050 1250 10050
+Wire Wire Line
+	1250 9850 1850 9850
+Connection ~ 1850 9950
+Wire Wire Line
+	1250 9750 1850 9750
+Connection ~ 1850 9850
 $EndSCHEMATC
diff --git a/PCB/Tinylab_proto1.kicad_pcb b/PCB/Tinylab_proto1.kicad_pcb.bak
similarity index 100%
rename from PCB/Tinylab_proto1.kicad_pcb
rename to PCB/Tinylab_proto1.kicad_pcb.bak
diff --git a/PCB/Tinylab_proto1.net b/PCB/Tinylab_proto1.net
index 74974fd1..99dd5dcc 100644
--- a/PCB/Tinylab_proto1.net
+++ b/PCB/Tinylab_proto1.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source C:/Users/Esposch/Documents/GitHub/Labrador/PCB/Tinylab_proto1.sch)
-    (date "20/11/2016 3:50:00 PM")
+    (date "20/11/2016 5:27:22 PM")
     (tool "Eeschema 4.0.4-stable")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -375,24 +375,6 @@
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 56E98921))
-    (comp (ref P1)
-      (value SCOPE_IN_CH1)
-      (footprint Pin_Headers:Pin_Header_Straight_1x02)
-      (libsource (lib conn) (part CONN_01X02))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 56EA2C80))
-    (comp (ref P9)
-      (value SCOPE_IN_AC)
-      (footprint Pin_Headers:Pin_Header_Straight_1x02)
-      (libsource (lib conn) (part CONN_01X02))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 56EA2D2D))
-    (comp (ref P5)
-      (value SCOPE_IN_CH2)
-      (footprint Pin_Headers:Pin_Header_Straight_1x02)
-      (libsource (lib conn) (part CONN_01X02))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 56EA3310))
     (comp (ref P7)
       (value CONN_01X02)
       (footprint Pin_Headers:Pin_Header_Straight_1x02)
@@ -459,12 +441,18 @@
       (libsource (lib conn) (part CONN_01X03))
       (sheetpath (names /) (tstamps /))
       (tstamp 58378536))
-    (comp (ref P12)
-      (value CONN_01X02)
-      (footprint Pin_Headers:Pin_Header_Straight_1x02)
-      (libsource (lib conn) (part CONN_01X02))
+    (comp (ref P1)
+      (value CONN_01X04)
+      (footprint Pin_Headers:Pin_Header_Straight_2x04)
+      (libsource (lib conn) (part CONN_01X04))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5837E9FB)))
+      (tstamp 5832064B))
+    (comp (ref P5)
+      (value CONN_01X04)
+      (footprint Pin_Headers:Pin_Header_Straight_2x04)
+      (libsource (lib conn) (part CONN_01X04))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 58320706)))
   (libparts
     (libpart (lib Tinylab_proto1-rescue) (part 78L05-RESCUE-Tinylab_proto1)
       (fields
@@ -752,256 +740,256 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (libraries
+    (library (logical device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
     (library (logical ESPO_PART)
       (uri C:\Users\Esposch\Documents\KiCAD\ESPO_PART.lib))
     (library (logical atmel)
       (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\atmel.lib"))
     (library (logical Tinylab_proto1-rescue)
       (uri C:\Users\Esposch\Documents\GitHub\Labrador\PCB\Tinylab_proto1-rescue.lib))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
     (library (logical conn)
       (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib")))
   (nets
     (net (code 1) (name "Net-(R15-Pad1)")
       (node (ref R16) (pin 1))
-      (node (ref U2) (pin 13))
+      (node (ref R15) (pin 1))
       (node (ref R20) (pin 2))
-      (node (ref R15) (pin 1)))
-    (net (code 2) (name "Net-(C2-Pad1)")
-      (node (ref P5) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref P5) (pin 1))
-      (node (ref R2) (pin 2)))
-    (net (code 3) (name /TO_B1)
-      (node (ref U3) (pin 5))
-      (node (ref IC1) (pin 5)))
-    (net (code 4) (name "Net-(R17-Pad2)")
-      (node (ref R17) (pin 2))
+      (node (ref U2) (pin 13)))
+    (net (code 2) (name "Net-(R17-Pad2)")
       (node (ref R18) (pin 2))
-      (node (ref U3) (pin 3)))
+      (node (ref U3) (pin 3))
+      (node (ref R17) (pin 2)))
+    (net (code 3) (name /VCC_3V3)
+      (node (ref L2) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref C6) (pin 1))
+      (node (ref F1) (pin 2))
+      (node (ref IC1) (pin 19))
+      (node (ref U1) (pin 2))
+      (node (ref C4) (pin 1))
+      (node (ref IC1) (pin 31)))
+    (net (code 4) (name "Net-(C13-Pad2)")
+      (node (ref R24) (pin 1))
+      (node (ref C13) (pin 2))
+      (node (ref P6) (pin 1)))
     (net (code 5) (name "Net-(C14-Pad1)")
-      (node (ref P6) (pin 4))
-      (node (ref C14) (pin 1)))
+      (node (ref C14) (pin 1))
+      (node (ref P6) (pin 4)))
     (net (code 6) (name "Net-(C14-Pad2)")
-      (node (ref P6) (pin 3))
       (node (ref R25) (pin 1))
-      (node (ref C14) (pin 2)))
+      (node (ref C14) (pin 2))
+      (node (ref P6) (pin 3)))
     (net (code 7) (name "Net-(C13-Pad1)")
       (node (ref C13) (pin 1))
       (node (ref P6) (pin 2)))
-    (net (code 8) (name "Net-(C13-Pad2)")
-      (node (ref C13) (pin 2))
-      (node (ref R24) (pin 1))
-      (node (ref P6) (pin 1)))
-    (net (code 9) (name /PSU_PWM)
-      (node (ref R31) (pin 1))
-      (node (ref Q1) (pin 1))
-      (node (ref IC1) (pin 24)))
-    (net (code 10) (name "Net-(D1-Pad2)")
-      (node (ref Q1) (pin 3))
-      (node (ref D1) (pin 2))
-      (node (ref L1) (pin 1)))
-    (net (code 11) (name "Net-(IC1-Pad23)")
-      (node (ref IC1) (pin 23)))
-    (net (code 12) (name "Net-(D2-Pad2)")
-      (node (ref R32) (pin 2))
-      (node (ref D2) (pin 2)))
-    (net (code 13) (name "Net-(P11-Pad1)")
+    (net (code 8) (name /TO_B1)
+      (node (ref IC1) (pin 5))
+      (node (ref U3) (pin 5)))
+    (net (code 9) (name "Net-(P11-Pad1)")
       (node (ref P11) (pin 1)))
-    (net (code 14) (name "Net-(L3-Pad1)")
-      (node (ref L4) (pin 2))
-      (node (ref L3) (pin 1)))
-    (net (code 15) (name "Net-(IC1-Pad34)")
-      (node (ref P4) (pin 2))
-      (node (ref IC1) (pin 34)))
-    (net (code 16) (name /PSU_OUT)
-      (node (ref R32) (pin 1))
-      (node (ref P7) (pin 1))
-      (node (ref P11) (pin 3)))
-    (net (code 17) (name /PSU_FDBK)
-      (node (ref IC1) (pin 1))
-      (node (ref R27) (pin 1))
-      (node (ref R26) (pin 2))
-      (node (ref P10) (pin 2)))
-    (net (code 18) (name "Net-(C1-Pad1)")
-      (node (ref P1) (pin 2))
-      (node (ref R1) (pin 2))
-      (node (ref P1) (pin 1))
-      (node (ref C1) (pin 1)))
-    (net (code 19) (name "Net-(C2-Pad2)")
-      (node (ref C2) (pin 2))
-      (node (ref P9) (pin 1)))
-    (net (code 20) (name "Net-(C1-Pad2)")
+    (net (code 10) (name "Net-(IC1-Pad23)")
+      (node (ref IC1) (pin 23)))
+    (net (code 11) (name "Net-(D2-Pad2)")
+      (node (ref D2) (pin 2))
+      (node (ref R32) (pin 2)))
+    (net (code 12) (name "Net-(D1-Pad2)")
+      (node (ref Q1) (pin 3))
+      (node (ref L1) (pin 1))
+      (node (ref D1) (pin 2)))
+    (net (code 13) (name "Net-(C1-Pad2)")
       (node (ref C1) (pin 2))
-      (node (ref P9) (pin 2)))
-    (net (code 21) (name "Net-(R1-Pad1)")
-      (node (ref R1) (pin 1))
-      (node (ref R3) (pin 1))
-      (node (ref U2) (pin 3)))
-    (net (code 22) (name /CH1)
-      (node (ref U2) (pin 1))
-      (node (ref R21) (pin 1))
-      (node (ref IC1) (pin 42))
-      (node (ref U2) (pin 2)))
-    (net (code 23) (name /CH2)
-      (node (ref R28) (pin 2))
-      (node (ref U2) (pin 7))
-      (node (ref IC1) (pin 2))
-      (node (ref U2) (pin 6))
-      (node (ref IC1) (pin 40)))
-    (net (code 24) (name "Net-(R12-Pad2)")
-      (node (ref R12) (pin 2))
-      (node (ref R8) (pin 1)))
-    (net (code 25) (name "Net-(IC1-Pad29)")
-      (node (ref R12) (pin 1))
-      (node (ref IC1) (pin 29)))
-    (net (code 26) (name "Net-(IC1-Pad28)")
-      (node (ref R11) (pin 1))
-      (node (ref IC1) (pin 28)))
-    (net (code 27) (name "Net-(R10-Pad1)")
-      (node (ref R14) (pin 2))
-      (node (ref R10) (pin 1)))
-    (net (code 28) (name "Net-(R13-Pad2)")
-      (node (ref R13) (pin 2))
-      (node (ref R9) (pin 1)))
-    (net (code 29) (name "Net-(R11-Pad2)")
-      (node (ref R11) (pin 2))
-      (node (ref R7) (pin 1)))
-    (net (code 30) (name "Net-(R22-Pad1)")
-      (node (ref R22) (pin 1))
-      (node (ref R24) (pin 2)))
-    (net (code 31) (name +5V)
-      (node (ref U1) (pin 3))
-      (node (ref C9) (pin 1))
-      (node (ref L1) (pin 2))
-      (node (ref P2) (pin 1))
-      (node (ref C3) (pin 1))
-      (node (ref C10) (pin 1)))
-    (net (code 32) (name "Net-(R2-Pad1)")
-      (node (ref U2) (pin 5))
-      (node (ref R2) (pin 1))
-      (node (ref R4) (pin 2)))
-    (net (code 33) (name /DAC_OUT)
-      (node (ref U2) (pin 10))
-      (node (ref IC1) (pin 6)))
-    (net (code 34) (name "Net-(C7-Pad1)")
-      (node (ref R26) (pin 1))
-      (node (ref C7) (pin 1))
-      (node (ref L3) (pin 2))
-      (node (ref P10) (pin 1))
-      (node (ref P11) (pin 2))
-      (node (ref D1) (pin 1)))
-    (net (code 35) (name "Net-(IC1-Pad35)")
-      (node (ref IC1) (pin 35))
-      (node (ref P4) (pin 4)))
-    (net (code 36) (name "Net-(F1-Pad1)")
-      (node (ref F1) (pin 1))
-      (node (ref P4) (pin 1)))
-    (net (code 37) (name /VCC_3V3)
-      (node (ref L2) (pin 1))
-      (node (ref IC1) (pin 19))
-      (node (ref C11) (pin 1))
-      (node (ref U1) (pin 2))
-      (node (ref IC1) (pin 31))
-      (node (ref C4) (pin 1))
-      (node (ref F1) (pin 2))
-      (node (ref C6) (pin 1)))
-    (net (code 38) (name "Net-(P3-Pad4)")
-      (node (ref R7) (pin 2))
-      (node (ref P3) (pin 4)))
-    (net (code 39) (name "Net-(P3-Pad1)")
-      (node (ref R10) (pin 2))
-      (node (ref P3) (pin 1)))
-    (net (code 40) (name "Net-(P3-Pad2)")
-      (node (ref P3) (pin 2))
-      (node (ref R9) (pin 2)))
-    (net (code 41) (name "Net-(P3-Pad3)")
-      (node (ref P3) (pin 3))
-      (node (ref R8) (pin 2)))
-    (net (code 42) (name "Net-(IC1-Pad33)")
-      (node (ref IC1) (pin 33))
-      (node (ref R14) (pin 1)))
-    (net (code 43) (name "Net-(IC1-Pad32)")
-      (node (ref R13) (pin 1))
-      (node (ref IC1) (pin 32)))
-    (net (code 44) (name "Net-(P8-Pad2)")
-      (node (ref P8) (pin 2))
-      (node (ref U4) (pin 2)))
-    (net (code 45) (name "Net-(P8-Pad1)")
-      (node (ref U4) (pin 5))
-      (node (ref P8) (pin 1)))
-    (net (code 46) (name /AVCC)
-      (node (ref R5) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref C17) (pin 1))
-      (node (ref C18) (pin 1))
-      (node (ref L2) (pin 2))
-      (node (ref C8) (pin 1))
-      (node (ref C12) (pin 1))
-      (node (ref IC1) (pin 39)))
-    (net (code 47) (name "Net-(P2-Pad4)")
-      (node (ref P2) (pin 4)))
-    (net (code 48) (name /DAC_OUT2)
-      (node (ref U2) (pin 12))
-      (node (ref IC1) (pin 7)))
-    (net (code 49) (name "Net-(IC1-Pad3)")
-      (node (ref IC1) (pin 3)))
-    (net (code 50) (name "Net-(IC1-Pad9)")
-      (node (ref IC1) (pin 9)))
-    (net (code 51) (name "Net-(IC1-Pad10)")
-      (node (ref IC1) (pin 10)))
-    (net (code 52) (name "Net-(IC1-Pad20)")
-      (node (ref IC1) (pin 20)))
-    (net (code 53) (name "Net-(IC1-Pad21)")
-      (node (ref IC1) (pin 21)))
-    (net (code 54) (name /VGND)
-      (node (ref U4) (pin 4))
-      (node (ref R28) (pin 1))
-      (node (ref R21) (pin 2))
-      (node (ref R27) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref C15) (pin 2))
-      (node (ref P4) (pin 3))
-      (node (ref C11) (pin 2))
-      (node (ref IC1) (pin 18))
-      (node (ref IC1) (pin 38))
-      (node (ref P2) (pin 5))
-      (node (ref U2) (pin 11))
-      (node (ref U4) (pin 1))
-      (node (ref IC1) (pin 14))
-      (node (ref U3) (pin 4))
-      (node (ref U3) (pin 1))
-      (node (ref C6) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref C8) (pin 2))
-      (node (ref R30) (pin 1))
-      (node (ref R29) (pin 2))
-      (node (ref P7) (pin 2))
-      (node (ref IC1) (pin 30))
-      (node (ref P12) (pin 1))
-      (node (ref P12) (pin 2))
-      (node (ref D2) (pin 1))
-      (node (ref C12) (pin 2))
-      (node (ref R31) (pin 2))
-      (node (ref Q1) (pin 2))
-      (node (ref P10) (pin 3))
-      (node (ref IC1) (pin 8))
-      (node (ref C18) (pin 2))
-      (node (ref C17) (pin 2))
+      (node (ref P1) (pin 2)))
+    (net (code 14) (name "Net-(L3-Pad1)")
+      (node (ref L3) (pin 1))
+      (node (ref L4) (pin 2)))
+    (net (code 15) (name /VGND)
       (node (ref C3) (pin 2))
       (node (ref C4) (pin 2))
       (node (ref U1) (pin 1))
       (node (ref R6) (pin 1))
+      (node (ref R28) (pin 1))
+      (node (ref R30) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref R21) (pin 2))
+      (node (ref R29) (pin 2))
+      (node (ref U4) (pin 4))
+      (node (ref C9) (pin 2))
+      (node (ref R27) (pin 2))
+      (node (ref C10) (pin 2))
+      (node (ref C16) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref P4) (pin 3))
+      (node (ref IC1) (pin 14))
+      (node (ref P2) (pin 6))
+      (node (ref IC1) (pin 8))
+      (node (ref IC1) (pin 30))
+      (node (ref U2) (pin 11))
+      (node (ref IC1) (pin 18))
+      (node (ref IC1) (pin 38))
+      (node (ref P2) (pin 5))
+      (node (ref U4) (pin 1))
       (node (ref C5) (pin 2))
-      (node (ref P2) (pin 6)))
+      (node (ref U3) (pin 4))
+      (node (ref C11) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref C8) (pin 2))
+      (node (ref U3) (pin 1))
+      (node (ref P7) (pin 2))
+      (node (ref P10) (pin 3))
+      (node (ref D2) (pin 1))
+      (node (ref C17) (pin 2))
+      (node (ref Q1) (pin 2))
+      (node (ref R31) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref C18) (pin 2)))
+    (net (code 16) (name "Net-(C2-Pad2)")
+      (node (ref P5) (pin 2))
+      (node (ref C2) (pin 2)))
+    (net (code 17) (name /PSU_PWM)
+      (node (ref R31) (pin 1))
+      (node (ref IC1) (pin 24))
+      (node (ref Q1) (pin 1)))
+    (net (code 18) (name "Net-(IC1-Pad34)")
+      (node (ref P4) (pin 2))
+      (node (ref IC1) (pin 34)))
+    (net (code 19) (name "Net-(C2-Pad1)")
+      (node (ref P5) (pin 1))
+      (node (ref P5) (pin 4))
+      (node (ref P5) (pin 3))
+      (node (ref R2) (pin 2))
+      (node (ref C2) (pin 1)))
+    (net (code 20) (name /PSU_OUT)
+      (node (ref R32) (pin 1))
+      (node (ref P11) (pin 3))
+      (node (ref P7) (pin 1)))
+    (net (code 21) (name /PSU_FDBK)
+      (node (ref IC1) (pin 1))
+      (node (ref R27) (pin 1))
+      (node (ref P10) (pin 2))
+      (node (ref R26) (pin 2)))
+    (net (code 22) (name "Net-(R2-Pad1)")
+      (node (ref R2) (pin 1))
+      (node (ref U2) (pin 5))
+      (node (ref R4) (pin 2)))
+    (net (code 23) (name /CH1)
+      (node (ref IC1) (pin 42))
+      (node (ref U2) (pin 1))
+      (node (ref U2) (pin 2))
+      (node (ref R21) (pin 1)))
+    (net (code 24) (name "Net-(R1-Pad1)")
+      (node (ref R1) (pin 1))
+      (node (ref R3) (pin 1))
+      (node (ref U2) (pin 3)))
+    (net (code 25) (name /CH2)
+      (node (ref IC1) (pin 40))
+      (node (ref R28) (pin 2))
+      (node (ref U2) (pin 6))
+      (node (ref U2) (pin 7))
+      (node (ref IC1) (pin 2)))
+    (net (code 26) (name /DAC_OUT)
+      (node (ref IC1) (pin 6))
+      (node (ref U2) (pin 10)))
+    (net (code 27) (name "Net-(R10-Pad1)")
+      (node (ref R10) (pin 1))
+      (node (ref R14) (pin 2)))
+    (net (code 28) (name "Net-(R13-Pad2)")
+      (node (ref R13) (pin 2))
+      (node (ref R9) (pin 1)))
+    (net (code 29) (name "Net-(R12-Pad2)")
+      (node (ref R12) (pin 2))
+      (node (ref R8) (pin 1)))
+    (net (code 30) (name "Net-(R11-Pad2)")
+      (node (ref R11) (pin 2))
+      (node (ref R7) (pin 1)))
+    (net (code 31) (name "Net-(R22-Pad1)")
+      (node (ref R22) (pin 1))
+      (node (ref R24) (pin 2)))
+    (net (code 32) (name +5V)
+      (node (ref P2) (pin 1))
+      (node (ref C10) (pin 1))
+      (node (ref C9) (pin 1))
+      (node (ref L1) (pin 2))
+      (node (ref C3) (pin 1))
+      (node (ref U1) (pin 3)))
+    (net (code 33) (name "Net-(C7-Pad1)")
+      (node (ref L3) (pin 2))
+      (node (ref D1) (pin 1))
+      (node (ref R26) (pin 1))
+      (node (ref P11) (pin 2))
+      (node (ref P10) (pin 1))
+      (node (ref C7) (pin 1)))
+    (net (code 34) (name "Net-(P8-Pad2)")
+      (node (ref P8) (pin 2))
+      (node (ref U4) (pin 2)))
+    (net (code 35) (name /DAC_OUT2)
+      (node (ref U2) (pin 12))
+      (node (ref IC1) (pin 7)))
+    (net (code 36) (name "Net-(P8-Pad1)")
+      (node (ref U4) (pin 5))
+      (node (ref P8) (pin 1)))
+    (net (code 37) (name "Net-(IC1-Pad35)")
+      (node (ref P4) (pin 4))
+      (node (ref IC1) (pin 35)))
+    (net (code 38) (name "Net-(F1-Pad1)")
+      (node (ref F1) (pin 1))
+      (node (ref P4) (pin 1)))
+    (net (code 39) (name "Net-(IC1-Pad32)")
+      (node (ref R13) (pin 1))
+      (node (ref IC1) (pin 32)))
+    (net (code 40) (name "Net-(P3-Pad3)")
+      (node (ref P3) (pin 3))
+      (node (ref R8) (pin 2)))
+    (net (code 41) (name "Net-(P3-Pad4)")
+      (node (ref P3) (pin 4))
+      (node (ref R7) (pin 2)))
+    (net (code 42) (name "Net-(IC1-Pad33)")
+      (node (ref IC1) (pin 33))
+      (node (ref R14) (pin 1)))
+    (net (code 43) (name "Net-(IC1-Pad29)")
+      (node (ref IC1) (pin 29))
+      (node (ref R12) (pin 1)))
+    (net (code 44) (name "Net-(IC1-Pad28)")
+      (node (ref IC1) (pin 28))
+      (node (ref R11) (pin 1)))
+    (net (code 45) (name /AVCC)
+      (node (ref C18) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref L2) (pin 2))
+      (node (ref C12) (pin 1))
+      (node (ref C17) (pin 1))
+      (node (ref IC1) (pin 39))
+      (node (ref R5) (pin 1)))
+    (net (code 46) (name "Net-(P3-Pad1)")
+      (node (ref P3) (pin 1))
+      (node (ref R10) (pin 2)))
+    (net (code 47) (name "Net-(P3-Pad2)")
+      (node (ref R9) (pin 2))
+      (node (ref P3) (pin 2)))
+    (net (code 48) (name "Net-(C1-Pad1)")
+      (node (ref P1) (pin 1))
+      (node (ref P1) (pin 3))
+      (node (ref R1) (pin 2))
+      (node (ref P1) (pin 4))
+      (node (ref C1) (pin 1)))
+    (net (code 49) (name "Net-(P2-Pad4)")
+      (node (ref P2) (pin 4)))
+    (net (code 50) (name "Net-(IC1-Pad3)")
+      (node (ref IC1) (pin 3)))
+    (net (code 51) (name "Net-(IC1-Pad9)")
+      (node (ref IC1) (pin 9)))
+    (net (code 52) (name "Net-(IC1-Pad10)")
+      (node (ref IC1) (pin 10)))
+    (net (code 53) (name "Net-(IC1-Pad20)")
+      (node (ref IC1) (pin 20)))
+    (net (code 54) (name "Net-(IC1-Pad21)")
+      (node (ref IC1) (pin 21)))
     (net (code 55) (name "Net-(IC1-Pad36)")
       (node (ref IC1) (pin 36)))
     (net (code 56) (name /XCK)
-      (node (ref IC1) (pin 11))
-      (node (ref IC1) (pin 17)))
+      (node (ref IC1) (pin 17))
+      (node (ref IC1) (pin 11)))
     (net (code 57) (name "Net-(IC1-Pad37)")
       (node (ref IC1) (pin 37)))
     (net (code 58) (name "Net-(IC1-Pad16)")
@@ -1017,17 +1005,17 @@
     (net (code 62) (name "Net-(IC1-Pad41)")
       (node (ref IC1) (pin 41)))
     (net (code 63) (name /DIG_CH2)
-      (node (ref IC1) (pin 12))
-      (node (ref U4) (pin 3)))
+      (node (ref U4) (pin 3))
+      (node (ref IC1) (pin 12)))
     (net (code 64) (name "Net-(IC1-Pad22)")
       (node (ref IC1) (pin 22)))
     (net (code 65) (name "Net-(IC1-Pad13)")
       (node (ref IC1) (pin 13)))
     (net (code 66) (name /AVCC_ON_2)
-      (node (ref IC1) (pin 44))
       (node (ref R4) (pin 1))
       (node (ref R6) (pin 2))
       (node (ref R3) (pin 2))
+      (node (ref IC1) (pin 44))
       (node (ref R5) (pin 2)))
     (net (code 67) (name /DIG_CH1)
       (node (ref U4) (pin 6))
@@ -1035,32 +1023,32 @@
     (net (code 68) (name "Net-(IC1-Pad25)")
       (node (ref IC1) (pin 25)))
     (net (code 69) (name /TO_B0)
-      (node (ref IC1) (pin 4))
-      (node (ref U3) (pin 2)))
+      (node (ref U3) (pin 2))
+      (node (ref IC1) (pin 4)))
     (net (code 70) (name "Net-(R15-Pad2)")
-      (node (ref R16) (pin 2))
+      (node (ref U3) (pin 6))
       (node (ref R15) (pin 2))
-      (node (ref U3) (pin 6)))
+      (node (ref R16) (pin 2)))
     (net (code 71) (name "Net-(R17-Pad1)")
-      (node (ref U2) (pin 9))
-      (node (ref R19) (pin 2))
       (node (ref R17) (pin 1))
-      (node (ref R18) (pin 1)))
+      (node (ref R18) (pin 1))
+      (node (ref R19) (pin 2))
+      (node (ref U2) (pin 9)))
     (net (code 72) (name "Net-(R20-Pad1)")
-      (node (ref R20) (pin 1))
-      (node (ref U2) (pin 14))
       (node (ref R30) (pin 2))
-      (node (ref R23) (pin 2)))
+      (node (ref R23) (pin 2))
+      (node (ref R20) (pin 1))
+      (node (ref U2) (pin 14)))
     (net (code 73) (name "Net-(R19-Pad1)")
       (node (ref R22) (pin 2))
+      (node (ref R19) (pin 1))
       (node (ref U2) (pin 8))
-      (node (ref R29) (pin 1))
-      (node (ref R19) (pin 1)))
+      (node (ref R29) (pin 1)))
     (net (code 74) (name "Net-(R23-Pad1)")
       (node (ref R25) (pin 2))
       (node (ref R23) (pin 1)))
     (net (code 75) (name /OPAMP_VCC)
-      (node (ref L4) (pin 1))
       (node (ref U2) (pin 4))
+      (node (ref L4) (pin 1))
       (node (ref C15) (pin 1))
       (node (ref C16) (pin 1)))))
\ No newline at end of file
diff --git a/PCB/Tinylab_proto1.sch b/PCB/Tinylab_proto1.sch
index 1bcdad20..d35340f3 100644
--- a/PCB/Tinylab_proto1.sch
+++ b/PCB/Tinylab_proto1.sch
@@ -191,23 +191,23 @@ $EndComp
 $Comp
 L C_Small C2
 U 1 1 55CAB4DE
-P 1700 9700
-F 0 "C2" H 1710 9770 50  0000 L CNN
-F 1 "C" H 1710 9620 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 1700 9700 60  0001 C CNN
-F 3 "" H 1700 9700 60  0000 C CNN
-	1    1700 9700
+P 1550 9950
+F 0 "C2" H 1560 10020 50  0000 L CNN
+F 1 "C" H 1560 9870 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 1550 9950 60  0001 C CNN
+F 3 "" H 1550 9950 60  0000 C CNN
+	1    1550 9950
 	0    1    1    0   
 $EndComp
 $Comp
 L C_Small C1
 U 1 1 55CAB611
-P 1700 9500
-F 0 "C1" H 1710 9570 50  0000 L CNN
-F 1 "C" H 1710 9420 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 1700 9500 60  0001 C CNN
-F 3 "" H 1700 9500 60  0000 C CNN
-	1    1700 9500
+P 1450 9300
+F 0 "C1" H 1460 9370 50  0000 L CNN
+F 1 "C" H 1460 9220 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 1450 9300 60  0001 C CNN
+F 3 "" H 1450 9300 60  0000 C CNN
+	1    1450 9300
 	0    1    1    0   
 $EndComp
 Text Label 3150 9500 0    60   ~ 0
@@ -391,10 +391,10 @@ Dig Output\n
 Text Notes 10050 4650 0    60   ~ 0
 PSU\n
 $Comp
-L +5V #PWR01
+L +5V #PWR1
 U 1 1 55CD51C0
 P 2700 6650
-F 0 "#PWR01" H 2700 6500 50  0001 C CNN
+F 0 "#PWR1" H 2700 6500 50  0001 C CNN
 F 1 "+5V" H 2700 6790 50  0000 C CNN
 F 2 "" H 2700 6650 60  0000 C CNN
 F 3 "" H 2700 6650 60  0000 C CNN
@@ -775,10 +775,10 @@ TO_B1
 Text Label 7050 5250 0    60   ~ 0
 TO_B1
 $Comp
-L +5V #PWR02
+L +5V #PWR2
 U 1 1 56E7FFFF
 P 9100 5050
-F 0 "#PWR02" H 9100 4900 50  0001 C CNN
+F 0 "#PWR2" H 9100 4900 50  0001 C CNN
 F 1 "+5V" H 9100 5190 50  0000 C CNN
 F 2 "" H 9100 5050 60  0000 C CNN
 F 3 "" H 9100 5050 60  0000 C CNN
@@ -873,39 +873,6 @@ F 3 "" H 10000 11400 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X02 P1
-U 1 1 56EA2C80
-P 1200 9250
-F 0 "P1" H 1200 9400 50  0000 C CNN
-F 1 "SCOPE_IN_CH1" V 1300 9250 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1200 9250 60  0001 C CNN
-F 3 "" H 1200 9250 60  0000 C CNN
-	1    1200 9250
-	-1   0    0    1   
-$EndComp
-$Comp
-L CONN_01X02 P9
-U 1 1 56EA2D2D
-P 1400 9600
-F 0 "P9" H 1400 9750 50  0000 C CNN
-F 1 "SCOPE_IN_AC" V 1500 9600 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1400 9600 60  0001 C CNN
-F 3 "" H 1400 9600 60  0000 C CNN
-	1    1400 9600
-	-1   0    0    1   
-$EndComp
-$Comp
-L CONN_01X02 P5
-U 1 1 56EA3310
-P 1200 9950
-F 0 "P5" H 1200 10100 50  0000 C CNN
-F 1 "SCOPE_IN_CH2" V 1300 9950 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 1200 9950 60  0001 C CNN
-F 3 "" H 1200 9950 60  0000 C CNN
-	1    1200 9950
-	-1   0    0    1   
-$EndComp
-$Comp
 L CONN_01X02 P7
 U 1 1 56F2A93D
 P 14150 5350
@@ -1063,6 +1030,29 @@ F 3 "" H 13400 4950 50  0000 C CNN
 	1    13400 4950
 	1    0    0    -1  
 $EndComp
+NoConn ~ 13200 4850
+$Comp
+L CONN_01X04 P1
+U 1 1 5832064B
+P 1050 9250
+F 0 "P1" H 1050 9500 50  0000 C CNN
+F 1 "CONN_01X04" V 1150 9250 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x04" H 1050 9250 50  0001 C CNN
+F 3 "" H 1050 9250 50  0000 C CNN
+	1    1050 9250
+	-1   0    0    1   
+$EndComp
+$Comp
+L CONN_01X04 P5
+U 1 1 58320706
+P 1050 9900
+F 0 "P5" H 1050 10150 50  0000 C CNN
+F 1 "CONN_01X04" V 1150 9900 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x04" H 1050 9900 50  0001 C CNN
+F 3 "" H 1050 9900 50  0000 C CNN
+	1    1050 9900
+	-1   0    0    1   
+$EndComp
 Connection ~ 13950 5050
 Connection ~ 14450 5650
 Wire Wire Line
@@ -1129,18 +1119,6 @@ Wire Wire Line
 	1950 7050 4050 7050
 Connection ~ 9600 9250
 Connection ~ 10000 11550
-Connection ~ 1400 9950
-Wire Wire Line
-	1400 9900 1400 10000
-Wire Wire Line
-	1800 9950 1800 9700
-Wire Wire Line
-	1400 9950 1850 9950
-Connection ~ 1400 9250
-Wire Wire Line
-	1400 9200 1400 9300
-Wire Wire Line
-	1400 9250 1850 9250
 Wire Wire Line
 	6000 6600 6000 7100
 Wire Wire Line
@@ -1413,14 +1391,6 @@ Wire Wire Line
 	2350 9600 2850 9600
 Connection ~ 2850 9600
 Connection ~ 2350 9600
-Wire Wire Line
-	1600 9650 1600 9700
-Wire Wire Line
-	1600 9550 1600 9500
-Wire Wire Line
-	1800 9500 1800 9250
-Connection ~ 1800 9250
-Connection ~ 1800 9950
 Wire Wire Line
 	3700 8850 3700 9000
 Wire Wire Line
@@ -1482,22 +1452,35 @@ Wire Wire Line
 Connection ~ 13050 4600
 Wire Wire Line
 	13950 5300 13950 5050
-$Comp
-L CONN_01X02 P12
-U 1 1 5837E9FB
-P 13750 5350
-F 0 "P12" H 13750 5500 50  0000 C CNN
-F 1 "CONN_01X02" V 13850 5350 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02" H 13750 5350 50  0001 C CNN
-F 3 "" H 13750 5350 50  0000 C CNN
-	1    13750 5350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	13550 5300 13550 5650
-Connection ~ 13550 5650
-Connection ~ 13550 5400
 Wire Wire Line
 	13050 4950 13200 4950
-NoConn ~ 13200 4850
+Wire Wire Line
+	1850 9100 1850 9400
+Wire Wire Line
+	1850 9100 1250 9100
+Wire Wire Line
+	1250 9200 1850 9200
+Connection ~ 1850 9200
+Wire Wire Line
+	1850 9400 1250 9400
+Connection ~ 1850 9250
+Wire Wire Line
+	1250 9300 1350 9300
+Wire Wire Line
+	1550 9300 1850 9300
+Connection ~ 1850 9300
+Wire Wire Line
+	1850 9950 1650 9950
+Wire Wire Line
+	1450 9950 1250 9950
+Wire Wire Line
+	1850 9750 1850 10050
+Wire Wire Line
+	1850 10050 1250 10050
+Wire Wire Line
+	1250 9850 1850 9850
+Connection ~ 1850 9950
+Wire Wire Line
+	1250 9750 1850 9750
+Connection ~ 1850 9850
 $EndSCHEMATC