Update readme and TODO
Commit didn't go through