CLI

Better command line interface