All of those, plus "smart grid" stuff to get better control over demand, plus Power to Gas (electricity to methane) and gas turbines (very inefficient, but existing infrastructure can store huge amounts of energy, and efficiency isn't the primary concern for the exceptional case).
