Shifting some functionality into steward_tasks