Added controller, unit tests