Saving WIP for adding subcommand