trip stubs
Merge https://github.com/eugenebut/hack2013