Slow progress on getting rows to be correct.