Started adding model structure for parsing geometries