This todo doesnt mean anything to me. Is it still valid and is it ok to be deferred until later?