Topic/otm1 audit imports

I will rebase this before merging. It's much easier to review with smaller commits.