added some TODOs after review