Add some (not all) TODOs