Add more tasks to TODO