Finished Controller class