More progress on the logging.