Moore stuff
Merge branch 'master' of https://github.com/RyanRedhead/CE3_1