Updated for tests and beginning of controller.