even more work on worker code