Shapegets

Also fixing warnings.