diff --git a/CAD/Leo_muziekdoos_ESP32/CPU.sch b/CAD/Leo_muziekdoos_ESP32/CPU.sch
index 7213095..6995a53 100644
--- a/CAD/Leo_muziekdoos_ESP32/CPU.sch
+++ b/CAD/Leo_muziekdoos_ESP32/CPU.sch
@@ -459,15 +459,15 @@ Wire Wire Line
 $Comp
 L Device:R R21
 U 1 1 613CA13C
-P 7300 900
-F 0 "R21" V 7400 950 50  0000 L CNN
-F 1 "10K" V 7400 750 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 900 50  0001 C CNN
-F 3 "~" H 7300 900 50  0001 C CNN
-F 4 "R10K_0402" H 7300 900 50  0001 C CNN "StockRef"
-F 5 "2447096" H 7300 900 50  0001 C CNN "ordercode"
-F 6 "farnell" H 7300 900 50  0001 C CNN "supplier"
-	1    7300 900 
+P 7300 1550
+F 0 "R21" V 7400 1600 50  0000 L CNN
+F 1 "10K" V 7400 1400 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 1550 50  0001 C CNN
+F 3 "~" H 7300 1550 50  0001 C CNN
+F 4 "R10K_0402" H 7300 1550 50  0001 C CNN "StockRef"
+F 5 "2447096" H 7300 1550 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7300 1550 50  0001 C CNN "supplier"
+	1    7300 1550
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -511,40 +511,33 @@ F 3 "" H 6850 800 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	7150 1100 6850 1100
-Wire Wire Line
-	7150 900  6850 900 
-Connection ~ 6850 900 
-Wire Wire Line
-	6850 900  6850 1100
 $Comp
 L power:GND #PWR02
 U 1 1 613DE4F2
-P 6850 1350
-F 0 "#PWR02" H 6850 1100 50  0001 C CNN
-F 1 "GND" H 6855 1177 50  0000 C CNN
-F 2 "" H 6850 1350 50  0001 C CNN
-F 3 "" H 6850 1350 50  0001 C CNN
-	1    6850 1350
+P 6850 1600
+F 0 "#PWR02" H 6850 1350 50  0001 C CNN
+F 1 "GND" H 6855 1427 50  0000 C CNN
+F 2 "" H 6850 1600 50  0001 C CNN
+F 3 "" H 6850 1600 50  0001 C CNN
+	1    6850 1600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6850 1350 6850 1300
+	6850 1600 6850 1550
 Wire Wire Line
 	6850 1300 7150 1300
 Text Label 8050 1300 2    50   ~ 0
 ESP_GPIO15
 Text Label 8050 1100 2    50   ~ 0
 ESP_GPIO0
-Text Label 8050 900  2    50   ~ 0
+Text Label 8050 1550 2    50   ~ 0
 ESP_GPIO2
 Wire Wire Line
 	7450 1300 8050 1300
 Wire Wire Line
 	8050 1100 7450 1100
 Wire Wire Line
-	8050 900  7450 900 
-Wire Wire Line
-	6850 800  6850 900 
+	8050 1550 7450 1550
 Wire Wire Line
 	5700 3650 5200 3650
 Text Label 5700 2850 2    50   ~ 0
@@ -588,7 +581,7 @@ L Device:Antenna_Chip ANT1
 U 1 1 6133A7B9
 P 7700 2550
 F 0 "ANT1" H 7700 2797 60  0000 C CNN
-F 1 "2450AT18A100E" H 7700 2691 60  0000 C CNN
+F 1 "2450AT14A100E" H 7700 2691 60  0000 C CNN
 F 2 "MySymbols:wifi antenna" H 7900 2750 60  0001 L CNN
 F 3 "https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf" H 7900 2850 60  0001 L CNN
 F 4 "712-1005-1-ND" H 7900 2950 60  0001 L CNN "Digi-Key_PN"
@@ -642,4 +635,11 @@ Wire Wire Line
 NoConn ~ 5200 4450
 Wire Wire Line
 	2850 1600 4300 1600
+Wire Wire Line
+	6850 800  6850 1100
+Wire Wire Line
+	7150 1550 6850 1550
+Connection ~ 6850 1550
+Wire Wire Line
+	6850 1550 6850 1300
 $EndSCHEMATC
diff --git a/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak b/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak
index 9c74635..6995a53 100644
--- a/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/CPU.sch-bak
@@ -45,6 +45,10 @@ F 0 "U8" H 10050 2050 50  0000 R CNN
 F 1 "DRV5055A3xDBZxQ1" H 10700 1350 50  0000 R CNN
 F 2 "Package_TO_SOT_SMD:SOT-23" H 9950 1700 50  0001 C CNN
 F 3 "https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf" H 9950 1700 50  0001 C CNN
+F 4 "DRV5055" H 9950 1700 50  0001 C CNN "MPN"
+F 5 "TI" H 9950 1700 50  0001 C CNN "Manufacturer"
+F 6 "3008999" H 9950 1700 50  0001 C CNN "ordercode"
+F 7 "farnell" H 9950 1700 50  0001 C CNN "supplier"
 	1    9950 1700
 	1    0    0    -1  
 $EndComp
@@ -253,6 +257,7 @@ F 0 "U4" H 5100 5450 50  0000 C CNN
 F 1 "RF_Module_ESP32-PICO-D4" H 5000 2250 50  0000 C CNN
 F 2 "Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.3x5.3mm" H 4400 2150 50  0001 C CNN
 F 3 "" H 4650 2850 50  0001 C CNN
+F 4 "Espressive" H 4400 3850 50  0001 C CNN "Manufacturer"
 	1    4400 3850
 	1    0    0    -1  
 $EndComp
@@ -399,7 +404,9 @@ F 0 "R14" H 2370 2246 50  0000 L CNN
 F 1 "10K" H 2370 2155 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 2230 2200 50  0001 C CNN
 F 3 "~" H 2300 2200 50  0001 C CNN
-F 4 "R010K_0402" H 2300 2200 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 2300 2200 50  0001 C CNN "StockRef"
+F 5 "2447096" H 2300 2200 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2300 2200 50  0001 C CNN "supplier"
 	1    2300 2200
 	1    0    0    -1  
 $EndComp
@@ -452,13 +459,15 @@ Wire Wire Line
 $Comp
 L Device:R R21
 U 1 1 613CA13C
-P 7300 900
-F 0 "R21" V 7400 950 50  0000 L CNN
-F 1 "10K" V 7400 750 50  0000 L CNN
-F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 900 50  0001 C CNN
-F 3 "~" H 7300 900 50  0001 C CNN
-F 4 "R010K_0402" H 7300 900 50  0001 C CNN "StockRef"
-	1    7300 900 
+P 7300 1550
+F 0 "R21" V 7400 1600 50  0000 L CNN
+F 1 "10K" V 7400 1400 50  0000 L CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 1550 50  0001 C CNN
+F 3 "~" H 7300 1550 50  0001 C CNN
+F 4 "R10K_0402" H 7300 1550 50  0001 C CNN "StockRef"
+F 5 "2447096" H 7300 1550 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7300 1550 50  0001 C CNN "supplier"
+	1    7300 1550
 	0    -1   -1   0   
 $EndComp
 $Comp
@@ -469,7 +478,9 @@ F 0 "R22" V 7400 1150 50  0000 L CNN
 F 1 "10K" V 7400 950 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 1100 50  0001 C CNN
 F 3 "~" H 7300 1100 50  0001 C CNN
-F 4 "R010K_0402" H 7300 1100 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 7300 1100 50  0001 C CNN "StockRef"
+F 5 "2447096" H 7300 1100 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7300 1100 50  0001 C CNN "supplier"
 	1    7300 1100
 	0    -1   -1   0   
 $EndComp
@@ -481,7 +492,9 @@ F 0 "R23" V 7400 1350 50  0000 L CNN
 F 1 "10K" V 7400 1150 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 7230 1300 50  0001 C CNN
 F 3 "~" H 7300 1300 50  0001 C CNN
-F 4 "R010K_0402" H 7300 1300 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 7300 1300 50  0001 C CNN "StockRef"
+F 5 "2447096" H 7300 1300 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7300 1300 50  0001 C CNN "supplier"
 	1    7300 1300
 	0    -1   -1   0   
 $EndComp
@@ -498,40 +511,33 @@ F 3 "" H 6850 800 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	7150 1100 6850 1100
-Wire Wire Line
-	7150 900  6850 900 
-Connection ~ 6850 900 
-Wire Wire Line
-	6850 900  6850 1100
 $Comp
 L power:GND #PWR02
 U 1 1 613DE4F2
-P 6850 1350
-F 0 "#PWR02" H 6850 1100 50  0001 C CNN
-F 1 "GND" H 6855 1177 50  0000 C CNN
-F 2 "" H 6850 1350 50  0001 C CNN
-F 3 "" H 6850 1350 50  0001 C CNN
-	1    6850 1350
+P 6850 1600
+F 0 "#PWR02" H 6850 1350 50  0001 C CNN
+F 1 "GND" H 6855 1427 50  0000 C CNN
+F 2 "" H 6850 1600 50  0001 C CNN
+F 3 "" H 6850 1600 50  0001 C CNN
+	1    6850 1600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6850 1350 6850 1300
+	6850 1600 6850 1550
 Wire Wire Line
 	6850 1300 7150 1300
 Text Label 8050 1300 2    50   ~ 0
 ESP_GPIO15
 Text Label 8050 1100 2    50   ~ 0
 ESP_GPIO0
-Text Label 8050 900  2    50   ~ 0
+Text Label 8050 1550 2    50   ~ 0
 ESP_GPIO2
 Wire Wire Line
 	7450 1300 8050 1300
 Wire Wire Line
 	8050 1100 7450 1100
 Wire Wire Line
-	8050 900  7450 900 
-Wire Wire Line
-	6850 800  6850 900 
+	8050 1550 7450 1550
 Wire Wire Line
 	5700 3650 5200 3650
 Text Label 5700 2850 2    50   ~ 0
@@ -575,7 +581,7 @@ L Device:Antenna_Chip ANT1
 U 1 1 6133A7B9
 P 7700 2550
 F 0 "ANT1" H 7700 2797 60  0000 C CNN
-F 1 "2450AT18A100E" H 7700 2691 60  0000 C CNN
+F 1 "2450AT14A100E" H 7700 2691 60  0000 C CNN
 F 2 "MySymbols:wifi antenna" H 7900 2750 60  0001 L CNN
 F 3 "https://www.johansontechnology.com/datasheets/2450AT18A100/2450AT18A100.pdf" H 7900 2850 60  0001 L CNN
 F 4 "712-1005-1-ND" H 7900 2950 60  0001 L CNN "Digi-Key_PN"
@@ -629,4 +635,11 @@ Wire Wire Line
 NoConn ~ 5200 4450
 Wire Wire Line
 	2850 1600 4300 1600
+Wire Wire Line
+	6850 800  6850 1100
+Wire Wire Line
+	7150 1550 6850 1550
+Connection ~ 6850 1550
+Wire Wire Line
+	6850 1550 6850 1300
 $EndSCHEMATC
diff --git a/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch b/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch
index 46dda9f..ea7d596 100644
--- a/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch
+++ b/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch
@@ -59,6 +59,7 @@ F 3 "~" H 3150 3550 50  0001 C CNN
 F 4 "R10K_0402" H 3150 3550 50  0001 C CNN "StockRef"
 F 5 "2447096" H 3150 3550 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3150 3550 50  0001 C CNN "supplier"
+F 7 "DNP" V 3150 3550 50  0000 C CNN "DNP"
 	1    3150 3550
 	1    0    0    -1  
 $EndComp
@@ -73,6 +74,7 @@ F 3 "~" H 3150 4100 50  0001 C CNN
 F 4 "R10K_0402" H 3150 4100 50  0001 C CNN "StockRef"
 F 5 "2447096" H 3150 4100 50  0001 C CNN "ordercode"
 F 6 "farnell" H 3150 4100 50  0001 C CNN "supplier"
+F 7 "DNP" V 3150 4100 50  0000 C CNN "DNP"
 	1    3150 4100
 	1    0    0    -1  
 $EndComp
diff --git a/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch-bak b/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch-bak
index f7dbf67..ea7d596 100644
--- a/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/I2S_DAC_AMP.sch-bak
@@ -33,6 +33,10 @@ F 0 "U5" H 6150 4600 42  0000 L BNN
 F 1 "MAX98357A" H 5450 3250 42  0000 L BNN
 F 2 "Package_DFN_QFN:QFN-16-1EP_3x3mm_P0.5mm_EP1.7x1.7mm_ThermalVias" H 5950 3950 50  0001 C CNN
 F 3 "" H 5950 3950 50  0001 C CNN
+F 4 "MAX98357AETE+T" H 5950 3950 50  0001 C CNN "MPN"
+F 5 "Maxim IC" H 5950 3950 50  0001 C CNN "Manufacturer"
+F 6 "2949165" H 5950 3950 50  0001 C CNN "ordercode"
+F 7 "farnell" H 5950 3950 50  0001 C CNN "supplier"
 	1    5950 3950
 	1    0    0    -1  
 $EndComp
@@ -52,6 +56,10 @@ F 0 "R27" H 3220 3596 50  0000 L CNN
 F 1 "10K" H 3220 3505 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3080 3550 50  0001 C CNN
 F 3 "~" H 3150 3550 50  0001 C CNN
+F 4 "R10K_0402" H 3150 3550 50  0001 C CNN "StockRef"
+F 5 "2447096" H 3150 3550 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3150 3550 50  0001 C CNN "supplier"
+F 7 "DNP" V 3150 3550 50  0000 C CNN "DNP"
 	1    3150 3550
 	1    0    0    -1  
 $EndComp
@@ -63,6 +71,10 @@ F 0 "R28" H 3220 4146 50  0000 L CNN
 F 1 "10K" H 3220 4055 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3080 4100 50  0001 C CNN
 F 3 "~" H 3150 4100 50  0001 C CNN
+F 4 "R10K_0402" H 3150 4100 50  0001 C CNN "StockRef"
+F 5 "2447096" H 3150 4100 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3150 4100 50  0001 C CNN "supplier"
+F 7 "DNP" V 3150 4100 50  0000 C CNN "DNP"
 	1    3150 4100
 	1    0    0    -1  
 $EndComp
diff --git a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib
index f259a17..7b7c5cf 100644
--- a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib
+++ b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos-cache.lib
@@ -222,6 +222,28 @@ X 4 4 0 -200 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_D
+#
+DEF Device_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_L
 #
 DEF Device_L L 0 40 N N 1 F N
diff --git a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx
index ac41b4d..4eb892b 100644
Binary files a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx and b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx differ
diff --git a/CAD/Leo_muziekdoos_ESP32/NFC.sch-bak b/CAD/Leo_muziekdoos_ESP32/NFC.sch-bak
index e4262a0..676300d 100644
--- a/CAD/Leo_muziekdoos_ESP32/NFC.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/NFC.sch-bak
@@ -23,6 +23,9 @@ F 0 "U3" H 5450 4900 60  0000 C CNN
 F 1 "CR95HF-VMD5T" H 4550 2600 60  0000 C CNN
 F 2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm_ThermalVias" H 6250 4090 60  0001 C CNN
 F 3 "" H 4850 3850 60  0000 C CNN
+F 4 "ST" H 4850 3850 50  0001 C CNN "Manufacturer"
+F 5 "2807107" H 4850 3850 50  0001 C CNN "ordercode"
+F 6 "farnell" H 4850 3850 50  0001 C CNN "supplier"
 	1    4850 3850
 	1    0    0    -1  
 $EndComp
@@ -137,6 +140,9 @@ F 0 "R19" V 7100 4300 50  0000 C CNN
 F 1 "330E" V 7000 4300 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 6930 4300 50  0001 C CNN
 F 3 "~" H 7000 4300 50  0001 C CNN
+F 4 "R330E_0402" H 7000 4300 50  0001 C CNN "StockRef"
+F 5 "2447159" H 7000 4300 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7000 4300 50  0001 C CNN "supplier"
 	1    7000 4300
 	0    1    1    0   
 $EndComp
@@ -148,6 +154,9 @@ F 0 "R18" V 6850 3050 50  0000 C CNN
 F 1 "330E" V 6950 3050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 6880 3050 50  0001 C CNN
 F 3 "~" H 6950 3050 50  0001 C CNN
+F 4 "R330E_0402" H 6950 3050 50  0001 C CNN "StockRef"
+F 5 "2447159" H 6950 3050 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6950 3050 50  0001 C CNN "supplier"
 	1    6950 3050
 	0    1    1    0   
 $EndComp
@@ -198,6 +207,7 @@ F 2 "Capacitor_SMD:C_0402_1005Metric" H 3388 1900 50  0001 C CNN
 F 3 "~" H 3350 2050 50  0001 C CNN
 F 4 "2469394" H 3350 2050 50  0001 C CNN "ordercode"
 F 5 "farnell" H 3350 2050 50  0001 C CNN "supplier"
+F 6 "C04u7_0403" H 3350 2050 50  0001 C CNN "StockRef"
 	1    3350 2050
 	1    0    0    -1  
 $EndComp
@@ -418,6 +428,9 @@ F 0 "R17" V 3443 2950 50  0000 C CNN
 F 1 "3K3" V 3534 2950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3580 2950 50  0001 C CNN
 F 3 "~" H 3650 2950 50  0001 C CNN
+F 4 "R03K3_0402" H 3650 2950 50  0001 C CNN "StockRef"
+F 5 "2447170" H 3650 2950 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3650 2950 50  0001 C CNN "supplier"
 	1    3650 2950
 	0    1    1    0   
 $EndComp
@@ -446,7 +459,9 @@ F 0 "R15" V 3400 3500 50  0000 C CNN
 F 1 "10K" V 3400 3700 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3430 3600 50  0001 C CNN
 F 3 "~" H 3500 3600 50  0001 C CNN
-F 4 "R010K_0402" H 3500 3600 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 3500 3600 50  0001 C CNN "StockRef"
+F 5 "2447096" H 3500 3600 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3500 3600 50  0001 C CNN "supplier"
 	1    3500 3600
 	0    1    1    0   
 $EndComp
@@ -482,8 +497,9 @@ F 2 "Crystal:Crystal_SMD_EuroQuartz_X22-4Pin_2.5x2.0mm" H 1950 2400 50  0001 C C
 F 3 "~" H 1950 2400 50  0001 C CNN
 F 4 "NX2016SA" V 1950 2400 50  0001 C CNN "partnr"
 F 5 "MCSJK-7E-27.12-10-30-60-B-30" V 1950 2400 50  0001 C CNN "MPN"
-F 6 "Farnell" V 1950 2400 50  0001 C CNN "supplier"
+F 6 "farnell" V 1950 2400 50  0001 C CNN "supplier"
 F 7 "2853901" V 1950 2400 50  0001 C CNN "ordercode"
+F 8 "mComp pro" H 1950 2400 50  0001 C CNN "Manufacturer"
 	1    1950 2400
 	0    1    1    0   
 $EndComp
@@ -612,7 +628,9 @@ F 0 "R12" V 3400 3800 50  0000 C CNN
 F 1 "10K" V 3400 3600 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3430 3700 50  0001 C CNN
 F 3 "~" H 3500 3700 50  0001 C CNN
-F 4 "R010K_0402" H 3500 3700 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 3500 3700 50  0001 C CNN "StockRef"
+F 5 "2447096" H 3500 3700 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3500 3700 50  0001 C CNN "supplier"
 	1    3500 3700
 	0    -1   -1   0   
 $EndComp
@@ -651,6 +669,7 @@ F 1 "1M" H 8770 3655 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 8630 3700 50  0001 C CNN
 F 3 "~" H 8700 3700 50  0001 C CNN
 F 4 "DNP" V 8700 3700 50  0000 C CNN "Field4"
+F 5 "farnell" H 8700 3700 50  0001 C CNN "supplier"
 	1    8700 3700
 	1    0    0    -1  
 $EndComp
diff --git a/CAD/Leo_muziekdoos_ESP32/Power.sch-bak b/CAD/Leo_muziekdoos_ESP32/Power.sch-bak
index 6794e3d..9a03ab2 100644
--- a/CAD/Leo_muziekdoos_ESP32/Power.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/Power.sch-bak
@@ -24,7 +24,9 @@ F 0 "R4" H 2470 6696 50  0000 L CNN
 F 1 "10K" H 2470 6605 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6650 50  0001 C CNN
 F 3 "~" H 2400 6650 50  0001 C CNN
-F 4 "R010K_0402" H 2400 6650 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 2400 6650 50  0001 C CNN "StockRef"
+F 5 "2447096" H 2400 6650 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2400 6650 50  0001 C CNN "supplier"
 	1    2400 6650
 	1    0    0    -1  
 $EndComp
@@ -39,7 +41,9 @@ F 0 "R3" H 2470 6296 50  0000 L CNN
 F 1 "4k7" H 2470 6205 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 2330 6250 50  0001 C CNN
 F 3 "~" H 2400 6250 50  0001 C CNN
-F 4 "R04K7_0402" H 2400 6250 50  0001 C CNN "StockRef"
+F 4 "R4K7_0402" H 2400 6250 50  0001 C CNN "StockRef"
+F 5 "2073069" H 2400 6250 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2400 6250 50  0001 C CNN "supplier"
 	1    2400 6250
 	1    0    0    -1  
 $EndComp
@@ -125,6 +129,8 @@ F 1 "10K" H 2120 5605 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 1980 5650 50  0001 C CNN
 F 3 "~" H 2050 5650 50  0001 C CNN
 F 4 "R10K_0402" H 2050 5650 50  0001 C CNN "StockRef"
+F 5 "2447096" H 2050 5650 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2050 5650 50  0001 C CNN "supplier"
 	1    2050 5650
 	-1   0    0    -1  
 $EndComp
@@ -216,7 +222,9 @@ F 0 "R7" V 5193 1500 50  0000 C CNN
 F 1 "10K" V 5284 1500 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 5330 1500 50  0001 C CNN
 F 3 "~" H 5400 1500 50  0001 C CNN
-F 4 "R010K_0402" H 5400 1500 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 5400 1500 50  0001 C CNN "StockRef"
+F 5 "2447096" H 5400 1500 50  0001 C CNN "ordercode"
+F 6 "farnell" H 5400 1500 50  0001 C CNN "supplier"
 	1    5400 1500
 	1    0    0    -1  
 $EndComp
@@ -276,7 +284,9 @@ F 0 "R8" V 5643 1500 50  0000 C CNN
 F 1 "10K" V 5734 1500 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 5780 1500 50  0001 C CNN
 F 3 "~" H 5850 1500 50  0001 C CNN
-F 4 "R010K_0402" H 5850 1500 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 5850 1500 50  0001 C CNN "StockRef"
+F 5 "2447096" H 5850 1500 50  0001 C CNN "ordercode"
+F 6 "farnell" H 5850 1500 50  0001 C CNN "supplier"
 	1    5850 1500
 	1    0    0    -1  
 $EndComp
@@ -296,6 +306,7 @@ F 4 "DIODE_BAS316" H 6200 1850 50  0001 C CNN "StockRef"
 F 5 "1SS355TE-17" H 6200 1850 50  0001 C CNN "MPN"
 F 6 "ROHM" H 6200 1850 50  0001 C CNN "Manufacturer"
 F 7 "1525435" H 6200 1850 50  0001 C CNN "ordercode"
+F 8 "farnell" H 6200 1850 50  0001 C CNN "supplier"
 	1    6200 1850
 	0    1    -1   0   
 $EndComp
@@ -316,7 +327,9 @@ F 0 "R9" V 5993 1500 50  0000 C CNN
 F 1 "10K" V 6084 1500 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 6130 1500 50  0001 C CNN
 F 3 "~" H 6200 1500 50  0001 C CNN
-F 4 "R010K_0402" H 6200 1500 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 6200 1500 50  0001 C CNN "StockRef"
+F 5 "2447096" H 6200 1500 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6200 1500 50  0001 C CNN "supplier"
 	1    6200 1500
 	1    0    0    -1  
 $EndComp
@@ -342,7 +355,9 @@ F 0 "R10" V 7393 2100 50  0000 C CNN
 F 1 "10K" V 7484 2100 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 7530 2100 50  0001 C CNN
 F 3 "~" H 7600 2100 50  0001 C CNN
-F 4 "R010K_0402" H 7600 2100 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 7600 2100 50  0001 C CNN "StockRef"
+F 5 "2447096" H 7600 2100 50  0001 C CNN "ordercode"
+F 6 "farnell" H 7600 2100 50  0001 C CNN "supplier"
 	1    7600 2100
 	-1   0    0    1   
 $EndComp
@@ -422,6 +437,7 @@ F 2 "Resistor_SMD:R_0402_1005Metric" V 1880 2250 50  0001 C CNN
 F 3 "~" H 1950 2250 50  0001 C CNN
 F 4 "R03K3_0402" H 1950 2250 50  0001 C CNN "StockRef"
 F 5 "2447170" H 1950 2250 50  0001 C CNN "ordercode"
+F 6 "farnell" H 1950 2250 50  0001 C CNN "supplier"
 	1    1950 2250
 	1    0    0    -1  
 $EndComp
@@ -474,6 +490,8 @@ F 1 "LED" H 3293 1386 50  0000 C CNN
 F 2 "LED_SMD:LED_0805_2012Metric" H 3300 1550 50  0001 C CNN
 F 3 "~" H 3300 1550 50  0001 C CNN
 F 4 "LED_SMD_GREEN_0805_20mA" H 3300 1550 50  0001 C CNN "StockRef"
+F 5 "2290331" H 3300 1550 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3300 1550 50  0001 C CNN "supplier"
 	1    3300 1550
 	0    -1   -1   0   
 $EndComp
@@ -489,6 +507,8 @@ F 1 "LED" H 3793 2086 50  0000 C CNN
 F 2 "LED_SMD:LED_0805_2012Metric" H 3800 2250 50  0001 C CNN
 F 3 "~" H 3800 2250 50  0001 C CNN
 F 4 "LED_SMD_RED_0805_20mA" H 3800 2250 50  0001 C CNN "StockRef"
+F 5 "2290331" H 3800 2250 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3800 2250 50  0001 C CNN "supplier"
 	1    3800 2250
 	0    -1   -1   0   
 $EndComp
@@ -506,6 +526,8 @@ F 1 "470E" V 3684 1550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 3730 1550 50  0001 C CNN
 F 3 "~" H 3800 1550 50  0001 C CNN
 F 4 "R470E_0402" H 3800 1550 50  0001 C CNN "StockRef"
+F 5 "2447178" H 3800 1550 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3800 1550 50  0001 C CNN "supplier"
 	1    3800 1550
 	-1   0    0    1   
 $EndComp
@@ -520,10 +542,10 @@ AR Path="/615B8158" Ref="C?"  Part="1"
 AR Path="/6158A412/615B8158" Ref="C?"  Part="1" 
 AR Path="/60FE1698/615B8158" Ref="C3"  Part="1" 
 F 0 "C3" H 3068 2296 50  0000 L CNN
-F 1 "4,7uF" H 3068 2205 50  0000 L CNN
+F 1 "4u7" H 3068 2205 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 2988 2100 50  0001 C CNN
 F 3 "~" H 2950 2250 50  0001 C CNN
-F 4 "C04u7_0805" H 2950 2250 50  0001 C CNN "StockRef"
+F 4 "C04u7_0603" H 2950 2250 50  0001 C CNN "StockRef"
 F 5 "2112745" H 2950 2250 50  0001 C CNN "ordercode"
 F 6 "farnell" H 2950 2250 50  0001 C CNN "supplier"
 	1    2950 2250
@@ -547,10 +569,10 @@ AR Path="/615B8165" Ref="C?"  Part="1"
 AR Path="/6158A412/615B8165" Ref="C?"  Part="1" 
 AR Path="/60FE1698/615B8165" Ref="C1"  Part="1" 
 F 0 "C1" H 1818 2446 50  0000 L CNN
-F 1 "4,7uF" H 1818 2355 50  0000 L CNN
+F 1 "4u7" H 1818 2355 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 1738 2250 50  0001 C CNN
 F 3 "~" H 1700 2400 50  0001 C CNN
-F 4 "C04u7_0805" H 1700 2400 50  0001 C CNN "StockRef"
+F 4 "C04u7_0603" H 1700 2400 50  0001 C CNN "StockRef"
 F 5 "2112745" H 1700 2400 50  0001 C CNN "ordercode"
 F 6 "farnell" H 1700 2400 50  0001 C CNN "supplier"
 	1    1700 2400
@@ -598,6 +620,8 @@ F 1 "470E" V 2934 1800 50  0000 C CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 2980 1800 50  0001 C CNN
 F 3 "~" H 3050 1800 50  0001 C CNN
 F 4 "R470E_0402" H 3050 1800 50  0001 C CNN "StockRef"
+F 5 "2447178" H 3050 1800 50  0001 C CNN "ordercode"
+F 6 "farnell" H 3050 1800 50  0001 C CNN "supplier"
 	1    3050 1800
 	0    1    1    0   
 $EndComp
@@ -671,9 +695,12 @@ L Battery_Management:MCP73831-2-OT_copy U1
 U 1 1 610E217F
 P 2450 1900
 F 0 "U1" H 2650 2200 50  0000 R CNN
-F 1 "MCP73831-2-OT_copy" H 2050 2050 50  0000 R CNN
+F 1 "MCP73831-2-OT" H 2050 2050 50  0000 R CNN
 F 2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.75x1.45mm" H 2600 1450 50  0001 L CIN
 F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20001984g.pdf" H 2300 1850 50  0001 C CNN
+F 4 "Microchip" H 2450 1900 50  0001 C CNN "Manufacturer"
+F 5 "2709764" H 2450 1900 50  0001 C CNN "ordercode"
+F 6 "farnell" H 2450 1900 50  0001 C CNN "supplier"
 	1    2450 1900
 	1    0    0    -1  
 $EndComp
@@ -772,6 +799,8 @@ F 1 "SW_Push" V 6150 2800 50  0000 R CNN
 F 2 "Button_Switch_SMD:SW_SPST_B3U-3000P" H 6200 2600 50  0001 C CNN
 F 3 "~" H 6200 2600 50  0001 C CNN
 F 4 "SW_PUSH_SPST_V_6x6x5,4" H 6200 2400 50  0001 C CNN "StockRef"
+F 5 "1333656" H 6200 2400 50  0001 C CNN "ordercode"
+F 6 "farnell" H 6200 2400 50  0001 C CNN "supplier"
 	1    6200 2400
 	0    1    1    0   
 $EndComp
@@ -851,6 +880,9 @@ F 0 "U2" H 8250 1550 50  0000 L CNN
 F 1 "XCL214B333DR" H 8150 800 50  0000 L CNN
 F 2 "Package_DFN_QFN:USP-9B01" H 8100 500 50  0001 L CNN
 F 3 "https://www.torexsemi.com/file/xcl214/XCL213-XCL214.pdf" H 8050 1300 50  0001 C CNN
+F 4 "Torex" H 8050 1300 50  0001 C CNN "Manufacturer"
+F 5 "3535992" H 8050 1300 50  0001 C CNN "ordercode"
+F 6 "farnell" H 8050 1300 50  0001 C CNN "supplier"
 	1    8050 1300
 	1    0    0    -1  
 $EndComp
diff --git a/CAD/Leo_muziekdoos_ESP32/assembly.pdf b/CAD/Leo_muziekdoos_ESP32/assembly.pdf
index b67b1ee..cf7cd61 100644
Binary files a/CAD/Leo_muziekdoos_ESP32/assembly.pdf and b/CAD/Leo_muziekdoos_ESP32/assembly.pdf differ
diff --git a/CAD/Leo_muziekdoos_ESP32/programmer.sch b/CAD/Leo_muziekdoos_ESP32/programmer.sch
index f9854fa..0975bfc 100644
--- a/CAD/Leo_muziekdoos_ESP32/programmer.sch
+++ b/CAD/Leo_muziekdoos_ESP32/programmer.sch
@@ -193,10 +193,8 @@ Wire Wire Line
 	4800 2400 4800 2700
 Text Label 5100 2400 0    50   ~ 0
 PROG_VCC
-Text HLabel 4650 2400 0    50   Output ~ 0
+Text HLabel 3900 2400 0    50   Output ~ 0
 PROG_VCC
-Wire Wire Line
-	4650 2400 4800 2400
 Connection ~ 4800 2400
 $Comp
 L power:GND #PWR0126
@@ -226,4 +224,22 @@ Text HLabel 4700 3750 0    50   Input ~ 0
 USB_D-
 Text HLabel 4700 3650 0    50   Input ~ 0
 USB_PWR
+Wire Wire Line
+	4550 2400 4800 2400
+$Comp
+L Device:D D4
+U 1 1 616219F1
+P 4400 2400
+F 0 "D4" H 4400 2617 50  0000 C CNN
+F 1 "1SS355" H 4400 2526 50  0000 C CNN
+F 2 "" H 4400 2400 50  0001 C CNN
+F 3 "~" H 4400 2400 50  0001 C CNN
+F 4 "DIODE_BAS316" H 4400 2400 50  0001 C CNN "StockRef"
+F 5 "1525435" H 4400 2400 50  0001 C CNN "ordercode"
+F 6 "farnell" H 4400 2400 50  0001 C CNN "supplier"
+	1    4400 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3900 2400 4250 2400
 $EndSCHEMATC
diff --git a/CAD/Leo_muziekdoos_ESP32/programmer.sch-bak b/CAD/Leo_muziekdoos_ESP32/programmer.sch-bak
index a3b2818..e983ef8 100644
--- a/CAD/Leo_muziekdoos_ESP32/programmer.sch-bak
+++ b/CAD/Leo_muziekdoos_ESP32/programmer.sch-bak
@@ -21,7 +21,10 @@ F 0 "U10" H 5950 5550 50  0000 C CNN
 F 1 "CP2109-InterfaceUSB" H 6200 4100 50  0000 C CNN
 F 2 "Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm" H 5750 6050 50  0001 C CNN
 F 3 "" H 5400 4400 50  0001 C CNN
-F 4 "CP2109-Axx-xQFN28" H 6150 5500 50  0001 C CNN "ordercode"
+F 4 "2930584" H 6150 5500 50  0001 C CNN "ordercode"
+F 5 "CP2109-A01-GM" H 5700 4250 50  0001 C CNN "MPN"
+F 6 "Silabs" H 5700 4250 50  0001 C CNN "Manufacturer"
+F 7 "farnell" H 5700 4250 50  0001 C CNN "supplier"
 	1    5700 4250
 	1    0    0    -1  
 $EndComp
@@ -99,7 +102,9 @@ F 0 "R11" H 4870 2896 50  0000 L CNN
 F 1 "10K" H 4870 2805 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" V 4730 2850 50  0001 C CNN
 F 3 "~" H 4800 2850 50  0001 C CNN
-F 4 "R010K_0402" H 4800 2850 50  0001 C CNN "StockRef"
+F 4 "R10K_0402" H 4800 2850 50  0001 C CNN "StockRef"
+F 5 "2447096" H 4800 2850 50  0001 C CNN "ordercode"
+F 6 "farnell" H 4800 2850 50  0001 C CNN "supplier"
 	1    4800 2850
 	1    0    0    -1  
 $EndComp
@@ -188,10 +193,8 @@ Wire Wire Line
 	4800 2400 4800 2700
 Text Label 5100 2400 0    50   ~ 0
 PROG_VCC
-Text HLabel 4650 2400 0    50   Output ~ 0
+Text HLabel 3900 2400 0    50   Output ~ 0
 PROG_VCC
-Wire Wire Line
-	4650 2400 4800 2400
 Connection ~ 4800 2400
 $Comp
 L power:GND #PWR0126
@@ -221,4 +224,22 @@ Text HLabel 4700 3750 0    50   Input ~ 0
 USB_D-
 Text HLabel 4700 3650 0    50   Input ~ 0
 USB_PWR
+Wire Wire Line
+	4550 2400 4800 2400
+$Comp
+L Device:D D5
+U 1 1 616219F1
+P 4400 2400
+F 0 "D5" H 4400 2617 50  0000 C CNN
+F 1 "1SS355" H 4400 2526 50  0000 C CNN
+F 2 "" H 4400 2400 50  0001 C CNN
+F 3 "~" H 4400 2400 50  0001 C CNN
+F 4 "DIODE_BAS316" H 4400 2400 50  0001 C CNN "StockRef"
+F 5 "1525435" H 4400 2400 50  0001 C CNN "ordercode"
+F 6 "farnell" H 4400 2400 50  0001 C CNN "supplier"
+	1    4400 2400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3900 2400 4250 2400
 $EndSCHEMATC
diff --git a/CAD/Production/Avery_L4730REV_parts.docx b/CAD/Production/Avery_L4730REV_parts.docx
new file mode 100644
index 0000000..1038cca
Binary files /dev/null and b/CAD/Production/Avery_L4730REV_parts.docx differ
diff --git a/CAD/imported_sch/MAX98357A.png b/CAD/imported_sch/MAX98357A.png
new file mode 100644
index 0000000..8a80f32
Binary files /dev/null and b/CAD/imported_sch/MAX98357A.png differ
diff --git a/CAD/imported_sch/T13_V1.3.pdf b/CAD/imported_sch/T13_V1.3.pdf
new file mode 100644
index 0000000..79a6e1b
Binary files /dev/null and b/CAD/imported_sch/T13_V1.3.pdf differ
diff --git a/FW/leo_muziekdoos_esp32/lib/JCButton b/FW/leo_muziekdoos_esp32/lib/JCButton
new file mode 160000
index 0000000..f379405
--- /dev/null
+++ b/FW/leo_muziekdoos_esp32/lib/JCButton
@@ -0,0 +1 @@
+Subproject commit f379405f8ac425d2f0fe6248cbdad5e5461ae467
diff --git a/FW/leo_muziekdoos_esp32/src/audio.cpp b/FW/leo_muziekdoos_esp32/src/audio.cpp
index ed38fec..bf7a80c 100644
--- a/FW/leo_muziekdoos_esp32/src/audio.cpp
+++ b/FW/leo_muziekdoos_esp32/src/audio.cpp
@@ -64,7 +64,7 @@ void initAudio()
 {
   Serial.println("init Audio");
   audioLogger = &Serial;
-
+  delay(500);
   out = new AudioOutputI2S();
   out->SetPinout(I2S_BCLK, I2S_WCLK, I2S_DATA); //bclk, wclk, data
   out->SetGain(AUDIOGAIN);
@@ -72,7 +72,7 @@ void initAudio()
   mp3 = new AudioGeneratorMP3();
   mp3->RegisterStatusCB(StatusCallback, (void *)"mp3");
   Serial.println("init Audio Done");
-  //playSong(i);
+  playSong(i);
 }
 
 void handleAudio()
@@ -81,7 +81,7 @@ void handleAudio()
   {
     if (!mp3->loop())
     {
-      //mp3->stop();
+      mp3->stop();
       if(n++ >= AUDIOREPEATS)
       {
         i++;
diff --git a/FW/leo_muziekdoos_esp32/src/audio.h b/FW/leo_muziekdoos_esp32/src/audio.h
index b48aa9f..40e4db9 100644
--- a/FW/leo_muziekdoos_esp32/src/audio.h
+++ b/FW/leo_muziekdoos_esp32/src/audio.h
@@ -7,7 +7,7 @@
 #include "AudioFileSourceID3.h"
 #include "AudioOutputI2S.h"
 
-#define AUDIOGAIN     1
+#define AUDIOGAIN     0.7
 #define AUDIONSONGS   3
 #define AUDIOREPEATS  3
 
diff --git a/FW/leo_muziekdoos_esp32/src/board.h b/FW/leo_muziekdoos_esp32/src/board.h
index a3c2394..8d26f93 100644
--- a/FW/leo_muziekdoos_esp32/src/board.h
+++ b/FW/leo_muziekdoos_esp32/src/board.h
@@ -4,10 +4,17 @@
 #define I2S_BCLK    21
 #define I2S_WCLK    13
 #define I2S_DATA    14
-#define DAC_SDMODE  
+#define DAC_SDMODE  27
 
 #define NFC_SS      25
 #define NFC_SCK     18
 #define NFC_MOSI    23
 #define NFC_MISO    19
-#define NFC_RST     22  //not connectedx
\ No newline at end of file
+#define NFC_RST     22  //not connectedx
+
+#define PWR_HOLD     4
+#define PWR_BTN      9
+#define MEAS_EN     10
+#define MEAS_ADC    35  //ADC1_CH7
+
+#define HALL_INPUT  36  //ADC1_CH0
\ No newline at end of file
diff --git a/FW/leo_muziekdoos_esp32/src/config.cpp b/FW/leo_muziekdoos_esp32/src/config.cpp
index 4a39cf0..aaf5b8b 100644
--- a/FW/leo_muziekdoos_esp32/src/config.cpp
+++ b/FW/leo_muziekdoos_esp32/src/config.cpp
@@ -20,12 +20,8 @@ void loadConfig(const char *fname)
   StaticJsonDocument<512> doc;
   DeserializationError error = deserializeJson(doc, file);
   if (error)
-    Serial.println(F("Failed to read file, using default configuration"));
-  JsonArray array = doc.as<JsonArray>();
-  for(JsonVariant v : array) {
-    Serial.print("json entry: ");
-    Serial.println(v.as<String>());
-  }
+    Serial.println(F("Failed to read file"));
+  
   serializeJsonPretty(doc, Serial);
   Serial.println("config: load done");
 
diff --git a/FW/leo_muziekdoos_esp32/src/game.cpp b/FW/leo_muziekdoos_esp32/src/game.cpp
index e66d292..36ebbc2 100644
--- a/FW/leo_muziekdoos_esp32/src/game.cpp
+++ b/FW/leo_muziekdoos_esp32/src/game.cpp
@@ -1,12 +1,20 @@
 #include "game.h"
 
+
+uint64_t last_hall_read;
+
 void initGame(void)
 {
-
+  pinMode(HALL_INPUT, ANALOG);
 }
 
 
 void handleGame(void)
 {
-  
+  uint32_t timeNow = millis();
+  if(timeNow - last_hall_read > HALLINTERVAL)
+  {
+      Serial.println(analogRead(HALL_INPUT));
+      last_hall_read = timeNow;
+  }
 }
\ No newline at end of file
diff --git a/FW/leo_muziekdoos_esp32/src/game.h b/FW/leo_muziekdoos_esp32/src/game.h
index 56917e3..919dee9 100644
--- a/FW/leo_muziekdoos_esp32/src/game.h
+++ b/FW/leo_muziekdoos_esp32/src/game.h
@@ -1,4 +1,9 @@
 #pragma once
 
+#include "Arduino.h"
+#include "board.h"
+
+#define HALLINTERVAL 500
+
 void initGame(void);
 void handleGame(void);
\ No newline at end of file
diff --git a/FW/leo_muziekdoos_esp32/src/main.cpp b/FW/leo_muziekdoos_esp32/src/main.cpp
index 7c1f692..269b227 100644
--- a/FW/leo_muziekdoos_esp32/src/main.cpp
+++ b/FW/leo_muziekdoos_esp32/src/main.cpp
@@ -1,6 +1,6 @@
 #include <Arduino.h>
 
-
+#include "power.h"
 #include "storage.h"
 #include "audio.h"
 #include "rfid.h"
@@ -10,9 +10,10 @@
 
 void setup()
 {
+  initPower();
   Serial.begin(115200);
   delay(2000);
-
+  
   initStorage();
   initConfig();
   initAudio();
@@ -25,6 +26,7 @@ void setup()
 void loop()
 {
   handleAudio();
-  handleRfid();
+  //handleRfid();
   handleGame();
+  handlePower();
 }
diff --git a/FW/leo_muziekdoos_esp32/src/power.cpp b/FW/leo_muziekdoos_esp32/src/power.cpp
new file mode 100644
index 0000000..3e89074
--- /dev/null
+++ b/FW/leo_muziekdoos_esp32/src/power.cpp
@@ -0,0 +1,41 @@
+#include "power.h"
+
+
+bool powerbutton_released = true;
+
+void initPowerOn(void)
+{
+
+  pinMode(PWR_HOLD, OUTPUT);
+  pinMode(PWR_BTN, INPUT);
+  digitalWrite(PWR_HOLD, HIGH);
+  powerbutton_released = false;
+
+  //dac_sdMode
+  pinMode(DAC_SDMODE, OUTPUT);
+  digitalWrite(DAC_SDMODE, HIGH);
+  //powerstate = poweringOn;
+  //buttonPower.begin();
+
+}
+
+void initPower(void)
+{
+  Serial.println("initPower");
+  initPowerOn();
+  Serial.println("initPower: done");
+
+}
+
+void handlePower(void)
+{
+  if(digitalRead(PWR_BTN) && powerbutton_released)
+  {
+      while(digitalRead(PWR_BTN)) {}
+      digitalWrite(PWR_HOLD, LOW);
+  }
+  else{
+    powerbutton_released = true;
+  }
+}
+
diff --git a/FW/leo_muziekdoos_esp32/src/power.h b/FW/leo_muziekdoos_esp32/src/power.h
new file mode 100644
index 0000000..288e4b4
--- /dev/null
+++ b/FW/leo_muziekdoos_esp32/src/power.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "board.h"
+#include "Arduino.h"
+
+void initPower(void);
+void handlePower(void);
\ No newline at end of file