Finalized the TODO short list