refactored to use broadway as a basis for the whole cli app
Merge remote-tracking branch 'origin/master'