Added a lot of tasks to the TODO