More design work.

Change-Id: I33b3bca55db4effe7d9f9cd2d12f70724b7edee6