Updated Readme and TODO