Do we need to do this TODO? I'm not clear what it is for.