semi-working add and remove. have to go to work.