tidying up and adding controllers