More work on deletion functionality (not ready)