moved raw values in WeatherCtrl into an object