Has this TODO been done? Or is it something that can't be addressed right now?