adding some TODOs