Move to new cli library for subcommands
Finish adding subcommands