But... we might do the crazy caller logging stuff as a separate PR if it's not easy, because this PR is somewhat of a blocker for what @KevinCorcoran is currently working on.