I put Richard's code back in nd have a flag to switch between the two.
Flag lives in: RayNamespace::use_ray_code
This is to facilitate comparing results