add some more TODOs