Added most of the add/remove/edit methods