first legit commit
Merge https://github.com/ddelmar/hobbes