Added Controller class. Test is broken.