Redesign

Not quite ready, but merging it anyways.