Re-add .add_task(class), make task_map into run optional