WIP on rewriting the table generator.