Plan for unified CLI with subcommands?