Table independent add and remove functions

The table is now a parameter, All tests hold functionality