Updated readme and added TODOs