Solar and battery storage