README update and added TODOs