More work on implementing the energy base