A mini refactor before tackling CE-3278
Adds some application logs to make debugging these issues easier.