Fix the CLI and add the ability to quit.