Did a bit more work on the logging class.