Making some good progress on the table info refactor