adding some TODOs for the next set of work