Progress on building out the CLI