split apart the delete vs add cases
resolve nocommits