Design Changes

A whole pile of design changes.