added some data structure TODOs