Implemented a new model for organizing and calculating reports.  New model far more flexible.