first pass at a cli
fingers crossed
Merge branch 'cli'