merging new raytracer files
no fluid