add and remove work (add has issues)