Redesign all of the things
Merge branch 'redesign'