S99999: Mo' stuff

Change-Id: I4b09777480ac24e987705eb2e12b402f3d8f66aa