Fixing remove/add to lists.  Lists still leaky