Basic Functionality, waiting on command line stuff
Merge branch 'master' of https://github.com/olanmatt/hermes