Change design.

Big, big change.