More work on refactoring to work with new energy system.