That definitely works for us! I brought it up with my co-mods and we pretty much got the OK so here's my official reply saying that we'll be going forward with it in the next investigation/trial.

We're leaning on having it in the trial primarily, but I'm OK with dealing with one or the other or both, if anybody has a preference.