Controller additions
Controller changes
Merge pull request #6 from SkylerBenge/master

Controller additions