Update README and add TODO