@christianv probably, but i'd push this off on the badges refinement work next sprint since there'd be a few pieces to rewire (and also verify the edge cases). Not having a nice batch of test sample data makes me queasy about hap-hazardly editing this.