Thinking a bit more maybe this could be as simple as being able to call mantle without the flight component.