Initial submission of a new, more consistent design.