Rework villager assigning