More refactoring into Table. Some methods still need to be turned static.