Working on the adding and removing.