Refactored weather spec
First draft of airport spec