Redesign

See if you can merge it now