Indicate to the subcommand resolver when the user is at the next subcommand
Completions should now be working
Fix up tests