added solar and refactored weather