Started major changes
Merge pull request #1 from SammyVimes/samBranch

Started major changes