Started RayHandler re-factoring