Merge pull request #9 from mdrewt/greg

Greg
Merge pull request #10 from mdrewt/greg

controller whoops
controller slight change