Design all the things

Implement new design.