Updated for testing
Merge remote-tracking branch 'upstream/master'
Merge pull request #279 from jerv13/master

Refactor controller logic to service.