Update the TODO and README