Geometry code finally coming together