Started with converting the project into a more OO style