GeometricPrimitive.cpp and .h done