Redesign and commit functional prototype