Readme / todo updates
WIP not sure