added a controller
merge conflicts