Updating controller
Merge pull request #1 from chredd/topic/new-model

Updating controller