Updated GeometricalShapes and finished Rect + Square