Began refactoring to support the new report style