Appears to be working, additional testing required. Generalizing to handle G&V and G&T correlation integrals remains