add remove functionality and test