Updated README and add TODO