First commit of 2 controllers