Refactoring to remove some dupilcated code
Adding the other two reports to be created