Adding in work from last night.

Change-Id: I71a670b3312b7b738233d8d2abf1dd8fb848246b