Cleaning up Reporting

Adding my progress for cleaning the reporting module.  This isn't done yet, I wanted to
get the repo to a consistent state as I've merged the VT module changes.