First pass on design revamp