Redesign: steps 0-2