add/remove functions dont work...