Add a TODO that this should be in airbase