Update TODO and README

Non-functional change.