WIP. Add variables to faa data import.