Revert "Revert "A bunch of logging to help...""

This reverts commit 7db3f34e2fa62d819f3aa66a22e6c91d31b25a13.