Yeah, I'm not gonna lie, this probably should have occurred to me when it took ME a minute to remember what I was doing here a week or so after writing similar code in badgekit.