Add and remove working!!!!