more wip stuff

Change-Id: I764d84e9248407929b8a74d61da0710c7cf86700