First Redesign

Will add comments later.