major changes to routing/task handling