added some basic functionality
added basic add/remove functionality