More TODOs in code