Reporting2

I was planning to clean up/rebuild the reporting pipeline but I'll do that in a separate PR. I won't have time to do this today