[WIP] Airspace Decorator Integration

Hopefully this solves #961. >_>