First presentable draft

Change-Id: I6e6b6c21038d8d6b214eac1772e9f446e40b39d3