Please add build swapping

[Saer-1537]

Oh, I know lol.

Still doesn’t change that they need to add it rather than dangle it as a “will they won’t they”