More progress towards new task handling system. Woo!