got everything working again, with the new subcommand parsing apparatus