Table scanner save/restore

Shouldn't we be saving our progress inside the while loop?