FIX: Replacing shapeList.add with addShape