pull up more consumer and producer code. consolidate code in the audit classes