Add CommandStatus to subcommands, and include Token classes for potential new command system