Redesign Workflow

Stage 2 Design: Steps 5, 6, 7, 8