More TODO Changes See README.md