Working - going to create a few new classes instead of the main controller doing a lot of the work