Initial commit for Harry 2
Merge https://github.com/roberton/Harry