Started to move functions from the main header file into the cpp file, removed dead code, now logs parameters correctly