Changed the production scripts to test work with the new data sets and to store to new tables.
merged conflicts