Should this todo be addressed?