Updated TODO list with the important stuff