Another stab at the Task module