more work on the table refactoring