Let's address this TODO.