Some progress
Merge branch 'master' of https://github.com/eknowlton/ethic

Initial merge...