Redesigning waterfall steps structure. Lunch break commit