Finished editing ReportService to get it ready for controller layer, fingers crossed