Update README and added TODO