added basic add/remove function