Smart Integration of Solar and Storage