First try at a patch around _some_ of the concurrency issues in EnergyNetwork.java.