Updating README.md and adding TODO

ReviewedBy: