Updated the readme and TODO