wip - finished delete (need to test)