Rewrote major chunk of add/remove op.  Need to fix prob calc.