Yes -- when talking to Karl, there was a question as to whether to:
(a)  Wait to commit this until it's complete (i.e., main_table not hardwired)
(b)  Commit now, since it's all we need, and enhance later
(c)  Enhance now.
We went with (b).  Perhaps you disagree?