Changed mind about subcommands