Starting to test the CLI, and...

generally flesh out some functionality