WIP: Working on todos

Change-Id: I156c544e518b24173b1aef6443c97216224ea79f