Reports Refactor

Get version before this check in for when non agg reports had separate
code branch.