@diosmosis is this what you meant regarding Custom Reports?
Tested it locally and looked good
@tsteur am adding a test currently
@diosmosis just did add one now... committing