diff --git a/HW/Q.txt b/HW/Q.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1c6168db8d9dbe31f9464b3c406fc5726a7bf214
--- /dev/null
+++ b/HW/Q.txt
@@ -0,0 +1,6 @@
+Switches connection
+Multiple PCB
+3D-print
+PCB layers
+Get components
+Size
\ No newline at end of file
diff --git a/HW/mouse/mouse-cache.lib b/HW/mouse/mouse-cache.lib
index 1094a149b846f28c7daabf64f20875d6090feaea..d07c1dd342640f38e3d924c49d534dc05ae5036e 100644
--- a/HW/mouse/mouse-cache.lib
+++ b/HW/mouse/mouse-cache.lib
@@ -18,6 +18,35 @@ X Pin_1 1 200 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Connector_Conn_01x05_Male
+#
+DEF Connector_Conn_01x05_Male J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Connector_Conn_01x05_Male" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S 34 -195 0 -205 1 1 6 F
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+S 34 205 0 195 1 1 6 F
+P 2 1 1 6 50 -200 34 -200 N
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+P 2 1 1 6 50 200 34 200 N
+X Pin_1 1 200 200 150 L 50 50 1 1 P
+X Pin_2 2 200 100 150 L 50 50 1 1 P
+X Pin_3 3 200 0 150 L 50 50 1 1 P
+X Pin_4 4 200 -100 150 L 50 50 1 1 P
+X Pin_5 5 200 -200 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Connector_Conn_01x06_Male
 #
 DEF Connector_Conn_01x06_Male J 0 40 Y N 1 F N
@@ -89,6 +118,28 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_Jumper
+#
+DEF Device_Jumper JP 0 30 Y N 1 F N
+F0 "JP" 0 150 50 H V C CNN
+F1 "Device_Jumper" 0 -80 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SolderJumper*
+ Jumper*
+ TestPoint*2Pads*
+ TestPoint*Bridge*
+$ENDFPLIST
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 50 50 0 1 P
+X 2 2 300 0 165 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_LED
 #
 DEF Device_LED D 0 40 N N 1 F N
@@ -129,111 +180,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Jumper_Jumper_3_Bridged12
-#
-DEF Jumper_Jumper_3_Bridged12 JP 0 0 Y N 1 F N
-F0 "JP" -100 -100 50 H V C CNN
-F1 "Jumper_Jumper_3_Bridged12" 0 110 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Jumper*
- TestPoint*3Pads*
- TestPoint*Bridge*
-$ENDFPLIST
-DRAW
-A -65 -50 89 1282 518 0 1 0 N -120 20 -10 20
-C -130 0 20 0 0 0 N
-C 0 0 20 0 0 0 N
-C 130 0 20 0 0 0 N
-P 2 0 1 0 0 -50 0 -20 N
-X A 1 -250 0 100 R 50 50 1 1 P
-X C 2 0 -150 100 U 50 50 1 1 I
-X B 3 250 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Lab1-rescue_AP2127R-3.3-Regulator_Linear
-#
-DEF Lab1-rescue_AP2127R-3.3-Regulator_Linear U 0 10 Y Y 1 F N
-F0 "U" -150 125 50 H V C CNN
-F1 "Lab1-rescue_AP2127R-3.3-Regulator_Linear" 0 125 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-89-3" 0 200 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
-$FPLIST
- SOT?89*
-$ENDFPLIST
-DRAW
-S -200 -200 200 75 0 1 10 f
-X GND 1 0 -300 100 U 50 50 1 1 W
-X O 2 300 0 100 L 50 50 1 1 w
-X I 3 -300 0 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# Lab1-rescue_PMW3389-MouseSensor
-#
-DEF Lab1-rescue_PMW3389-MouseSensor U 0 40 Y Y 1 F N
-F0 "U" 0 650 50 H V C CNN
-F1 "Lab1-rescue_PMW3389-MouseSensor" 0 550 50 H V C CNN
-F2 "" 0 600 50 H I C CNN
-F3 "" 0 600 50 H I C CNN
-DRAW
-S -350 450 350 -450 1 1 0 f
-X NC_0 1 -450 350 100 R 50 50 1 1 N
-X SCLK 10 450 -250 100 L 50 50 1 1 I
-X MOSI 11 450 -150 100 L 50 50 1 1 I
-X MISO 12 450 -50 100 L 50 50 1 1 O
-X NCS 13 450 50 100 L 50 50 1 1 I
-X NC_3 14 450 150 100 L 50 50 1 1 N
-X LED1_P~ 15 450 250 100 L 50 50 1 1 I
-X NC 16 450 350 100 L 50 50 1 1 N
-X NC_1 2 -450 250 100 R 50 50 1 1 N
-X VDDPIX 3 -450 150 100 R 50 50 1 1 w
-X VDD 4 -450 50 100 R 50 50 1 1 W
-X VDDIO 5 -450 -50 100 R 50 50 1 1 W
-X GP0 6 -450 -150 100 R 50 50 1 1 N
-X NRESET 7 -450 -250 100 R 50 50 1 1 I
-X GND 8 -450 -350 100 R 50 50 1 1 W
-X MOTION 9 450 -350 100 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# Lab1-rescue_USB_OTG-Connector
-#
-DEF Lab1-rescue_USB_OTG-Connector J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
-F1 "Lab1-rescue_USB_OTG-Connector" -200 350 50 H V L CNN
-F2 "" 150 -50 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
-$FPLIST
- USB*
-$ENDFPLIST
-DRAW
-C -150 85 25 0 1 10 F
-C -25 135 15 0 1 10 F
-S -200 -300 200 300 0 1 10 f
-S -5 -300 5 -270 0 1 0 N
-S 10 50 -20 20 0 1 10 F
-S 200 -205 170 -195 0 1 0 N
-S 200 -105 170 -95 0 1 0 N
-S 200 -5 170 5 0 1 0 N
-S 200 195 170 205 0 1 0 N
-P 2 0 1 10 -75 85 25 85 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
-P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
-P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
-X VBUS 1 300 200 100 L 50 50 1 1 P
-X D- 2 300 -100 100 L 50 50 1 1 B
-X D+ 3 300 0 100 L 50 50 1 1 B
-X ID 4 300 -200 100 L 50 50 1 1 P
-X GND 5 0 -400 100 U 50 50 1 1 P
-X Shield 6 -100 -400 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # MCU_ST_STM32F4_STM32F411RETx
 #
 DEF MCU_ST_STM32F4_STM32F411RETx U 0 20 Y Y 1 F N
@@ -402,6 +348,52 @@ X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
+# mouse-rescue_AP2127R-3.3-Regulator_Linear-Lab1-rescue
+#
+DEF mouse-rescue_AP2127R-3.3-Regulator_Linear-Lab1-rescue U 0 10 Y Y 1 F N
+F0 "U" -150 125 50 H V C CNN
+F1 "mouse-rescue_AP2127R-3.3-Regulator_Linear-Lab1-rescue" 0 125 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-89-3" 0 200 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ SOT?89*
+$ENDFPLIST
+DRAW
+S -200 -200 200 75 0 1 10 f
+X GND 1 0 -300 100 U 50 50 1 1 W
+X O 2 300 0 100 L 50 50 1 1 w
+X I 3 -300 0 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_PMW3389-MouseSensor-Lab1-rescue
+#
+DEF mouse-rescue_PMW3389-MouseSensor-Lab1-rescue U 0 40 Y Y 1 F N
+F0 "U" 0 650 50 H V C CNN
+F1 "mouse-rescue_PMW3389-MouseSensor-Lab1-rescue" 0 550 50 H V C CNN
+F2 "" 0 600 50 H I C CNN
+F3 "" 0 600 50 H I C CNN
+DRAW
+S -350 450 350 -450 1 1 0 f
+X NC_0 1 -450 350 100 R 50 50 1 1 N
+X SCLK 10 450 -250 100 L 50 50 1 1 I
+X MOSI 11 450 -150 100 L 50 50 1 1 I
+X MISO 12 450 -50 100 L 50 50 1 1 O
+X NCS 13 450 50 100 L 50 50 1 1 I
+X NC_3 14 450 150 100 L 50 50 1 1 N
+X LED1_P~ 15 450 250 100 L 50 50 1 1 I
+X NC 16 450 350 100 L 50 50 1 1 N
+X NC_1 2 -450 250 100 R 50 50 1 1 N
+X VDDPIX 3 -450 150 100 R 50 50 1 1 w
+X VDD 4 -450 50 100 R 50 50 1 1 W
+X VDDIO 5 -450 -50 100 R 50 50 1 1 W
+X GP0 6 -450 -150 100 R 50 50 1 1 N
+X NRESET 7 -450 -250 100 R 50 50 1 1 I
+X GND 8 -450 -350 100 R 50 50 1 1 W
+X MOTION 9 450 -350 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # power_+3.3V
 #
 DEF power_+3.3V #PWR 0 0 Y Y 1 F P
@@ -446,19 +438,6 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power_PWR_FLAG
-#
-DEF power_PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 75 50 H I C CNN
-F1 "power_PWR_FLAG" 0 150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 -40 75 0 100 40 75 0 50 N
-X pwr 1 0 0 0 U 50 50 0 0 w
-ENDDRAW
-ENDDEF
-#
 # power_VCC
 #
 DEF power_VCC #PWR 0 0 Y Y 1 F P
diff --git a/HW/mouse/mouse.sch b/HW/mouse/mouse.sch
index 0f9054430dae74890d9b9c9a26929fd4b209e412..d31353737f9df0cda55167a6994d9814bb4abed5 100644
--- a/HW/mouse/mouse.sch
+++ b/HW/mouse/mouse.sch
@@ -252,7 +252,7 @@ L Connector:Conn_01x06_Male J1
 U 1 1 600D4602
 P 4250 2650
 F 0 "J1" H 4222 2624 50  0000 R CNN
-F 1 "Conn_01x06_Male" H 4222 2533 50  0000 R CNN
+F 1 "MCU_TP" H 4222 2533 50  0000 R CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" H 4250 2650 50  0001 C CNN
 F 3 "~" H 4250 2650 50  0001 C CNN
 	1    4250 2650
@@ -305,7 +305,7 @@ L Switch:SW_Push SW1
 U 1 1 600F67B3
 P 3700 1650
 F 0 "SW1" V 3654 1798 50  0000 L CNN
-F 1 "SW_Push" V 3745 1798 50  0000 L CNN
+F 1 "Reset" V 3745 1798 50  0000 L CNN
 F 2 "Button_Switch_SMD:SW_Push_SPST_NO_Alps_SKRK" H 3700 1850 50  0001 C CNN
 F 3 "~" H 3700 1850 50  0001 C CNN
 	1    3700 1650
@@ -331,23 +331,8 @@ Wire Wire Line
 	4300 1550 4300 1450
 Wire Wire Line
 	3700 1450 4300 1450
-Wire Notes Line
-	5000 500  5000 5200
-Wire Wire Line
-	6150 1150 6250 1150
-$Comp
-L power:+5V #PWR019
-U 1 1 6012CCCB
-P 6250 1150
-F 0 "#PWR019" H 6250 1000 50  0001 C CNN
-F 1 "+5V" H 6265 1323 50  0000 C CNN
-F 2 "" H 6250 1150 50  0001 C CNN
-F 3 "" H 6250 1150 50  0001 C CNN
-	1    6250 1150
-	1    0    0    -1  
-$EndComp
 $Comp
-L Lab1-rescue:AP2127R-3.3-Regulator_Linear U5
+L mouse-rescue:AP2127R-3.3-Regulator_Linear-Lab1-rescue U5
 U 1 1 60131C71
 P 9750 1100
 F 0 "U5" H 9750 1342 50  0000 C CNN
@@ -412,164 +397,163 @@ Connection ~ 10500 1100
 $Comp
 L Regulator_Linear:MIC5205-3.0YM5 U4
 U 1 1 600AF3EA
-P 8900 2850
-F 0 "U4" H 8900 3192 50  0000 C CNN
-F 1 "MIC5235YM5-TR" H 8900 3101 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-5_HandSoldering" H 8900 3175 50  0001 C CNN
-F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 8900 2850 50  0001 C CNN
-	1    8900 2850
+P 9450 2400
+F 0 "U4" H 9450 2742 50  0000 C CNN
+F 1 "MIC5235YM5-TR" H 9450 2651 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-5_HandSoldering" H 9450 2725 50  0001 C CNN
+F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 9450 2400 50  0001 C CNN
+	1    9450 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C17
 U 1 1 600B53C5
-P 8350 3100
-F 0 "C17" H 8465 3146 50  0000 L CNN
-F 1 "1u" H 8465 3055 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8388 2950 50  0001 C CNN
-F 3 "~" H 8350 3100 50  0001 C CNN
-	1    8350 3100
+P 8900 2650
+F 0 "C17" H 9015 2696 50  0000 L CNN
+F 1 "1u" H 9015 2605 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8938 2500 50  0001 C CNN
+F 3 "~" H 8900 2650 50  0001 C CNN
+	1    8900 2650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C19
 U 1 1 600BB9F4
-P 10000 3100
-F 0 "C19" H 10115 3146 50  0000 L CNN
-F 1 "2.2u" H 10115 3055 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10038 2950 50  0001 C CNN
-F 3 "~" H 10000 3100 50  0001 C CNN
-	1    10000 3100
+P 10550 2650
+F 0 "C19" H 10665 2696 50  0000 L CNN
+F 1 "2.2u" H 10665 2605 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 10588 2500 50  0001 C CNN
+F 3 "~" H 10550 2650 50  0001 C CNN
+	1    10550 2650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8600 2850 8500 2850
+	9150 2400 9050 2400
 Wire Wire Line
-	8500 2850 8500 2750
+	9050 2400 9050 2300
 Wire Wire Line
-	8500 2750 8600 2750
+	9050 2300 9150 2300
 Wire Wire Line
-	8500 2750 8350 2750
-Connection ~ 8500 2750
+	9050 2300 8900 2300
+Connection ~ 9050 2300
 $Comp
 L Device:R R2
 U 1 1 600C4CBF
-P 9350 2900
-F 0 "R2" H 9400 2950 50  0000 L CNN
-F 1 "5.6K" H 9400 2850 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9280 2900 50  0001 C CNN
-F 3 "~" H 9350 2900 50  0001 C CNN
-	1    9350 2900
+P 9900 2450
+F 0 "R2" H 9950 2500 50  0000 L CNN
+F 1 "5.6K" H 9950 2400 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9830 2450 50  0001 C CNN
+F 3 "~" H 9900 2450 50  0001 C CNN
+	1    9900 2450
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 600C5BBB
-P 9350 3300
-F 0 "R3" H 9450 3350 50  0000 L CNN
-F 1 "10K" H 9450 3250 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9280 3300 50  0001 C CNN
-F 3 "~" H 9350 3300 50  0001 C CNN
-	1    9350 3300
+P 9900 2850
+F 0 "R3" H 10000 2900 50  0000 L CNN
+F 1 "10K" H 10000 2800 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9830 2850 50  0001 C CNN
+F 3 "~" H 9900 2850 50  0001 C CNN
+	1    9900 2850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9200 3100 9350 3100
+	9750 2650 9900 2650
 Wire Wire Line
-	9350 3100 9350 3050
+	9900 2650 9900 2600
 Wire Wire Line
-	9200 2850 9200 3100
+	9750 2400 9750 2650
 Wire Wire Line
-	9350 3150 9350 3100
-Connection ~ 9350 3100
+	9900 2700 9900 2650
+Connection ~ 9900 2650
 Wire Wire Line
-	9200 2750 9350 2750
+	9750 2300 9900 2300
 $Comp
 L power:GND #PWR023
 U 1 1 600D13FD
-P 8900 3450
-F 0 "#PWR023" H 8900 3200 50  0001 C CNN
-F 1 "GND" H 8905 3277 50  0000 C CNN
-F 2 "" H 8900 3450 50  0001 C CNN
-F 3 "" H 8900 3450 50  0001 C CNN
-	1    8900 3450
+P 9450 3000
+F 0 "#PWR023" H 9450 2750 50  0001 C CNN
+F 1 "GND" H 9455 2827 50  0000 C CNN
+F 2 "" H 9450 3000 50  0001 C CNN
+F 3 "" H 9450 3000 50  0001 C CNN
+	1    9450 3000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8900 3450 8900 3150
+	9450 3000 9450 2700
 Wire Wire Line
 	3700 1850 3700 1900
 Wire Wire Line
 	3700 1900 4000 1900
 Wire Wire Line
 	4300 1900 4300 1850
-Connection ~ 4000 1900
 Wire Wire Line
 	4000 1900 4300 1900
 Wire Wire Line
-	8350 3450 8900 3450
-Connection ~ 8900 3450
+	8900 3000 9450 3000
+Connection ~ 9450 3000
 Wire Wire Line
-	9350 3450 8900 3450
+	9900 3000 9450 3000
 $Comp
 L power:+5V #PWR022
 U 1 1 600F8511
-P 8350 2750
-F 0 "#PWR022" H 8350 2600 50  0001 C CNN
-F 1 "+5V" H 8365 2923 50  0000 C CNN
-F 2 "" H 8350 2750 50  0001 C CNN
-F 3 "" H 8350 2750 50  0001 C CNN
-	1    8350 2750
+P 8900 2300
+F 0 "#PWR022" H 8900 2150 50  0001 C CNN
+F 1 "+5V" H 8915 2473 50  0000 C CNN
+F 2 "" H 8900 2300 50  0001 C CNN
+F 3 "" H 8900 2300 50  0001 C CNN
+	1    8900 2300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:VCC #PWR026
 U 1 1 600FFD9C
-P 10000 2750
-F 0 "#PWR026" H 10000 2600 50  0001 C CNN
-F 1 "VCC" H 10015 3015 50  0001 C CNN
-F 2 "" H 10000 2750 50  0001 C CNN
-F 3 "" H 10000 2750 50  0001 C CNN
-F 4 "+1.9V" H 10015 2923 50  0000 C CNN "Value2"
-	1    10000 2750
+P 10550 2300
+F 0 "#PWR026" H 10550 2150 50  0001 C CNN
+F 1 "VCC" H 10565 2565 50  0001 C CNN
+F 2 "" H 10550 2300 50  0001 C CNN
+F 3 "" H 10550 2300 50  0001 C CNN
+F 4 "+1.9V" H 10565 2473 50  0000 C CNN "Value2"
+	1    10550 2300
 	1    0    0    -1  
 $EndComp
-Connection ~ 10000 2750
-Text Notes 8550 3850 0    50   ~ 0
+Connection ~ 10550 2300
+Text Notes 9250 3350 0    50   ~ 0
 1.24*(1+5.6/10)=1.9344 V
 Wire Wire Line
-	8350 2750 8350 2950
+	8900 2300 8900 2500
 Wire Wire Line
-	10000 3450 10000 3250
+	10550 3000 10550 2800
 $Comp
 L Device:LED D1
 U 1 1 601355C7
-P 9700 3200
-F 0 "D1" V 9739 3082 50  0000 R CNN
-F 1 "LED" V 9648 3082 50  0000 R CNN
-F 2 "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9700 3200 50  0001 C CNN
-F 3 "~" H 9700 3200 50  0001 C CNN
-	1    9700 3200
+P 10250 2750
+F 0 "D1" V 10289 2632 50  0000 R CNN
+F 1 "LED" V 10198 2632 50  0000 R CNN
+F 2 "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 10250 2750 50  0001 C CNN
+F 3 "~" H 10250 2750 50  0001 C CNN
+	1    10250 2750
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:R R4
 U 1 1 6013719E
-P 9700 2900
-F 0 "R4" H 9750 2950 50  0000 L CNN
-F 1 "47" H 9750 2850 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 9630 2900 50  0001 C CNN
-F 3 "~" H 9700 2900 50  0001 C CNN
-	1    9700 2900
+P 10250 2450
+F 0 "R4" H 10300 2500 50  0000 L CNN
+F 1 "47" H 10300 2400 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 10180 2450 50  0001 C CNN
+F 3 "~" H 10250 2450 50  0001 C CNN
+	1    10250 2450
 	1    0    0    -1  
 $EndComp
-Connection ~ 9700 2750
+Connection ~ 10250 2300
 Wire Wire Line
-	9700 2750 10000 2750
+	10250 2300 10550 2300
 Wire Wire Line
-	9350 2750 9700 2750
-Connection ~ 9350 2750
-Connection ~ 9350 3450
+	9900 2300 10250 2300
+Connection ~ 9900 2300
+Connection ~ 9900 3000
 $Comp
 L Device:LED D2
 U 1 1 6014C1EC
@@ -593,12 +577,12 @@ F 3 "~" H 10150 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9350 3450 9700 3450
+	9900 3000 10250 3000
 Wire Wire Line
-	9700 3350 9700 3450
-Connection ~ 9700 3450
+	10250 2900 10250 3000
+Connection ~ 10250 3000
 Wire Wire Line
-	9700 3450 10000 3450
+	10250 3000 10550 3000
 Wire Wire Line
 	10050 1100 10150 1100
 Wire Wire Line
@@ -606,15 +590,15 @@ Wire Wire Line
 Connection ~ 10150 1100
 Wire Wire Line
 	10150 1100 10500 1100
-Text GLabel 7800 5200 2    50   Input ~ 0
+Text GLabel 3400 7050 2    50   Input ~ 0
 SCLK
-Text GLabel 7800 5000 2    50   Output ~ 0
+Text GLabel 3400 6850 2    50   Output ~ 0
 MISO
-Text GLabel 7800 5100 2    50   Input ~ 0
+Text GLabel 3400 6950 2    50   Input ~ 0
 MOSI
-Text GLabel 7800 4900 2    50   Input ~ 0
+Text GLabel 3400 6750 2    50   Input ~ 0
 NCS
-Text GLabel 7250 5300 2    50   Output ~ 0
+Text GLabel 2850 7150 2    50   Output ~ 0
 MOTION
 Text GLabel 3000 1600 2    50   Output ~ 0
 NCS
@@ -629,158 +613,98 @@ MOTION
 $Comp
 L power:VCC #PWR013
 U 1 1 601BD039
-P 5400 4700
-F 0 "#PWR013" H 5400 4550 50  0001 C CNN
-F 1 "VCC" H 5415 4965 50  0001 C CNN
-F 2 "" H 5400 4700 50  0001 C CNN
-F 3 "" H 5400 4700 50  0001 C CNN
-F 4 "+1.9V" H 5415 4873 50  0000 C CNN "Value2"
-	1    5400 4700
+P 1300 6550
+F 0 "#PWR013" H 1300 6400 50  0001 C CNN
+F 1 "VCC" H 1315 6815 50  0001 C CNN
+F 2 "" H 1300 6550 50  0001 C CNN
+F 3 "" H 1300 6550 50  0001 C CNN
+F 4 "+1.9V" H 1315 6723 50  0000 C CNN "Value2"
+	1    1300 6550
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C12
 U 1 1 601DA26F
-P 5400 4850
-F 0 "C12" H 5515 4896 50  0000 L CNN
-F 1 "10u" H 5515 4805 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5438 4700 50  0001 C CNN
-F 3 "~" H 5400 4850 50  0001 C CNN
-	1    5400 4850
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C C15
-U 1 1 601DA275
-P 5800 4850
-F 0 "C15" H 5915 4896 50  0000 L CNN
-F 1 "100n" H 5915 4805 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5838 4700 50  0001 C CNN
-F 3 "~" H 5800 4850 50  0001 C CNN
-	1    5800 4850
+P 1300 6700
+F 0 "C12" H 1415 6746 50  0000 L CNN
+F 1 "10u" H 1415 6655 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1338 6550 50  0001 C CNN
+F 3 "~" H 1300 6700 50  0001 C CNN
+	1    1300 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR018
 U 1 1 601DC327
-P 6250 5450
-F 0 "#PWR018" H 6250 5200 50  0001 C CNN
-F 1 "GND" H 6255 5277 50  0000 C CNN
-F 2 "" H 6250 5450 50  0001 C CNN
-F 3 "" H 6250 5450 50  0001 C CNN
-	1    6250 5450
+P 1850 7300
+F 0 "#PWR018" H 1850 7050 50  0001 C CNN
+F 1 "GND" H 1855 7127 50  0000 C CNN
+F 2 "" H 1850 7300 50  0001 C CNN
+F 3 "" H 1850 7300 50  0001 C CNN
+	1    1850 7300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6250 5450 6250 5300
+	1850 7300 1850 7150
 Wire Wire Line
-	6250 5300 6350 5300
+	1850 7150 1950 7150
 $Comp
 L Device:C C11
 U 1 1 601F005F
-P 5250 4000
-F 0 "C11" H 5365 4046 50  0000 L CNN
-F 1 "4.7u" H 5365 3955 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5288 3850 50  0001 C CNN
-F 3 "~" H 5250 4000 50  0001 C CNN
-	1    5250 4000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C C14
-U 1 1 601F0065
-P 5650 4000
-F 0 "C14" H 5765 4046 50  0000 L CNN
-F 1 "100n" H 5765 3955 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5688 3850 50  0001 C CNN
-F 3 "~" H 5650 4000 50  0001 C CNN
-	1    5650 4000
+P 1050 6100
+F 0 "C11" H 1165 6146 50  0000 L CNN
+F 1 "4.7u" H 1165 6055 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1088 5950 50  0001 C CNN
+F 3 "~" H 1050 6100 50  0001 C CNN
+	1    1050 6100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5400 5000 5800 5000
-Wire Wire Line
-	5800 4700 6150 4700
-Wire Wire Line
-	6150 4700 6150 4900
+	1750 6550 1750 6750
 Wire Wire Line
-	6150 4900 6350 4900
-Connection ~ 5800 4700
+	1750 6750 1950 6750
 $Comp
 L power:+3.3V #PWR012
 U 1 1 60200A00
-P 5400 5300
-F 0 "#PWR012" H 5400 5150 50  0001 C CNN
-F 1 "+3.3V" H 5415 5473 50  0000 C CNN
-F 2 "" H 5400 5300 50  0001 C CNN
-F 3 "" H 5400 5300 50  0001 C CNN
-	1    5400 5300
-	1    0    0    -1  
-$EndComp
-Connection ~ 5650 3850
-Connection ~ 5400 4700
-Wire Wire Line
-	5400 4700 5800 4700
-$Comp
-L power:GND #PWR015
-U 1 1 60215126
-P 5450 4150
-F 0 "#PWR015" H 5450 3900 50  0001 C CNN
-F 1 "GND" H 5455 3977 50  0000 C CNN
-F 2 "" H 5450 4150 50  0001 C CNN
-F 3 "" H 5450 4150 50  0001 C CNN
-	1    5450 4150
+P 1500 7150
+F 0 "#PWR012" H 1500 7000 50  0001 C CNN
+F 1 "+3.3V" H 1515 7323 50  0000 C CNN
+F 2 "" H 1500 7150 50  0001 C CNN
+F 3 "" H 1500 7150 50  0001 C CNN
+	1    1500 7150
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR016
 U 1 1 6021A10F
-P 5800 5000
-F 0 "#PWR016" H 5800 4750 50  0001 C CNN
-F 1 "GND" H 5805 4827 50  0000 C CNN
-F 2 "" H 5800 5000 50  0001 C CNN
-F 3 "" H 5800 5000 50  0001 C CNN
-	1    5800 5000
+P 1300 6850
+F 0 "#PWR016" H 1300 6600 50  0001 C CNN
+F 1 "GND" H 1305 6677 50  0000 C CNN
+F 2 "" H 1300 6850 50  0001 C CNN
+F 3 "" H 1300 6850 50  0001 C CNN
+	1    1300 6850
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C13
 U 1 1 6021D9D7
-P 5400 5450
-F 0 "C13" H 5515 5496 50  0000 L CNN
-F 1 "10u" H 5515 5405 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5438 5300 50  0001 C CNN
-F 3 "~" H 5400 5450 50  0001 C CNN
-	1    5400 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C C16
-U 1 1 6021D9DD
-P 5800 5450
-F 0 "C16" H 5915 5496 50  0000 L CNN
-F 1 "100n" H 5915 5405 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5838 5300 50  0001 C CNN
-F 3 "~" H 5800 5450 50  0001 C CNN
-	1    5800 5450
+P 1500 7300
+F 0 "C13" H 1615 7346 50  0000 L CNN
+F 1 "10u" H 1615 7255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 1538 7150 50  0001 C CNN
+F 3 "~" H 1500 7300 50  0001 C CNN
+	1    1500 7300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5400 5300 5800 5300
-Wire Wire Line
-	5800 5300 6100 5300
-Connection ~ 5800 5300
-Wire Wire Line
-	5400 5600 5600 5600
 $Comp
 L power:GND #PWR014
 U 1 1 60229016
-P 5600 5600
-F 0 "#PWR014" H 5600 5350 50  0001 C CNN
-F 1 "GND" H 5605 5427 50  0000 C CNN
-F 2 "" H 5600 5600 50  0001 C CNN
-F 3 "" H 5600 5600 50  0001 C CNN
-	1    5600 5600
+P 1500 7450
+F 0 "#PWR014" H 1500 7200 50  0001 C CNN
+F 1 "GND" H 1505 7277 50  0000 C CNN
+F 2 "" H 1500 7450 50  0001 C CNN
+F 3 "" H 1500 7450 50  0001 C CNN
+	1    1500 7450
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -814,116 +738,99 @@ Wire Wire Line
 $Comp
 L Connector:Conn_01x01_Male J6
 U 1 1 6027468B
-P 7600 5300
-F 0 "J6" H 7400 5150 50  0000 C CNN
-F 1 "TestPoint" H 7400 5250 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 7600 5300 50  0001 C CNN
-F 3 "~" H 7600 5300 50  0001 C CNN
-	1    7600 5300
+P 3200 7150
+F 0 "J6" H 3000 7000 50  0000 C CNN
+F 1 "TP" H 3000 7100 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3200 7150 50  0001 C CNN
+F 3 "~" H 3200 7150 50  0001 C CNN
+	1    3200 7150
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Connector:Conn_01x01_Male J5
 U 1 1 6027F21E
-P 7750 5400
-F 0 "J5" H 7550 5250 50  0000 C CNN
-F 1 "TestPoint" H 7550 5350 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 7750 5400 50  0001 C CNN
-F 3 "~" H 7750 5400 50  0001 C CNN
-	1    7750 5400
+P 3350 7250
+F 0 "J5" H 3150 7100 50  0000 C CNN
+F 1 "TP" H 3150 7200 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3350 7250 50  0001 C CNN
+F 3 "~" H 3350 7250 50  0001 C CNN
+	1    3350 7250
 	0    -1   -1   0   
 $EndComp
-Wire Notes Line
-	5000 5200 500  5200
-Text GLabel 6150 1350 2    50   BiDi ~ 0
-D+In
-Text GLabel 6150 1450 2    50   BiDi ~ 0
-D-In
 Text GLabel 3000 2800 2    50   BiDi ~ 0
-D+Out
+D+
 Text GLabel 3000 2700 2    50   BiDi ~ 0
-D-Out
-Connection ~ 5600 5600
-Wire Wire Line
-	5600 5600 5800 5600
-Connection ~ 5800 5000
-Text GLabel 7900 1450 2    50   BiDi ~ 0
-D-Out
-Text GLabel 7100 1450 0    50   BiDi ~ 0
-D+Out
-Text GLabel 7100 1650 0    50   BiDi ~ 0
-D+In
-Text GLabel 7900 1650 2    50   BiDi ~ 0
-D-In
+D-
+Text GLabel 6700 1650 3    50   BiDi ~ 0
+D-
+Text GLabel 6700 850  1    50   BiDi ~ 0
+D+
 $Comp
 L power:GND #PWR021
 U 1 1 603B0C71
-P 7500 1950
-F 0 "#PWR021" H 7500 1700 50  0001 C CNN
-F 1 "GND" H 7505 1777 50  0000 C CNN
-F 2 "" H 7500 1950 50  0001 C CNN
-F 3 "" H 7500 1950 50  0001 C CNN
-	1    7500 1950
+P 6200 1250
+F 0 "#PWR021" H 6200 1000 50  0001 C CNN
+F 1 "GND" H 6205 1077 50  0000 C CNN
+F 2 "" H 6200 1250 50  0001 C CNN
+F 3 "" H 6200 1250 50  0001 C CNN
+	1    6200 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C21
 U 1 1 603D5C8D
-P 8200 1050
-F 0 "C21" H 8315 1096 50  0000 L CNN
-F 1 "100n" H 8315 1005 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8238 900 50  0001 C CNN
-F 3 "~" H 8200 1050 50  0001 C CNN
-	1    8200 1050
+P 7250 1400
+F 0 "C21" H 7365 1446 50  0000 L CNN
+F 1 "100n" H 7365 1355 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7288 1250 50  0001 C CNN
+F 3 "~" H 7250 1400 50  0001 C CNN
+	1    7250 1400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR028
 U 1 1 603D5C87
-P 8200 1200
-F 0 "#PWR028" H 8200 950 50  0001 C CNN
-F 1 "GND" H 8350 1100 50  0000 C CNN
-F 2 "" H 8200 1200 50  0001 C CNN
-F 3 "" H 8200 1200 50  0001 C CNN
-	1    8200 1200
+P 7250 1550
+F 0 "#PWR028" H 7250 1300 50  0001 C CNN
+F 1 "GND" H 7400 1450 50  0000 C CNN
+F 2 "" H 7250 1550 50  0001 C CNN
+F 3 "" H 7250 1550 50  0001 C CNN
+	1    7250 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+5V #PWR020
 U 1 1 60345C17
-P 8200 900
-F 0 "#PWR020" H 8200 750 50  0001 C CNN
-F 1 "+5V" H 8215 1073 50  0000 C CNN
-F 2 "" H 8200 900 50  0001 C CNN
-F 3 "" H 8200 900 50  0001 C CNN
-	1    8200 900 
+P 7250 1250
+F 0 "#PWR020" H 7250 1100 50  0001 C CNN
+F 1 "+5V" H 7265 1423 50  0000 C CNN
+F 2 "" H 7250 1250 50  0001 C CNN
+F 3 "" H 7250 1250 50  0001 C CNN
+	1    7250 1250
 	1    0    0    -1  
 $EndComp
 $Comp
 L Power_Protection:USBLC6-2SC6 U3
 U 1 1 601BA7C5
-P 7500 1550
-F 0 "U3" H 7750 2000 50  0000 C CNN
-F 1 "USBLC6-2SC6" H 7800 1900 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23-6_Handsoldering" H 7500 1050 50  0001 C CNN
-F 3 "https://www.st.com/resource/en/datasheet/usblc6-2.pdf" H 7700 1900 50  0001 C CNN
-	1    7500 1550
-	1    0    0    -1  
+P 6600 1250
+F 0 "U3" H 6850 1700 50  0000 C CNN
+F 1 "USBLC6-2SC6" H 6900 1600 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23-6_Handsoldering" H 6600 750 50  0001 C CNN
+F 3 "https://www.st.com/resource/en/datasheet/usblc6-2.pdf" H 6800 1600 50  0001 C CNN
+	1    6600 1250
+	0    1    1    0   
 $EndComp
-Wire Wire Line
-	7500 1150 7500 900 
 $Comp
-L Lab1-rescue:PMW3389-MouseSensor U2
+L mouse-rescue:PMW3389-MouseSensor-Lab1-rescue U2
 U 1 1 60491166
-P 6800 4950
-F 0 "U2" H 6800 5565 50  0000 C CNN
-F 1 "PMW3389" H 6800 5474 50  0000 C CNN
-F 2 "MouseSensor:PMW3389" H 6800 5550 50  0001 C CNN
-F 3 "" H 6800 5550 50  0001 C CNN
-	1    6800 4950
+P 2400 6800
+F 0 "U2" H 2400 7415 50  0000 C CNN
+F 1 "PMW3389" H 2400 7324 50  0000 C CNN
+F 2 "MouseSensor:PMW3389" H 2400 7400 50  0001 C CNN
+F 3 "" H 2400 7400 50  0001 C CNN
+	1    2400 6800
 	1    0    0    -1  
 $EndComp
-NoConn ~ 6150 1550
 NoConn ~ 1600 3000
 NoConn ~ 1600 3700
 NoConn ~ 1600 3800
@@ -942,12 +849,6 @@ NoConn ~ 3000 4500
 NoConn ~ 3000 4200
 NoConn ~ 3000 4100
 NoConn ~ 3000 4000
-NoConn ~ 3000 3900
-NoConn ~ 3000 3800
-NoConn ~ 3000 3700
-NoConn ~ 3000 3500
-NoConn ~ 3000 3400
-NoConn ~ 3000 3300
 NoConn ~ 3000 3100
 NoConn ~ 3000 2600
 NoConn ~ 3000 2500
@@ -956,40 +857,12 @@ NoConn ~ 3000 2000
 NoConn ~ 3000 1900
 NoConn ~ 3000 1800
 NoConn ~ 3000 1700
-NoConn ~ 6350 5200
+NoConn ~ 1950 7050
 Wire Wire Line
-	6100 5000 6350 5000
-Wire Wire Line
-	6100 5300 6100 5000
-Connection ~ 5400 5300
-Wire Wire Line
-	5650 3850 6200 3850
-$Comp
-L Lab1-rescue:USB_OTG-Connector J2
-U 1 1 601259BC
-P 5850 1350
-F 0 "J2" H 5907 1817 50  0000 C CNN
-F 1 "USB_OTG" H 5907 1726 50  0000 C CNN
-F 2 "Connector_USB:USB_Mini-B_Lumberg_2486_01_Horizontal" H 6000 1300 50  0001 C CNN
-F 3 " ~" H 6000 1300 50  0001 C CNN
-	1    5850 1350
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR017
-U 1 1 6012B032
-P 5850 1750
-F 0 "#PWR017" H 5850 1500 50  0001 C CNN
-F 1 "GND" H 5855 1577 50  0000 C CNN
-F 2 "" H 5850 1750 50  0001 C CNN
-F 3 "" H 5850 1750 50  0001 C CNN
-	1    5850 1750
-	1    0    0    -1  
-$EndComp
-Connection ~ 8200 900 
+	1700 6850 1950 6850
 Wire Wire Line
-	7500 900  8200 900 
-Connection ~ 8350 2750
+	1700 7150 1700 6850
+Connection ~ 8900 2300
 Wire Wire Line
 	10150 1800 10500 1800
 Wire Wire Line
@@ -1009,15 +882,6 @@ F 3 "" H 9750 1800 50  0001 C CNN
 	1    9750 1800
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5250 4150 5450 4150
-Wire Wire Line
-	5250 3850 5650 3850
-Wire Wire Line
-	6200 3850 6200 4800
-Connection ~ 5450 4150
-Wire Wire Line
-	5450 4150 5650 4150
 Wire Wire Line
 	9000 1800 9300 1800
 $Comp
@@ -1025,7 +889,7 @@ L Connector:Conn_01x01_Male J4
 U 1 1 601302EE
 P 8800 1700
 F 0 "J4" H 8800 1650 50  0000 C CNN
-F 1 "TestPointGND" H 8800 1550 50  0000 C CNN
+F 1 "TPG" H 8800 1550 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 8800 1700 50  0001 C CNN
 F 3 "~" H 8800 1700 50  0001 C CNN
 	1    8800 1700
@@ -1066,60 +930,40 @@ $EndComp
 $Comp
 L power:GND #PWR04
 U 1 1 600B6DB4
-P 1150 2400
-F 0 "#PWR04" H 1150 2150 50  0001 C CNN
-F 1 "GND" H 1300 2350 50  0000 C CNN
-F 2 "" H 1150 2400 50  0001 C CNN
-F 3 "" H 1150 2400 50  0001 C CNN
-	1    1150 2400
+P 1150 2200
+F 0 "#PWR04" H 1150 1950 50  0001 C CNN
+F 1 "GND" H 1000 2150 50  0000 C CNN
+F 2 "" H 1150 2200 50  0001 C CNN
+F 3 "" H 1150 2200 50  0001 C CNN
+	1    1150 2200
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R1
 U 1 1 600C5A46
-P 1150 2250
-F 0 "R1" H 950 2300 50  0000 L CNN
-F 1 "10K" H 950 2200 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1080 2250 50  0001 C CNN
-F 3 "~" H 1150 2250 50  0001 C CNN
-	1    1150 2250
+P 1150 2050
+F 0 "R1" H 950 2100 50  0000 L CNN
+F 1 "10K" H 950 2000 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1080 2050 50  0001 C CNN
+F 3 "~" H 1150 2050 50  0001 C CNN
+	1    1150 2050
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1150 2100 1150 2050
 $Comp
 L power:+3.3V #PWR03
 U 1 1 600B5332
-P 1150 1500
-F 0 "#PWR03" H 1150 1350 50  0001 C CNN
-F 1 "+3.3V" H 1165 1673 50  0000 C CNN
-F 2 "" H 1150 1500 50  0001 C CNN
-F 3 "" H 1150 1500 50  0001 C CNN
-	1    1150 1500
+P 1150 1150
+F 0 "#PWR03" H 1150 1000 50  0001 C CNN
+F 1 "+3.3V" H 1165 1323 50  0000 C CNN
+F 2 "" H 1150 1150 50  0001 C CNN
+F 3 "" H 1150 1150 50  0001 C CNN
+	1    1150 1150
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1150 1500 1150 1550
-$Comp
-L Jumper:Jumper_3_Bridged12 JP1
-U 1 1 600C938F
-P 1150 1800
-F 0 "JP1" H 1200 2000 50  0000 C CNN
-F 1 "Jumper_3_Bridged12" H 1200 1900 50  0000 C CNN
-F 2 "Jumper:SolderJumper-3_P1.3mm_Bridged12_RoundedPad1.0x1.5mm" H 1150 1800 50  0001 C CNN
-F 3 "~" H 1150 1800 50  0001 C CNN
-	1    1150 1800
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	1300 1800 1400 1800
 Text GLabel 1600 1600 0    50   Input ~ 0
 NRST
-Connection ~ 1400 1800
-Wire Wire Line
-	1400 1800 1600 1800
 Wire Wire Line
-	6200 4800 6350 4800
+	1800 6650 1950 6650
 $Comp
 L Device:LED D3
 U 1 1 60107AD8
@@ -1152,99 +996,68 @@ Wire Wire Line
 Connection ~ 9300 1800
 Wire Wire Line
 	9300 1800 9750 1800
-Wire Wire Line
-	5750 1750 5850 1750
-Connection ~ 5850 1750
 $Comp
 L power:GND #PWR0101
 U 1 1 6012A71D
-P 8400 4600
-F 0 "#PWR0101" H 8400 4350 50  0001 C CNN
-F 1 "GND" H 8405 4427 50  0000 C CNN
-F 2 "" H 8400 4600 50  0001 C CNN
-F 3 "" H 8400 4600 50  0001 C CNN
-	1    8400 4600
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	8800 4600 8400 4600
-Connection ~ 8400 4600
-Wire Wire Line
-	8800 4300 8400 4300
-Connection ~ 8400 4300
-$Comp
-L Device:C C22
-U 1 1 6012A712
-P 8400 4450
-F 0 "C22" H 8515 4496 50  0000 L CNN
-F 1 "100n" H 8515 4405 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8438 4300 50  0001 C CNN
-F 3 "~" H 8400 4450 50  0001 C CNN
-	1    8400 4450
+P 4400 6450
+F 0 "#PWR0101" H 4400 6200 50  0001 C CNN
+F 1 "GND" H 4405 6277 50  0000 C CNN
+F 2 "" H 4400 6450 50  0001 C CNN
+F 3 "" H 4400 6450 50  0001 C CNN
+	1    4400 6450
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Device:C C23
 U 1 1 6012A70C
-P 8800 4450
-F 0 "C23" H 8915 4496 50  0000 L CNN
-F 1 "10u" H 8915 4405 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 8838 4300 50  0001 C CNN
-F 3 "~" H 8800 4450 50  0001 C CNN
-	1    8800 4450
+P 4400 6300
+F 0 "C23" H 4515 6346 50  0000 L CNN
+F 1 "10u" H 4515 6255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 4438 6150 50  0001 C CNN
+F 3 "~" H 4400 6300 50  0001 C CNN
+	1    4400 6300
 	-1   0    0    -1  
 $EndComp
-Connection ~ 8800 4300
+Connection ~ 4400 6150
 $Comp
 L power:VCC #PWR0102
 U 1 1 6012A706
-P 8800 4300
-F 0 "#PWR0102" H 8800 4150 50  0001 C CNN
-F 1 "VCC" H 8815 4565 50  0001 C CNN
-F 2 "" H 8800 4300 50  0001 C CNN
-F 3 "" H 8800 4300 50  0001 C CNN
-F 4 "+1.9V" H 8815 4473 50  0000 C CNN "Value2"
-	1    8800 4300
+P 4400 6150
+F 0 "#PWR0102" H 4400 6000 50  0001 C CNN
+F 1 "VCC" H 4415 6415 50  0001 C CNN
+F 2 "" H 4400 6150 50  0001 C CNN
+F 3 "" H 4400 6150 50  0001 C CNN
+F 4 "+1.9V" H 4415 6323 50  0000 C CNN "Value2"
+	1    4400 6150
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	7500 4300 7500 4700
+	3100 6150 3100 6550
 Wire Wire Line
-	7500 4700 7250 4700
+	3100 6550 2850 6550
 Wire Wire Line
-	7250 5000 7350 5000
-Connection ~ 7350 5000
+	2850 6850 2950 6850
+Connection ~ 2950 6850
 $Comp
 L Device:R R6
 U 1 1 60166BF7
-P 7350 4100
-F 0 "R6" H 7150 4150 50  0000 L CNN
-F 1 "10K" H 7150 4050 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 7280 4100 50  0001 C CNN
-F 3 "~" H 7350 4100 50  0001 C CNN
-	1    7350 4100
+P 2950 5950
+F 0 "R6" H 2750 6000 50  0000 L CNN
+F 1 "10K" H 2750 5900 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 2880 5950 50  0001 C CNN
+F 3 "~" H 2950 5950 50  0001 C CNN
+	1    2950 5950
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3.3V #PWR0103
 U 1 1 6016ADFD
-P 7350 3950
-F 0 "#PWR0103" H 7350 3800 50  0001 C CNN
-F 1 "+3.3V" H 7365 4123 50  0000 C CNN
-F 2 "" H 7350 3950 50  0001 C CNN
-F 3 "" H 7350 3950 50  0001 C CNN
-	1    7350 3950
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:PWR_FLAG #FLG0101
-U 1 1 6015B874
-P 1400 1800
-F 0 "#FLG0101" H 1400 1875 50  0001 C CNN
-F 1 "PWR_FLAG" H 1500 1750 50  0000 C CNN
-F 2 "" H 1400 1800 50  0001 C CNN
-F 3 "~" H 1400 1800 50  0001 C CNN
-	1    1400 1800
+P 2950 5800
+F 0 "#PWR0103" H 2950 5650 50  0001 C CNN
+F 1 "+3.3V" H 2965 5973 50  0000 C CNN
+F 2 "" H 2950 5800 50  0001 C CNN
+F 3 "" H 2950 5800 50  0001 C CNN
+	1    2950 5800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1261,53 +1074,556 @@ $EndComp
 Wire Wire Line
 	10500 1100 10500 1300
 Wire Wire Line
-	10000 2750 10000 2950
+	10550 2300 10550 2500
 $Comp
 L Connector:Conn_01x01_Male J7
 U 1 1 601D67DA
-P 7650 4800
-F 0 "J7" H 7450 4650 50  0000 C CNN
-F 1 "TestPoint" H 7450 4750 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 7650 4800 50  0001 C CNN
-F 3 "~" H 7650 4800 50  0001 C CNN
-	1    7650 4800
+P 3250 6650
+F 0 "J7" H 3050 6500 50  0000 C CNN
+F 1 "TP" H 3050 6600 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3250 6650 50  0001 C CNN
+F 3 "~" H 3250 6650 50  0001 C CNN
+	1    3250 6650
 	0    1    1    0   
 $EndComp
 $Comp
 L Connector:Conn_01x01_Male J8
 U 1 1 601DABF3
-P 7750 4700
-F 0 "J8" H 7550 4750 50  0000 C CNN
-F 1 "TestPoint" H 7550 4650 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 7750 4700 50  0001 C CNN
-F 3 "~" H 7750 4700 50  0001 C CNN
-	1    7750 4700
+P 3350 6550
+F 0 "J8" H 3150 6600 50  0000 C CNN
+F 1 "TP" H 3150 6500 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3350 6550 50  0001 C CNN
+F 3 "~" H 3350 6550 50  0001 C CNN
+	1    3350 6550
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	7250 4900 7750 4900
+	2850 6750 3350 6750
+Wire Wire Line
+	2950 6850 3250 6850
 Wire Wire Line
-	7350 5000 7650 5000
+	2850 6950 3200 6950
 Wire Wire Line
-	7250 5100 7600 5100
+	2850 7050 3350 7050
+Connection ~ 3350 6750
 Wire Wire Line
-	7250 5200 7750 5200
-Connection ~ 7750 4900
+	3350 6750 3400 6750
+Connection ~ 3250 6850
 Wire Wire Line
-	7750 4900 7800 4900
-Connection ~ 7650 5000
+	3250 6850 3400 6850
+Connection ~ 3350 7050
 Wire Wire Line
-	7650 5000 7800 5000
-Connection ~ 7750 5200
+	3350 7050 3400 7050
+Connection ~ 3200 6950
 Wire Wire Line
-	7750 5200 7800 5200
-Connection ~ 7600 5100
+	3200 6950 3400 6950
 Wire Wire Line
-	7600 5100 7800 5100
+	2950 6100 2950 6850
 Wire Wire Line
-	7500 4300 8400 4300
+	8900 2800 8900 3000
+Wire Wire Line
+	1150 1750 1150 1800
+$Comp
+L Device:Jumper JP1
+U 1 1 601C903C
+P 1150 1450
+F 0 "JP1" V 1196 1362 50  0000 R CNN
+F 1 "Jumper" V 1105 1362 50  0000 R CNN
+F 2 "" H 1150 1450 50  0001 C CNN
+F 3 "~" H 1150 1450 50  0001 C CNN
+	1    1150 1450
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	7350 4250 7350 5000
+	1150 1800 1600 1800
+$Comp
+L power:GND #PWR017
+U 1 1 6012B032
+P 5800 1400
+F 0 "#PWR017" H 5800 1150 50  0001 C CNN
+F 1 "GND" H 5805 1227 50  0000 C CNN
+F 2 "" H 5800 1400 50  0001 C CNN
+F 3 "" H 5800 1400 50  0001 C CNN
+	1    5800 1400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR019
+U 1 1 6012CCCB
+P 5800 1000
+F 0 "#PWR019" H 5800 850 50  0001 C CNN
+F 1 "+5V" H 5815 1173 50  0000 C CNN
+F 2 "" H 5800 1000 50  0001 C CNN
+F 3 "" H 5800 1000 50  0001 C CNN
+	1    5800 1000
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	8350 3250 8350 3450
+	5700 1000 5800 1000
+Connection ~ 4000 1900
+$Comp
+L Connector:Conn_01x05_Male J2
+U 1 1 6023D59F
+P 5500 1200
+F 0 "J2" H 5608 1581 50  0000 C CNN
+F 1 "usb_conn" H 5608 1490 50  0000 C CNN
+F 2 "" H 5500 1200 50  0001 C CNN
+F 3 "~" H 5500 1200 50  0001 C CNN
+	1    5500 1200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5700 1400 5800 1400
+Wire Wire Line
+	5700 1300 5800 1300
+Wire Wire Line
+	5800 1300 5800 1400
+Connection ~ 5800 1400
+Wire Wire Line
+	5700 1100 6100 1100
+Wire Wire Line
+	6100 1100 6100 850 
+Wire Wire Line
+	6100 850  6500 850 
+Wire Wire Line
+	6500 1650 6050 1650
+Wire Wire Line
+	6050 1650 6050 1200
+Wire Wire Line
+	6050 1200 5700 1200
+Wire Wire Line
+	7000 1250 7250 1250
+Connection ~ 7250 1250
+Wire Notes Line
+	5150 2000 7750 2000
+Text Notes 5850 550  0    50   ~ 0
+USB\n
+Wire Notes Line
+	4700 5300 4700 7750
+Wire Notes Line
+	5150 500  5150 5300
+Wire Notes Line
+	500  5300 5150 5300
+Text Notes 750  650  0    50   ~ 0
+MCU\n
+Text Notes 700  5500 0    50   ~ 0
+Sensor\n
+$Comp
+L power:GND #PWR015
+U 1 1 60215126
+P 1050 6250
+F 0 "#PWR015" H 1050 6000 50  0001 C CNN
+F 1 "GND" H 1055 6077 50  0000 C CNN
+F 2 "" H 1050 6250 50  0001 C CNN
+F 3 "" H 1050 6250 50  0001 C CNN
+	1    1050 6250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1700 7150 1500 7150
+Connection ~ 1500 7150
+Wire Wire Line
+	1750 6550 1300 6550
+Connection ~ 1300 6550
+Wire Wire Line
+	1800 6650 1800 5950
+Wire Wire Line
+	1800 5950 1050 5950
+Wire Wire Line
+	3100 6150 4400 6150
+Text GLabel 3000 3300 2    50   Input ~ 0
+LMB
+Text GLabel 3000 3400 2    50   Input ~ 0
+RMB
+Text GLabel 3000 3500 2    50   Input ~ 0
+MMB
+Text GLabel 3000 3600 2    50   Input ~ 0
+SMB1
+Text GLabel 3000 3700 2    50   Input ~ 0
+SMB2
+Text GLabel 3000 3800 2    50   Input ~ 0
+TMB1
+Text GLabel 3000 3900 2    50   Input ~ 0
+TMB2
+Wire Notes Line
+	7750 4900 5150 4900
+Wire Notes Line
+	7750 500  7750 4900
+Text Notes 5350 2100 0    50   ~ 0
+Buttons\n
+Wire Notes Line
+	7750 3500 11200 3500
+Text Notes 8000 650  0    50   ~ 0
+Power_Reg\n
+NoConn ~ 3000 4300
+NoConn ~ 3000 4400
+NoConn ~ 1600 3600
+NoConn ~ 3000 3000
+NoConn ~ 3000 2900
+Text GLabel 7100 4200 1    50   Output ~ 0
+TMB2
+Text GLabel 6200 4200 1    50   Output ~ 0
+TMB1
+Text GLabel 7150 3450 1    50   Output ~ 0
+SMB2
+Text GLabel 6150 3450 1    50   Output ~ 0
+SMB1
+Text GLabel 7550 2500 1    50   Output ~ 0
+MMB
+Text GLabel 6700 2500 1    50   Output ~ 0
+RMB
+Text GLabel 6000 2500 1    50   Output ~ 0
+LMB
+$Comp
+L power:GND #PWR0117
+U 1 1 6035F1F2
+P 7100 4500
+F 0 "#PWR0117" H 7100 4250 50  0001 C CNN
+F 1 "GND" H 7105 4327 50  0000 C CNN
+F 2 "" H 7100 4500 50  0001 C CNN
+F 3 "" H 7100 4500 50  0001 C CNN
+	1    7100 4500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0116
+U 1 1 603592BF
+P 6200 4500
+F 0 "#PWR0116" H 6200 4250 50  0001 C CNN
+F 1 "GND" H 6205 4327 50  0000 C CNN
+F 2 "" H 6200 4500 50  0001 C CNN
+F 3 "" H 6200 4500 50  0001 C CNN
+	1    6200 4500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0115
+U 1 1 6035337B
+P 7150 3750
+F 0 "#PWR0115" H 7150 3500 50  0001 C CNN
+F 1 "GND" H 7155 3577 50  0000 C CNN
+F 2 "" H 7150 3750 50  0001 C CNN
+F 3 "" H 7150 3750 50  0001 C CNN
+	1    7150 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0114
+U 1 1 6034D3F9
+P 6150 3750
+F 0 "#PWR0114" H 6150 3500 50  0001 C CNN
+F 1 "GND" H 6155 3577 50  0000 C CNN
+F 2 "" H 6150 3750 50  0001 C CNN
+F 3 "" H 6150 3750 50  0001 C CNN
+	1    6150 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0113
+U 1 1 60347479
+P 7550 2850
+F 0 "#PWR0113" H 7550 2600 50  0001 C CNN
+F 1 "GND" H 7555 2677 50  0000 C CNN
+F 2 "" H 7550 2850 50  0001 C CNN
+F 3 "" H 7550 2850 50  0001 C CNN
+	1    7550 2850
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0112
+U 1 1 60341486
+P 6700 2800
+F 0 "#PWR0112" H 6700 2550 50  0001 C CNN
+F 1 "GND" H 6705 2627 50  0000 C CNN
+F 2 "" H 6700 2800 50  0001 C CNN
+F 3 "" H 6700 2800 50  0001 C CNN
+	1    6700 2800
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0111
+U 1 1 6033B5A0
+P 6000 2800
+F 0 "#PWR0111" H 6000 2550 50  0001 C CNN
+F 1 "GND" H 6005 2627 50  0000 C CNN
+F 2 "" H 6000 2800 50  0001 C CNN
+F 3 "" H 6000 2800 50  0001 C CNN
+	1    6000 2800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7000 4200 7100 4200
+Wire Wire Line
+	6450 4200 6600 4200
+Wire Wire Line
+	6450 4150 6450 4200
+Wire Wire Line
+	6100 4200 6200 4200
+Wire Wire Line
+	5600 4200 5700 4200
+Wire Wire Line
+	5600 4100 5600 4200
+Wire Wire Line
+	7000 3450 7150 3450
+Wire Wire Line
+	6500 3450 6600 3450
+Wire Wire Line
+	6500 3350 6500 3450
+Wire Wire Line
+	6000 3450 6150 3450
+Wire Wire Line
+	5450 3450 5600 3450
+Wire Wire Line
+	5450 3350 5450 3450
+Wire Wire Line
+	5850 2500 6000 2500
+Wire Wire Line
+	5400 2500 5450 2500
+Wire Wire Line
+	5400 2450 5400 2500
+Wire Wire Line
+	6200 2500 6200 2450
+Wire Wire Line
+	6250 2500 6200 2500
+Wire Wire Line
+	6650 2500 6700 2500
+Wire Wire Line
+	7550 2500 7550 2550
+Wire Wire Line
+	7400 2500 7550 2500
+Wire Wire Line
+	6900 2500 6900 2450
+Wire Wire Line
+	7000 2500 6900 2500
+$Comp
+L Device:C C24
+U 1 1 602A0937
+P 7100 4350
+F 0 "C24" H 7215 4396 50  0000 L CNN
+F 1 "100n" H 7215 4305 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7138 4200 50  0001 C CNN
+F 3 "~" H 7100 4350 50  0001 C CNN
+	1    7100 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C16
+U 1 1 6029C3BF
+P 6200 4350
+F 0 "C16" H 6315 4396 50  0000 L CNN
+F 1 "100n" H 6315 4305 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6238 4200 50  0001 C CNN
+F 3 "~" H 6200 4350 50  0001 C CNN
+	1    6200 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C25
+U 1 1 60297CFB
+P 7150 3600
+F 0 "C25" H 7265 3646 50  0000 L CNN
+F 1 "100n" H 7265 3555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7188 3450 50  0001 C CNN
+F 3 "~" H 7150 3600 50  0001 C CNN
+	1    7150 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C15
+U 1 1 602935D2
+P 6150 3600
+F 0 "C15" H 6265 3646 50  0000 L CNN
+F 1 "100n" H 6265 3555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6188 3450 50  0001 C CNN
+F 3 "~" H 6150 3600 50  0001 C CNN
+	1    6150 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C26
+U 1 1 6028EF79
+P 7550 2700
+F 0 "C26" H 7665 2746 50  0000 L CNN
+F 1 "100n" H 7665 2655 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7588 2550 50  0001 C CNN
+F 3 "~" H 7550 2700 50  0001 C CNN
+	1    7550 2700
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:C C22
+U 1 1 6028A8A3
+P 6700 2650
+F 0 "C22" H 6815 2696 50  0000 L CNN
+F 1 "100n" H 6815 2605 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6738 2500 50  0001 C CNN
+F 3 "~" H 6700 2650 50  0001 C CNN
+	1    6700 2650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C14
+U 1 1 60286212
+P 6000 2650
+F 0 "C14" H 6115 2696 50  0000 L CNN
+F 1 "100n" H 6115 2605 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6038 2500 50  0001 C CNN
+F 3 "~" H 6000 2650 50  0001 C CNN
+	1    6000 2650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0110
+U 1 1 6027C43E
+P 6450 4150
+F 0 "#PWR0110" H 6450 4000 50  0001 C CNN
+F 1 "+3.3V" H 6465 4323 50  0000 C CNN
+F 2 "" H 6450 4150 50  0001 C CNN
+F 3 "" H 6450 4150 50  0001 C CNN
+	1    6450 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0108
+U 1 1 60273787
+P 6500 3350
+F 0 "#PWR0108" H 6500 3200 50  0001 C CNN
+F 1 "+3.3V" H 6515 3523 50  0000 C CNN
+F 2 "" H 6500 3350 50  0001 C CNN
+F 3 "" H 6500 3350 50  0001 C CNN
+	1    6500 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0106
+U 1 1 6026AB0D
+P 6900 2450
+F 0 "#PWR0106" H 6900 2300 50  0001 C CNN
+F 1 "+3.3V" H 6915 2623 50  0000 C CNN
+F 2 "" H 6900 2450 50  0001 C CNN
+F 3 "" H 6900 2450 50  0001 C CNN
+	1    6900 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0105
+U 1 1 60266414
+P 6200 2450
+F 0 "#PWR0105" H 6200 2300 50  0001 C CNN
+F 1 "+3.3V" H 6215 2623 50  0000 C CNN
+F 2 "" H 6200 2450 50  0001 C CNN
+F 3 "" H 6200 2450 50  0001 C CNN
+	1    6200 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0104
+U 1 1 60261D84
+P 5400 2450
+F 0 "#PWR0104" H 5400 2300 50  0001 C CNN
+F 1 "+3.3V" H 5415 2623 50  0000 C CNN
+F 2 "" H 5400 2450 50  0001 C CNN
+F 3 "" H 5400 2450 50  0001 C CNN
+	1    5400 2450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW7
+U 1 1 6022C967
+P 6800 4200
+F 0 "SW7" H 6800 4485 50  0000 C CNN
+F 1 "TMB2" H 6800 4394 50  0000 C CNN
+F 2 "" H 6800 4400 50  0001 C CNN
+F 3 "~" H 6800 4400 50  0001 C CNN
+	1    6800 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW3
+U 1 1 60228190
+P 5800 3450
+F 0 "SW3" H 5800 3735 50  0000 C CNN
+F 1 "SMB1" H 5800 3644 50  0000 C CNN
+F 2 "" H 5800 3650 50  0001 C CNN
+F 3 "~" H 5800 3650 50  0001 C CNN
+	1    5800 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW4
+U 1 1 60223A7F
+P 5900 4200
+F 0 "SW4" H 5900 4485 50  0000 C CNN
+F 1 "TMB1" H 5900 4394 50  0000 C CNN
+F 2 "" H 5900 4400 50  0001 C CNN
+F 3 "~" H 5900 4400 50  0001 C CNN
+	1    5900 4200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW6
+U 1 1 6021F2B9
+P 6800 3450
+F 0 "SW6" H 6800 3735 50  0000 C CNN
+F 1 "SMB2" H 6800 3644 50  0000 C CNN
+F 2 "" H 6800 3650 50  0001 C CNN
+F 3 "~" H 6800 3650 50  0001 C CNN
+	1    6800 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW8
+U 1 1 6021A763
+P 7200 2500
+F 0 "SW8" H 7200 2785 50  0000 C CNN
+F 1 "MMB" H 7200 2694 50  0000 C CNN
+F 2 "" H 7200 2700 50  0001 C CNN
+F 3 "~" H 7200 2700 50  0001 C CNN
+	1    7200 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW2
+U 1 1 601CCB9C
+P 5650 2500
+F 0 "SW2" H 5650 2785 50  0000 C CNN
+F 1 "LMB" H 5650 2694 50  0000 C CNN
+F 2 "" H 5650 2700 50  0001 C CNN
+F 3 "~" H 5650 2700 50  0001 C CNN
+	1    5650 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW5
+U 1 1 601D1F96
+P 6450 2500
+F 0 "SW5" H 6450 2785 50  0000 C CNN
+F 1 "RMB" H 6450 2694 50  0000 C CNN
+F 2 "" H 6450 2700 50  0001 C CNN
+F 3 "~" H 6450 2700 50  0001 C CNN
+	1    6450 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0107
+U 1 1 6026F1CD
+P 5450 3350
+F 0 "#PWR0107" H 5450 3200 50  0001 C CNN
+F 1 "+3.3V" H 5465 3523 50  0000 C CNN
+F 2 "" H 5450 3350 50  0001 C CNN
+F 3 "" H 5450 3350 50  0001 C CNN
+	1    5450 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0109
+U 1 1 60277DCF
+P 5600 4100
+F 0 "#PWR0109" H 5600 3950 50  0001 C CNN
+F 1 "+3.3V" H 5615 4273 50  0000 C CNN
+F 2 "" H 5600 4100 50  0001 C CNN
+F 3 "" H 5600 4100 50  0001 C CNN
+	1    5600 4100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/HW/mouse/_autosave-mouse.sch b/HW/mouse/mouse.sch-bak
similarity index 70%
rename from HW/mouse/_autosave-mouse.sch
rename to HW/mouse/mouse.sch-bak
index ed66e31260fcf1516aaabfb36d41b06066adf9b8..cd7b6778fd6d8154f45ac86ba7fb34e41d5ea382 100644
--- a/HW/mouse/_autosave-mouse.sch
+++ b/HW/mouse/mouse.sch-bak
@@ -252,7 +252,7 @@ L Connector:Conn_01x06_Male J1
 U 1 1 600D4602
 P 4250 2650
 F 0 "J1" H 4222 2624 50  0000 R CNN
-F 1 "Conn_01x06_Male" H 4222 2533 50  0000 R CNN
+F 1 "MCU_TP" H 4222 2533 50  0000 R CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical" H 4250 2650 50  0001 C CNN
 F 3 "~" H 4250 2650 50  0001 C CNN
 	1    4250 2650
@@ -740,7 +740,7 @@ L Connector:Conn_01x01_Male J6
 U 1 1 6027468B
 P 3200 7150
 F 0 "J6" H 3000 7000 50  0000 C CNN
-F 1 "TestPoint" H 3000 7100 50  0000 C CNN
+F 1 "TP" H 3000 7100 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3200 7150 50  0001 C CNN
 F 3 "~" H 3200 7150 50  0001 C CNN
 	1    3200 7150
@@ -751,7 +751,7 @@ L Connector:Conn_01x01_Male J5
 U 1 1 6027F21E
 P 3350 7250
 F 0 "J5" H 3150 7100 50  0000 C CNN
-F 1 "TestPoint" H 3150 7200 50  0000 C CNN
+F 1 "TP" H 3150 7200 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3350 7250 50  0001 C CNN
 F 3 "~" H 3350 7250 50  0001 C CNN
 	1    3350 7250
@@ -849,12 +849,6 @@ NoConn ~ 3000 4500
 NoConn ~ 3000 4200
 NoConn ~ 3000 4100
 NoConn ~ 3000 4000
-NoConn ~ 3000 3900
-NoConn ~ 3000 3800
-NoConn ~ 3000 3700
-NoConn ~ 3000 3500
-NoConn ~ 3000 3400
-NoConn ~ 3000 3300
 NoConn ~ 3000 3100
 NoConn ~ 3000 2600
 NoConn ~ 3000 2500
@@ -895,7 +889,7 @@ L Connector:Conn_01x01_Male J4
 U 1 1 601302EE
 P 8800 1700
 F 0 "J4" H 8800 1650 50  0000 C CNN
-F 1 "TestPointGND" H 8800 1550 50  0000 C CNN
+F 1 "TPG" H 8800 1550 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 8800 1700 50  0001 C CNN
 F 3 "~" H 8800 1700 50  0001 C CNN
 	1    8800 1700
@@ -936,23 +930,23 @@ $EndComp
 $Comp
 L power:GND #PWR04
 U 1 1 600B6DB4
-P 1150 2400
-F 0 "#PWR04" H 1150 2150 50  0001 C CNN
-F 1 "GND" H 1300 2350 50  0000 C CNN
-F 2 "" H 1150 2400 50  0001 C CNN
-F 3 "" H 1150 2400 50  0001 C CNN
-	1    1150 2400
+P 1150 2200
+F 0 "#PWR04" H 1150 1950 50  0001 C CNN
+F 1 "GND" H 1000 2150 50  0000 C CNN
+F 2 "" H 1150 2200 50  0001 C CNN
+F 3 "" H 1150 2200 50  0001 C CNN
+	1    1150 2200
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R1
 U 1 1 600C5A46
-P 1150 2250
-F 0 "R1" H 950 2300 50  0000 L CNN
-F 1 "10K" H 950 2200 50  0000 L CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1080 2250 50  0001 C CNN
-F 3 "~" H 1150 2250 50  0001 C CNN
-	1    1150 2250
+P 1150 2050
+F 0 "R1" H 950 2100 50  0000 L CNN
+F 1 "10K" H 950 2000 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 1080 2050 50  0001 C CNN
+F 3 "~" H 1150 2050 50  0001 C CNN
+	1    1150 2050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1086,7 +1080,7 @@ L Connector:Conn_01x01_Male J7
 U 1 1 601D67DA
 P 3250 6650
 F 0 "J7" H 3050 6500 50  0000 C CNN
-F 1 "TestPoint" H 3050 6600 50  0000 C CNN
+F 1 "TP" H 3050 6600 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3250 6650 50  0001 C CNN
 F 3 "~" H 3250 6650 50  0001 C CNN
 	1    3250 6650
@@ -1097,7 +1091,7 @@ L Connector:Conn_01x01_Male J8
 U 1 1 601DABF3
 P 3350 6550
 F 0 "J8" H 3150 6600 50  0000 C CNN
-F 1 "TestPoint" H 3150 6500 50  0000 C CNN
+F 1 "TP" H 3150 6500 50  0000 C CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical" H 3350 6550 50  0001 C CNN
 F 3 "~" H 3350 6550 50  0001 C CNN
 	1    3350 6550
@@ -1130,10 +1124,10 @@ Wire Wire Line
 Wire Wire Line
 	1150 1750 1150 1800
 $Comp
-L Device:Jumper JP?
+L Device:Jumper JP1
 U 1 1 601C903C
 P 1150 1450
-F 0 "JP?" V 1196 1362 50  0000 R CNN
+F 0 "JP1" V 1196 1362 50  0000 R CNN
 F 1 "Jumper" V 1105 1362 50  0000 R CNN
 F 2 "" H 1150 1450 50  0001 C CNN
 F 3 "~" H 1150 1450 50  0001 C CNN
@@ -1142,9 +1136,6 @@ F 3 "~" H 1150 1450 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	1150 1800 1600 1800
-Connection ~ 1150 1800
-Wire Wire Line
-	1150 1800 1150 2100
 $Comp
 L power:GND #PWR017
 U 1 1 6012B032
@@ -1171,10 +1162,10 @@ Wire Wire Line
 	5700 1000 5800 1000
 Connection ~ 4000 1900
 $Comp
-L Connector:Conn_01x05_Male J?
+L Connector:Conn_01x05_Male J2
 U 1 1 6023D59F
 P 5500 1200
-F 0 "J?" H 5608 1581 50  0000 C CNN
+F 0 "J2" H 5608 1581 50  0000 C CNN
 F 1 "usb_conn" H 5608 1490 50  0000 C CNN
 F 2 "" H 5500 1200 50  0001 C CNN
 F 3 "~" H 5500 1200 50  0001 C CNN
@@ -1205,8 +1196,6 @@ Wire Wire Line
 Connection ~ 7250 1250
 Wire Notes Line
 	5150 2000 7750 2000
-Wire Notes Line
-	7750 2000 7750 500 
 Text Notes 5850 550  0    50   ~ 0
 USB\n
 Wire Notes Line
@@ -1242,4 +1231,479 @@ Wire Wire Line
 	1800 5950 1050 5950
 Wire Wire Line
 	3100 6150 4400 6150
+$Comp
+L Switch:SW_Push SW5
+U 1 1 601D1F96
+P 6400 2700
+F 0 "SW5" H 6400 2985 50  0000 C CNN
+F 1 "RMB" H 6400 2894 50  0000 C CNN
+F 2 "" H 6400 2900 50  0001 C CNN
+F 3 "~" H 6400 2900 50  0001 C CNN
+	1    6400 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW2
+U 1 1 601CCB9C
+P 5600 2700
+F 0 "SW2" H 5600 2985 50  0000 C CNN
+F 1 "LMB" H 5600 2894 50  0000 C CNN
+F 2 "" H 5600 2900 50  0001 C CNN
+F 3 "~" H 5600 2900 50  0001 C CNN
+	1    5600 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW8
+U 1 1 6021A763
+P 7150 2700
+F 0 "SW8" H 7150 2985 50  0000 C CNN
+F 1 "MMB" H 7150 2894 50  0000 C CNN
+F 2 "" H 7150 2900 50  0001 C CNN
+F 3 "~" H 7150 2900 50  0001 C CNN
+	1    7150 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW6
+U 1 1 6021F2B9
+P 6750 3650
+F 0 "SW6" H 6750 3935 50  0000 C CNN
+F 1 "SMB2" H 6750 3844 50  0000 C CNN
+F 2 "" H 6750 3850 50  0001 C CNN
+F 3 "~" H 6750 3850 50  0001 C CNN
+	1    6750 3650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW4
+U 1 1 60223A7F
+P 5850 4400
+F 0 "SW4" H 5850 4685 50  0000 C CNN
+F 1 "TMB1" H 5850 4594 50  0000 C CNN
+F 2 "" H 5850 4600 50  0001 C CNN
+F 3 "~" H 5850 4600 50  0001 C CNN
+	1    5850 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW3
+U 1 1 60228190
+P 5750 3650
+F 0 "SW3" H 5750 3935 50  0000 C CNN
+F 1 "SMB1" H 5750 3844 50  0000 C CNN
+F 2 "" H 5750 3850 50  0001 C CNN
+F 3 "~" H 5750 3850 50  0001 C CNN
+	1    5750 3650
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_Push SW7
+U 1 1 6022C967
+P 6750 4400
+F 0 "SW7" H 6750 4685 50  0000 C CNN
+F 1 "TMB2" H 6750 4594 50  0000 C CNN
+F 2 "" H 6750 4600 50  0001 C CNN
+F 3 "~" H 6750 4600 50  0001 C CNN
+	1    6750 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0104
+U 1 1 60261D84
+P 5350 2350
+F 0 "#PWR0104" H 5350 2200 50  0001 C CNN
+F 1 "+3.3V" H 5365 2523 50  0000 C CNN
+F 2 "" H 5350 2350 50  0001 C CNN
+F 3 "" H 5350 2350 50  0001 C CNN
+	1    5350 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0105
+U 1 1 60266414
+P 6150 2350
+F 0 "#PWR0105" H 6150 2200 50  0001 C CNN
+F 1 "+3.3V" H 6165 2523 50  0000 C CNN
+F 2 "" H 6150 2350 50  0001 C CNN
+F 3 "" H 6150 2350 50  0001 C CNN
+	1    6150 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0106
+U 1 1 6026AB0D
+P 6850 2350
+F 0 "#PWR0106" H 6850 2200 50  0001 C CNN
+F 1 "+3.3V" H 6865 2523 50  0000 C CNN
+F 2 "" H 6850 2350 50  0001 C CNN
+F 3 "" H 6850 2350 50  0001 C CNN
+	1    6850 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0107
+U 1 1 6026F1CD
+P 5400 3250
+F 0 "#PWR0107" H 5400 3100 50  0001 C CNN
+F 1 "+3.3V" H 5415 3423 50  0000 C CNN
+F 2 "" H 5400 3250 50  0001 C CNN
+F 3 "" H 5400 3250 50  0001 C CNN
+	1    5400 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0108
+U 1 1 60273787
+P 6450 3250
+F 0 "#PWR0108" H 6450 3100 50  0001 C CNN
+F 1 "+3.3V" H 6465 3423 50  0000 C CNN
+F 2 "" H 6450 3250 50  0001 C CNN
+F 3 "" H 6450 3250 50  0001 C CNN
+	1    6450 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0109
+U 1 1 60277DCF
+P 5550 4000
+F 0 "#PWR0109" H 5550 3850 50  0001 C CNN
+F 1 "+3.3V" H 5565 4173 50  0000 C CNN
+F 2 "" H 5550 4000 50  0001 C CNN
+F 3 "" H 5550 4000 50  0001 C CNN
+	1    5550 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0110
+U 1 1 6027C43E
+P 6400 4050
+F 0 "#PWR0110" H 6400 3900 50  0001 C CNN
+F 1 "+3.3V" H 6550 4150 50  0000 C CNN
+F 2 "" H 6400 4050 50  0001 C CNN
+F 3 "" H 6400 4050 50  0001 C CNN
+	1    6400 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C14
+U 1 1 60286212
+P 5950 2850
+F 0 "C14" H 6065 2896 50  0000 L CNN
+F 1 "100n" H 6065 2805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 5988 2700 50  0001 C CNN
+F 3 "~" H 5950 2850 50  0001 C CNN
+	1    5950 2850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C22
+U 1 1 6028A8A3
+P 6650 2850
+F 0 "C22" H 6765 2896 50  0000 L CNN
+F 1 "100n" H 6765 2805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6688 2700 50  0001 C CNN
+F 3 "~" H 6650 2850 50  0001 C CNN
+	1    6650 2850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C26
+U 1 1 6028EF79
+P 7500 2900
+F 0 "C26" H 7615 2946 50  0000 L CNN
+F 1 "100n" H 7615 2855 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7538 2750 50  0001 C CNN
+F 3 "~" H 7500 2900 50  0001 C CNN
+	1    7500 2900
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:C C15
+U 1 1 602935D2
+P 6100 3800
+F 0 "C15" H 6215 3846 50  0000 L CNN
+F 1 "100n" H 6215 3755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6138 3650 50  0001 C CNN
+F 3 "~" H 6100 3800 50  0001 C CNN
+	1    6100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C25
+U 1 1 60297CFB
+P 7100 3800
+F 0 "C25" H 7215 3846 50  0000 L CNN
+F 1 "100n" H 7215 3755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7138 3650 50  0001 C CNN
+F 3 "~" H 7100 3800 50  0001 C CNN
+	1    7100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C16
+U 1 1 6029C3BF
+P 6150 4550
+F 0 "C16" H 6265 4596 50  0000 L CNN
+F 1 "100n" H 6265 4505 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 6188 4400 50  0001 C CNN
+F 3 "~" H 6150 4550 50  0001 C CNN
+	1    6150 4550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C24
+U 1 1 602A0937
+P 7050 4550
+F 0 "C24" H 7165 4596 50  0000 L CNN
+F 1 "100n" H 7165 4505 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" H 7088 4400 50  0001 C CNN
+F 3 "~" H 7050 4550 50  0001 C CNN
+	1    7050 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6950 2700 6850 2700
+Wire Wire Line
+	6850 2700 6850 2650
+Wire Wire Line
+	7350 2700 7500 2700
+Wire Wire Line
+	7500 2700 7500 2750
+Wire Wire Line
+	6600 2700 6650 2700
+Wire Wire Line
+	6200 2700 6150 2700
+Wire Wire Line
+	6150 2700 6150 2650
+Wire Wire Line
+	5350 2650 5350 2700
+Wire Wire Line
+	5350 2700 5400 2700
+Wire Wire Line
+	5800 2700 5950 2700
+Wire Wire Line
+	5400 3550 5400 3650
+Wire Wire Line
+	5400 3650 5550 3650
+Wire Wire Line
+	5950 3650 6100 3650
+Wire Wire Line
+	6450 3550 6450 3650
+Wire Wire Line
+	6450 3650 6550 3650
+Wire Wire Line
+	6950 3650 7100 3650
+Wire Wire Line
+	5550 4300 5550 4400
+Wire Wire Line
+	5550 4400 5650 4400
+Wire Wire Line
+	6050 4400 6150 4400
+Wire Wire Line
+	6400 4350 6400 4400
+Wire Wire Line
+	6400 4400 6550 4400
+Wire Wire Line
+	6950 4400 7050 4400
+$Comp
+L power:GND #PWR0111
+U 1 1 6033B5A0
+P 5950 3000
+F 0 "#PWR0111" H 5950 2750 50  0001 C CNN
+F 1 "GND" H 5955 2827 50  0000 C CNN
+F 2 "" H 5950 3000 50  0001 C CNN
+F 3 "" H 5950 3000 50  0001 C CNN
+	1    5950 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0112
+U 1 1 60341486
+P 6650 3000
+F 0 "#PWR0112" H 6650 2750 50  0001 C CNN
+F 1 "GND" H 6655 2827 50  0000 C CNN
+F 2 "" H 6650 3000 50  0001 C CNN
+F 3 "" H 6650 3000 50  0001 C CNN
+	1    6650 3000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0113
+U 1 1 60347479
+P 7500 3050
+F 0 "#PWR0113" H 7500 2800 50  0001 C CNN
+F 1 "GND" H 7505 2877 50  0000 C CNN
+F 2 "" H 7500 3050 50  0001 C CNN
+F 3 "" H 7500 3050 50  0001 C CNN
+	1    7500 3050
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0114
+U 1 1 6034D3F9
+P 6100 3950
+F 0 "#PWR0114" H 6100 3700 50  0001 C CNN
+F 1 "GND" H 6105 3777 50  0000 C CNN
+F 2 "" H 6100 3950 50  0001 C CNN
+F 3 "" H 6100 3950 50  0001 C CNN
+	1    6100 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0115
+U 1 1 6035337B
+P 7100 3950
+F 0 "#PWR0115" H 7100 3700 50  0001 C CNN
+F 1 "GND" H 7105 3777 50  0000 C CNN
+F 2 "" H 7100 3950 50  0001 C CNN
+F 3 "" H 7100 3950 50  0001 C CNN
+	1    7100 3950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0116
+U 1 1 603592BF
+P 6150 4700
+F 0 "#PWR0116" H 6150 4450 50  0001 C CNN
+F 1 "GND" H 6155 4527 50  0000 C CNN
+F 2 "" H 6150 4700 50  0001 C CNN
+F 3 "" H 6150 4700 50  0001 C CNN
+	1    6150 4700
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0117
+U 1 1 6035F1F2
+P 7050 4700
+F 0 "#PWR0117" H 7050 4450 50  0001 C CNN
+F 1 "GND" H 7055 4527 50  0000 C CNN
+F 2 "" H 7050 4700 50  0001 C CNN
+F 3 "" H 7050 4700 50  0001 C CNN
+	1    7050 4700
+	1    0    0    -1  
+$EndComp
+Text GLabel 3000 3300 2    50   Input ~ 0
+LMB
+Text GLabel 5950 2700 1    50   Output ~ 0
+LMB
+Text GLabel 6650 2700 1    50   Output ~ 0
+RMB
+Text GLabel 7500 2700 1    50   Output ~ 0
+MMB
+Text GLabel 6100 3650 1    50   Output ~ 0
+SMB1
+Text GLabel 7100 3650 1    50   Output ~ 0
+SMB2
+Text GLabel 6150 4400 1    50   Output ~ 0
+TMB1
+Text GLabel 7050 4400 1    50   Output ~ 0
+TMB2
+Text GLabel 3000 3400 2    50   Input ~ 0
+RMB
+Text GLabel 3000 3500 2    50   Input ~ 0
+MMB
+Text GLabel 3000 3600 2    50   Input ~ 0
+SMB1
+Text GLabel 3000 3700 2    50   Input ~ 0
+SMB2
+Text GLabel 3000 3800 2    50   Input ~ 0
+TMB1
+Text GLabel 3000 3900 2    50   Input ~ 0
+TMB2
+Wire Notes Line
+	7750 4900 5150 4900
+Wire Notes Line
+	7750 500  7750 4900
+Text Notes 5350 2100 0    50   ~ 0
+Buttons\n
+Wire Notes Line
+	7750 3500 11200 3500
+Text Notes 8000 650  0    50   ~ 0
+Power_Reg\n
+NoConn ~ 3000 4300
+NoConn ~ 3000 4400
+NoConn ~ 1600 3600
+NoConn ~ 3000 3000
+NoConn ~ 3000 2900
+Wire Wire Line
+	1150 1900 1150 1800
+Connection ~ 1150 1800
+$Comp
+L Device:R R?
+U 1 1 6046EFE6
+P 5400 3400
+F 0 "R?" H 5200 3450 50  0000 L CNN
+F 1 "10K" H 5200 3350 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5330 3400 50  0001 C CNN
+F 3 "~" H 5400 3400 50  0001 C CNN
+	1    5400 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 6047B62F
+P 5350 2500
+F 0 "R?" H 5150 2550 50  0000 L CNN
+F 1 "10K" H 5150 2450 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5280 2500 50  0001 C CNN
+F 3 "~" H 5350 2500 50  0001 C CNN
+	1    5350 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 60487E46
+P 6150 2500
+F 0 "R?" H 6150 2550 50  0000 L CNN
+F 1 "10K" H 6150 2450 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6080 2500 50  0001 C CNN
+F 3 "~" H 6150 2500 50  0001 C CNN
+	1    6150 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 60493FCE
+P 6850 2500
+F 0 "R?" H 6900 2550 50  0000 L CNN
+F 1 "10K" H 6900 2450 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6780 2500 50  0001 C CNN
+F 3 "~" H 6850 2500 50  0001 C CNN
+	1    6850 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 6049FFD8
+P 6450 3400
+F 0 "R?" H 6250 3450 50  0000 L CNN
+F 1 "10K" H 6250 3350 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6380 3400 50  0001 C CNN
+F 3 "~" H 6450 3400 50  0001 C CNN
+	1    6450 3400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 604A5F8A
+P 5550 4150
+F 0 "R?" H 5350 4200 50  0000 L CNN
+F 1 "10K" H 5350 4100 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 5480 4150 50  0001 C CNN
+F 3 "~" H 5550 4150 50  0001 C CNN
+	1    5550 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 604B2002
+P 6400 4200
+F 0 "R?" H 6200 4250 50  0000 L CNN
+F 1 "10K" H 6200 4150 50  0000 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" V 6330 4200 50  0001 C CNN
+F 3 "~" H 6400 4200 50  0001 C CNN
+	1    6400 4200
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/HW/mouse/mouseComp.bck b/HW/mouse/mouseComp.bck
new file mode 100644
index 0000000000000000000000000000000000000000..5f3ed79b79731d3d1ca39cfaa9a2dda60617b802
--- /dev/null
+++ b/HW/mouse/mouseComp.bck
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/HW/mouse/mouseComp.dcm b/HW/mouse/mouseComp.dcm
new file mode 100644
index 0000000000000000000000000000000000000000..5f3ed79b79731d3d1ca39cfaa9a2dda60617b802
--- /dev/null
+++ b/HW/mouse/mouseComp.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/HW/mouse/mouseComp.lib b/HW/mouse/mouseComp.lib
new file mode 100644
index 0000000000000000000000000000000000000000..daf1a1c77b1e72efe2aa6aa33ce2cf37b1f13b4f
--- /dev/null
+++ b/HW/mouse/mouseComp.lib
@@ -0,0 +1,32 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# PMW3389
+#
+DEF PMW3389 U 0 40 Y Y 1 F N
+F0 "U" 0 650 50 H V C CNN
+F1 "PMW3389" 0 550 50 H V C CNN
+F2 "" 0 600 50 H I C CNN
+F3 "" 0 600 50 H I C CNN
+DRAW
+S -350 450 350 -450 1 1 0 f
+X NC_0 1 -450 350 100 R 50 50 1 1 N
+X SCLK 10 450 -250 100 L 50 50 1 1 I
+X MOSI 11 450 -150 100 L 50 50 1 1 I
+X MISO 12 450 -50 100 L 50 50 1 1 O
+X NCS 13 450 50 100 L 50 50 1 1 I
+X NC_3 14 450 150 100 L 50 50 1 1 N
+X LED1_P~ 15 450 250 100 L 50 50 1 1 I
+X NC 16 450 350 100 L 50 50 1 1 N
+X NC_1 2 -450 250 100 R 50 50 1 1 N
+X VDDPIX 3 -450 150 100 R 50 50 1 1 w
+X VDD 4 -450 50 100 R 50 50 1 1 W
+X VDDIO 5 -450 -50 100 R 50 50 1 1 W
+X GP0 6 -450 -150 100 R 50 50 1 1 N
+X NRESET 7 -450 -250 100 R 50 50 1 1 I
+X GND 8 -450 -350 100 R 50 50 1 1 W
+X MOTION 9 450 -350 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library