Start on the table creator. Quick refactor of some utility functions.
Starting
Merge remote-tracking branch 'origin/master'