More integration work & switch to 0event logger.