Continued work on airport model