Remember some more TODOs