Added grouped reports
Removed first pass at reports.