Filled out some classes
Merge branch 'master' of https://github.com/KevinEmery/NewClue