Remove the TODO and placed it in the README file