Major refactor for marking future deletions