Updated TODO and added DONE