More work on integrating metar file reading