I'm not a fan of leaving TODOs in the code. Either implement it before merging or remove the TODOs.