EOD commit. Many more changes to make table reading more robust. Still not there.