Simplified the WeatherViewController some, still needs work