Needed to do some refactoring before moving forward.
I've cut down on the repetition.
Delete is a skeleton for now.