Had to redo the renaming/DRYing of the application view, as it seemed to
not transfer over from the branch.