As in a different commit/different ticket?  I think they are all related as the decoupling from passthrough is needed so that I can remove the audits from passthrough and still audit in standard.  Otherwise the changes in passthrough will break existing functionality.

As in, before this ticket, standard is auditing properly.  If possible, I don't want one commit to break that and another to fix it.