Checkpoint to see if build is passing

Refactoring controller. This is just a Travis CI checkpoint to see if build is passing.