First pass
Merge pull request #1 from uber/first_pass

First pass