-added onAdd/onRemove to test -added onAdd/onRemove callbacks for system -generating onAdd/onRemove listeners