More TODOs for self