Deleted most of the controllers from the previous iteratoion and added
support for the first 2 use cases