Break renamed task out into its own queue

Required a rather involved re-write of how all the queues worked & updating all the tests.

Everything looks good now though! Few small tests still pending.