add/remove complete, concurrrency issues remain