squash dpb's history into this single commit

...on which we can leave line comments in github