add and remove now seems to both work