TODO and requirements update