Redesign

Merging this in. Hopefully.