After the major refactoring operation everything should compile again now. Not sure if it works though. Should start testing now