yeah but the movie takes place post-civil-war. so the budapest scenes are most likely flashbacks.
I think I would rather see a true origin story. leading into a trilogy or something.

they seem to have pigeonholed themselves into a finite timeframe locked between Civil War and Infinity War.
there's not a lot of wriggle-room, to expand the story beyond this single film. this might be a one-off.