Refactoring, still a work in progress, but classes seperated into seperate files, view stubbed out and bound to html