Never mind the previously posted TODO. It was not applicable. Double loops are going to be a pain