Initial design.

Just the changes for the initial design.