Added Demo, some refactoring

Added the Game Demo!
Works!

Some other little changes too.
@walsh06 @SheepishMonster