Updated TODO and DONE