Almost done with add/remove operator.