Solar and storage