Moved weather specific methods over into a module