move add/remove to controller