Work on add and remove functionality