Making some progress porting over audit logging to plugin.  Uses new annotations to audit