Merging code updated to handle the new Weathr tree.