Redesign Waterfall steps

Temp Commit