Working towards a decent testing strategy
Working on restructuring the code into managable chunks