WIP Edit pass

[ ] replace reference to gist with pull request