Updated TODO to reflect current items for vNext