More stuff done on generalising the workers