First draft of new design.