Merge pull request #35 from thewillhuang/simon4

pushing some scope stuff
adding more controller stuff