Add and remove working!