Add weather information.  Move things around a bit for easier testing.