work in progress

Review URL: https://codereview.chromium.org/769423002
7 files changed