Move existing functionality to a controller.  Preparation for additional optional directives.