There's more to come WRT the audits, but anton and I agreed to merge something faster and work on that stuff after