Add some more TODOs