So I believe this is what this TODO is referring to so you can remove that TODO.