added some more TODOs