Is this TODO still valid? Can it be addressed?