More work on #3

Add and remove now work (ish - something iffy going on with remove in
certain cases...)