REPORTS-153

This group of commits really only contains a few updates to the table building process.