Found a more efficient way to deal with the surface class by representing is as a projection of a four space object into three space on the w=1 hyperplane (where w is the fourth dimension). This should make transformations to the r-s coordinate system more straightforward.