The Shape of a New Energy Future