Continued work.

Change-Id: I1d658db3d62c21bc8676cdab40a0f932dfc00ac4