Merge pull request #2 from bchiatt/models

Models
updated controller
Merge branch 'master' into models