more work on tasks (add/remove)