Refactored reports into separate classes so that easier to pass more parameters back and forth