moved worker into compenents, wip