Redesign

(unfinished)