Adding weather controller.
Resolving merge conflict.