Minor changes to some of the controllers. Must implement a container