Did some logging in this commit, more will be rolled out soon.