Add more robust subcommands plus checkout and open