Added ShapeBuilderV2

V2 allows the user to create diamonds in addition to the original shapes