Reorder and added tasks to TODO