Put the chooser stuff in with command.go too.