Reduce energy footprint

Working through the energy interface.