Controller

More functionality added.