Updated Remove/Add functionality

#26