trying to get controller to work sans rest call
Merge remote-tracking branch 'origin/master'