Add some more TODOs for lists