Started refactor of workers to separate concerns