merged

no weather features yet, but all the code is here and compiles