removed all trace of Geometry, replaced with Medium / cv, cut and paste all code from Geometry constructor, etc to cv. Compiles, but doesn't run.