Have these TODOs been addressed?