Solar, Battery Storage to Lead New US Generating Capacity