Part 1 Done, Part 2 Working on Delete Flag