More progress to implementing logging