Not yet even close to ready for review. Expected to address issues 1038, 1044, 1097, 1098, 1099, 1100.