Refactoring, fixing tests
Merge branch 'develop' of github.com:scottfrazer/hermes into develop