Updated readme and added some TODOs