Stage 2, decide what is staying and what need to be redone (In progress)

Signed-off-by: Captain Shadows <captain_shadows@aol.com>