Updated TODO and Readme