More work on weather demo.