Let's go ahead and resolve this TODO.