added getWeather, added generateColour locks