Work on the CLI tool, user features