Looks to be working - doing a commit before cleaning it all up
Tidied up and removed unused view classes and various other odds and sods
Editing some comments to reflect new view layout for working code
Merge remote-tracking branch 'origin/master'