Sigh, reworking Geometry2d