More design work.

Change-Id: I813c184152195983085a538f9337c0f457fc11d9