continue abstracting out power supply
further abstract power supply
rename EnergyFairy to EnergyTrace