Ready to start worker redesign and refactoring