Partially finished. Amend!

Change-Id: I1453d30317e83f119a04a88ca61d4222c9cc971b