@wip Update TODOs in the README