Add a few tasks to TODO