Split into two files and re-introduce the table maker