bit more work on energy/workers stuff