Some more TODOs