Some more changes.
First version working with adding and removing.