ok, so what is the TODO? Are we saying there's something that needs fixing? If not, can we remove the "TODO"? If so, can the comment be clearer on what needs to be fixed?