Use correct class for Logger
Inject configuration
more debug logging
reorder things around