Added controller and tests.