More work on energy storage for players