Added all the controller stuff will double check everything after colloquium