Added untested CRUD to every controller
fixed conflicts