Initial commit for Universal Electricity upgrade. Contains much refactoring to energy system to achieve this.