finished implementing new shapepoints