wip _add and _remove are gone, they really meant to add to matching set and remove from matching set