Have a look at my add/delete methods.
commit attempt number 2