Audit mode rebase

OK I think this is the one we actually want @tyler-ball @sersut