Flesh out the new design a bit more