Table builder passes, much refactoring to be done