Build out controller actions
merge changes
Finished