Solution compile. Now I can start fixing tests and test the new functionalities