New version. Updated readme with new TODOs