Yes. I think it would be a really nice feature to be able to select either a full OR empty tank from the payload manager built into the XR, and if I select an empty tank, say, to save on weight, then, when I arrive at one of my stopover points, say, the moon, then I can fill those empty tanks...