[WIP]  Audit and error split

Not ready yet