Massive overhaul of energy system