Updated weather service (still in progress)