Redesign

@pauldowman please review & merge when you can, thanks!