Turned GeometricShape into a builder pattern