Added TODO markings on EnergyNetwork