first commit
Merge https://github.com/davidbirt/PopsAndHops