Added some TODOs according to our talk