Upgrading Our Energy System