adding controllers
merge conflicts