Merged with actual master

Compiles without errors
Calibration still is under construction