diff --git a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02.ifc b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02.ifc
deleted file mode 100644
index a451e80..0000000
--- a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02.ifc
+++ /dev/null
@@ -1,120 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('Annotation_Blender_02.ifc','2022-06-15T14:37:42-05:00',(),(),'IfcOpenShell v0.7.0-cb8cfd79','BlenderBIM 0.0.220609','Nobody');
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROJECT('0zkA7RzQb6g9onLu2nq48E',$,'My Project',$,$,$,$,(#23,#29),#18);
-#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
-#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
-#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);
-#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);
-#6=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);
-#7=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
-#8=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#7);
-#9=IFCCONVERSIONBASEDUNIT(#6,.AREAUNIT.,'square foot',#8);
-#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);
-#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
-#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);
-#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);
-#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
-#15=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
-#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);
-#17=IFCCONVERSIONBASEDUNIT(#14,.PLANEANGLEUNIT.,'degree',#16);
-#18=IFCUNITASSIGNMENT((#5,#13,#17,#9));
-#19=IFCCARTESIANPOINT((0.,0.,0.));
-#20=IFCDIRECTION((0.,0.,1.));
-#21=IFCDIRECTION((1.,0.,0.));
-#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);
-#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);
-#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);
-#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);
-#26=IFCCARTESIANPOINT((0.,0.,0.));
-#27=IFCDIRECTION((1.,0.,0.));
-#28=IFCAXIS2PLACEMENT2D(#26,#27);
-#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);
-#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);
-#31=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.SECTION_VIEW.,$);
-#32=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.ELEVATION_VIEW.,$);
-#33=IFCSITE('1tKEYqbezFRuwcMJV6GGCJ',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);
-#39=IFCBUILDING('0rY$S8t0b5J95Uh$Mmt_B6',$,'My Building',$,$,#62,$,$,$,$,$,$);
-#45=IFCBUILDINGSTOREY('0d7sn_4JX7FBfTQt7IXVVi',$,'My Storey',$,$,#68,$,$,$,$);
-#51=IFCRELAGGREGATES('2cmn1NvzHEbe6vwtvfPtxk',$,$,$,#1,(#33));
-#52=IFCCARTESIANPOINT((0.,0.,0.));
-#53=IFCDIRECTION((0.,0.,1.));
-#54=IFCDIRECTION((1.,0.,0.));
-#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);
-#56=IFCLOCALPLACEMENT($,#55);
-#57=IFCRELAGGREGATES('0X7R33hNXAGeuWFkRCMQeI',$,$,$,#33,(#39));
-#58=IFCCARTESIANPOINT((0.,0.,0.));
-#59=IFCDIRECTION((0.,0.,1.));
-#60=IFCDIRECTION((1.,0.,0.));
-#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);
-#62=IFCLOCALPLACEMENT(#56,#61);
-#63=IFCRELAGGREGATES('1t5eomlwz7UAPdWRAt78$l',$,$,$,#39,(#45));
-#64=IFCCARTESIANPOINT((0.,0.,0.));
-#65=IFCDIRECTION((0.,0.,1.));
-#66=IFCDIRECTION((1.,0.,0.));
-#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);
-#68=IFCLOCALPLACEMENT(#62,#67);
-#69=IFCBUILDINGELEMENTPROXY('3JOryNTxP6FP8$b1mHXz3d',$,'Cube',$,$,#178,#87,$,.COMPLEX.);
-#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#186,#189));
-#88=IFCRELCONTAINEDINSPATIALSTRUCTURE('2nv7GLm_DALxIvXyNMoYmM',$,$,$,(#69),#45);
-#110=IFCPROPERTYSET('3sWkzYMYDFMO6BZngmhM7p',$,'EPset_Drawing',$,(#112,#113));
-#111=IFCRELDEFINESBYPROPERTIES('2g9_MoAcb6UxG9HzqZ_7X8',$,$,$,(#69),#110);
-#112=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/96'),$);
-#113=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/8"=1''-0"'),$);
-#114=IFCANNOTATION('1NdoroR$b6IBpfZ_wh2h22',$,'PLAN_VIEW',$,'DRAWING',#141,#125);
-#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));
-#121=IFCAXIS2PLACEMENT3D(#120,$,$);
-#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);
-#123=IFCCSGSOLID(#122);
-#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));
-#125=IFCPRODUCTDEFINITIONSHAPE($,$,(#124));
-#126=IFCGROUP('0XqIe1mh5DSwSDs2o02LEK',$,'PLAN_VIEW',$,'DRAWING');
-#127=IFCRELASSIGNSTOGROUP('31T3DRnQT7FxsXtc7De43r',$,$,$,(#142,#114),$,#126);
-#128=IFCPROPERTYSET('3veorc5FL1zukXnL$a9jwr',$,'EPset_Drawing',$,(#130,#131,#132,#133,#134,#135,#136));
-#129=IFCRELDEFINESBYPROPERTIES('1jEm9HNFH9buvIv8twkPTf',$,$,$,(#114),#128);
-#130=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);
-#131=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/4'),$);
-#132=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('3"=1''-0"'),$);
-#133=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);
-#134=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);
-#135=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);
-#136=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);
-#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));
-#138=IFCDIRECTION((0.,0.,1.));
-#139=IFCDIRECTION((1.,0.,0.));
-#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);
-#141=IFCLOCALPLACEMENT($,#140);
-#142=IFCANNOTATION('0arcY2Q$jC_hww5nlZLL$9',$,'DIMENSION',$,'DIMENSION',#194,#153);
-#153=IFCPRODUCTDEFINITIONSHAPE($,$,(#199));
-#174=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));
-#175=IFCDIRECTION((0.,0.,1.));
-#176=IFCDIRECTION((1.,0.,0.));
-#177=IFCAXIS2PLACEMENT3D(#174,#175,#176);
-#178=IFCLOCALPLACEMENT(#68,#177);
-#179=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);
-#180=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));
-#181=IFCDIRECTION((0.,0.,-1.));
-#182=IFCDIRECTION((1.,0.,0.));
-#183=IFCAXIS2PLACEMENT3D(#180,#181,#182);
-#184=IFCDIRECTION((0.,0.,-1.));
-#185=IFCEXTRUDEDAREASOLID(#179,#183,#184,2.00000000376181);
-#186=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#185));
-#187=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
-#188=IFCBOUNDINGBOX(#187,2.00000002471794,2.00000002471794,2.00000002471794);
-#189=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#188));
-#190=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));
-#191=IFCDIRECTION((0.,0.,1.));
-#192=IFCDIRECTION((1.,0.,0.));
-#193=IFCAXIS2PLACEMENT3D(#190,#191,#192);
-#194=IFCLOCALPLACEMENT($,#193);
-#195=IFCCARTESIANPOINT((9.77766482535935E-08,4.93038120064184E-32));
-#196=IFCCARTESIANPOINT((2.00000022027123,0.));
-#197=IFCPOLYLINE((#195,#196));
-#198=IFCGEOMETRICCURVESET((#197));
-#199=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#198));
-ENDSEC;
-END-ISO-10303-21;
diff --git a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_01.blend b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_01.blend
similarity index 60%
rename from Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_01.blend
rename to Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_01.blend
index e71c72a..18a9692 100644
Binary files a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_01.blend and b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_01.blend differ
diff --git a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02.ifc b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02.ifc
new file mode 100644
index 0000000..c297a8c
--- /dev/null
+++ b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02.ifc
@@ -0,0 +1,122 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
+FILE_NAME('Annotation_Dimension_02.ifc','2022-07-02T12:33:34-05:00',(),(),'IfcOpenShell v0.7.0-cb8cfd79','BlenderBIM 0.0.220629','Nobody');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROJECT('1a3x6_z1HCbPUIKiNg_3Jz',$,'My Project',$,$,$,$,(#23,#29),#18);
+#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);
+#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);
+#6=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);
+#7=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#8=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#7);
+#9=IFCCONVERSIONBASEDUNIT(#6,.AREAUNIT.,'square foot',#8);
+#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);
+#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);
+#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);
+#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#15=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);
+#17=IFCCONVERSIONBASEDUNIT(#14,.PLANEANGLEUNIT.,'degree',#16);
+#18=IFCUNITASSIGNMENT((#17,#9,#5,#13));
+#19=IFCCARTESIANPOINT((0.,0.,0.));
+#20=IFCDIRECTION((0.,0.,1.));
+#21=IFCDIRECTION((1.,0.,0.));
+#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);
+#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);
+#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);
+#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);
+#26=IFCCARTESIANPOINT((0.,0.,0.));
+#27=IFCDIRECTION((1.,0.,0.));
+#28=IFCAXIS2PLACEMENT2D(#26,#27);
+#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);
+#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);
+#31=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.SECTION_VIEW.,$);
+#32=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.ELEVATION_VIEW.,$);
+#33=IFCSITE('1rS27wKub17hq2FO4r6m3A',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);
+#39=IFCBUILDING('06Oy0ZVCj7vvzflFn9eUso',$,'My Building',$,$,#62,$,$,$,$,$,$);
+#45=IFCBUILDINGSTOREY('2BIvGUhpD81fY45KBZ5fTl',$,'My Storey',$,$,#68,$,$,$,$);
+#51=IFCRELAGGREGATES('24rszhgaPE6eAMFQpD2xCg',$,$,$,#1,(#33));
+#52=IFCCARTESIANPOINT((0.,0.,0.));
+#53=IFCDIRECTION((0.,0.,1.));
+#54=IFCDIRECTION((1.,0.,0.));
+#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);
+#56=IFCLOCALPLACEMENT($,#55);
+#57=IFCRELAGGREGATES('0uvZoeDW56nhFROp1R5paA',$,$,$,#33,(#39));
+#58=IFCCARTESIANPOINT((0.,0.,0.));
+#59=IFCDIRECTION((0.,0.,1.));
+#60=IFCDIRECTION((1.,0.,0.));
+#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);
+#62=IFCLOCALPLACEMENT(#56,#61);
+#63=IFCRELAGGREGATES('1Ym$J87WL5bPa0HYjigy47',$,$,$,#39,(#45));
+#64=IFCCARTESIANPOINT((0.,0.,0.));
+#65=IFCDIRECTION((0.,0.,1.));
+#66=IFCDIRECTION((1.,0.,0.));
+#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);
+#68=IFCLOCALPLACEMENT(#62,#67);
+#69=IFCANNOTATION('2IWhwimdb4f93GMIBXzzf1',$,'PLAN_VIEW',$,'DRAWING',#266,#80);
+#80=IFCPRODUCTDEFINITIONSHAPE($,$,(#271));
+#81=IFCGROUP('1yY$cHpI1F1hipFu87exyF',$,'PLAN_VIEW',$,'DRAWING');
+#82=IFCRELASSIGNSTOGROUP('3oQXe9Def7Lv3VW5AHAT1K',$,$,$,(#69,#92),$,#81);
+#83=IFCPROPERTYSET('2Gtx5_WNH44ABDUdHSMw_b',$,'EPset_Drawing',$,(#85,#86,#87,#88,#89,#90,#91));
+#84=IFCRELDEFINESBYPROPERTIES('3GuStna3TBkOqdG5vVRWn4',$,$,$,(#69),#83);
+#85=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);
+#86=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/48'),$);
+#87=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/4"=1''-0"'),$);
+#88=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);
+#89=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);
+#90=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);
+#91=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);
+#92=IFCANNOTATION('00aB5XRjn4M8pFmXwr7kZh',$,'DIMENSION',$,'DIMENSION',#324,#103);
+#103=IFCPRODUCTDEFINITIONSHAPE($,$,(#329));
+#148=IFCRELCONTAINEDINSPATIALSTRUCTURE('1kG5Kk8DL1lfP161AJ5mfI',$,$,$,(#164),#45);
+#149=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));
+#150=IFCDIRECTION((0.,0.,1.));
+#151=IFCDIRECTION((1.,0.,0.));
+#152=IFCAXIS2PLACEMENT3D(#149,#150,#151);
+#153=IFCLOCALPLACEMENT(#68,#152);
+#164=IFCWALL('3jZVHFT1P3kRbQP_iWQLhM',$,'Cube',$,$,#286,#182,$,.ELEMENTEDWALL.);
+#182=IFCPRODUCTDEFINITIONSHAPE($,$,(#295,#298));
+#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));
+#263=IFCDIRECTION((0.,0.,1.));
+#264=IFCDIRECTION((1.,0.,0.));
+#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);
+#266=IFCLOCALPLACEMENT($,#265);
+#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));
+#268=IFCAXIS2PLACEMENT3D(#267,$,$);
+#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);
+#270=IFCCSGSOLID(#269);
+#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));
+#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));
+#283=IFCDIRECTION((0.,0.,1.));
+#284=IFCDIRECTION((1.,0.,0.));
+#285=IFCAXIS2PLACEMENT3D(#282,#283,#284);
+#286=IFCLOCALPLACEMENT(#68,#285);
+#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));
+#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));
+#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));
+#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));
+#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));
+#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));
+#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));
+#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);
+#295=IFCSHAPEREPRESENTATION(#24,'Body','Tessellation',(#294));
+#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
+#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);
+#298=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#297));
+#320=IFCCARTESIANPOINT((3.,4.,2.));
+#321=IFCDIRECTION((0.,0.,1.));
+#322=IFCDIRECTION((1.,0.,0.));
+#323=IFCAXIS2PLACEMENT3D(#320,#321,#322);
+#324=IFCLOCALPLACEMENT($,#323);
+#325=IFCCARTESIANPOINT((0.,-4.));
+#326=IFCCARTESIANPOINT((0.,0.));
+#327=IFCPOLYLINE((#325,#326));
+#328=IFCGEOMETRICCURVESET((#327));
+#329=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#328));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02_commented.ifc b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02_commented.ifc
similarity index 55%
rename from Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02_commented.ifc
rename to Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02_commented.ifc
index 17aedf7..0ca9963 100644
--- a/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Blender_02_commented.ifc
+++ b/Random_Tests/Annotation_Dimension/from_BlenderBIM/Annotation_Dimension_02_commented.ifc
@@ -1,11 +1,11 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('Annotation_Blender_02.ifc','2022-06-15T13:52:44-05:00',(),(),'IfcOpenShell v0.7.0-cb8cfd79','BlenderBIM 0.0.220609','Nobody');
+FILE_NAME('Annotation_Dimension_02.ifc','2022-07-02T12:33:34-05:00',(),(),'IfcOpenShell v0.7.0-cb8cfd79','BlenderBIM 0.0.220629','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROJECT('0zkA7RzQb6g9onLu2nq48E',$,'My Project',$,$,$,$,(#23,#29),#18);
+#1=IFCPROJECT('1a3x6_z1HCbPUIKiNg_3Jz',$,'My Project',$,$,$,$,(#23,#29),#18);
   /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
     /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
       /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
@@ -15,15 +15,7 @@ DATA;
     /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
       /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#27=IFCDIRECTION((1.,0.,0.));*/
-  /*#18=IFCUNITASSIGNMENT((#5,#13,#17,#9));*/
-    /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
-      /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
-      /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
-        /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
-    /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
-      /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
-      /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
-        /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
+  /*#18=IFCUNITASSIGNMENT((#17,#9,#5,#13));*/
     /*#17=IFCCONVERSIONBASEDUNIT(#14,.PLANEANGLEUNIT.,'degree',#16);*/
       /*#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);*/
       /*#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);*/
@@ -32,6 +24,14 @@ DATA;
       /*#6=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);*/
       /*#8=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#7);*/
         /*#7=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);*/
+    /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
+      /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
+      /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
+        /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
+    /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
+      /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
+      /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
+        /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
 #2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
 #3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
 #4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);
@@ -64,15 +64,7 @@ DATA;
   /*#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);*/
   /*#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);*/
     /*#15=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);*/
-#18=IFCUNITASSIGNMENT((#5,#13,#17,#9));
-  /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
-    /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
-    /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
-      /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
-  /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
-    /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
-    /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
-      /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
+#18=IFCUNITASSIGNMENT((#17,#9,#5,#13));
   /*#17=IFCCONVERSIONBASEDUNIT(#14,.PLANEANGLEUNIT.,'degree',#16);*/
     /*#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);*/
     /*#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);*/
@@ -81,6 +73,14 @@ DATA;
     /*#6=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);*/
     /*#8=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#7);*/
       /*#7=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);*/
+  /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
+    /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
+    /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
+      /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
+  /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
+    /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
+    /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
+      /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
 #19=IFCCARTESIANPOINT((0.,0.,0.));
 #20=IFCDIRECTION((0.,0.,1.));
 #21=IFCDIRECTION((1.,0.,0.));
@@ -129,13 +129,13 @@ DATA;
     /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
       /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#27=IFCDIRECTION((1.,0.,0.));*/
-#33=IFCSITE('1tKEYqbezFRuwcMJV6GGCJ',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);
+#33=IFCSITE('1rS27wKub17hq2FO4r6m3A',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);
   /*#56=IFCLOCALPLACEMENT($,#55);*/
     /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
       /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#53=IFCDIRECTION((0.,0.,1.));*/
       /*#54=IFCDIRECTION((1.,0.,0.));*/
-#39=IFCBUILDING('0rY$S8t0b5J95Uh$Mmt_B6',$,'My Building',$,$,#62,$,$,$,$,$,$);
+#39=IFCBUILDING('06Oy0ZVCj7vvzflFn9eUso',$,'My Building',$,$,#62,$,$,$,$,$,$);
   /*#62=IFCLOCALPLACEMENT(#56,#61);*/
     /*#56=IFCLOCALPLACEMENT($,#55);*/
       /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
@@ -146,7 +146,7 @@ DATA;
       /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#59=IFCDIRECTION((0.,0.,1.));*/
       /*#60=IFCDIRECTION((1.,0.,0.));*/
-#45=IFCBUILDINGSTOREY('0d7sn_4JX7FBfTQt7IXVVi',$,'My Storey',$,$,#68,$,$,$,$);
+#45=IFCBUILDINGSTOREY('2BIvGUhpD81fY45KBZ5fTl',$,'My Storey',$,$,#68,$,$,$,$);
   /*#68=IFCLOCALPLACEMENT(#62,#67);*/
     /*#62=IFCLOCALPLACEMENT(#56,#61);*/
       /*#56=IFCLOCALPLACEMENT($,#55);*/
@@ -162,8 +162,8 @@ DATA;
       /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#65=IFCDIRECTION((0.,0.,1.));*/
       /*#66=IFCDIRECTION((1.,0.,0.));*/
-#51=IFCRELAGGREGATES('2cmn1NvzHEbe6vwtvfPtxk',$,$,$,#1,(#33));
-  /*#1=IFCPROJECT('0zkA7RzQb6g9onLu2nq48E',$,'My Project',$,$,$,$,(#23,#29),#18);*/
+#51=IFCRELAGGREGATES('24rszhgaPE6eAMFQpD2xCg',$,$,$,#1,(#33));
+  /*#1=IFCPROJECT('1a3x6_z1HCbPUIKiNg_3Jz',$,'My Project',$,$,$,$,(#23,#29),#18);*/
     /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
       /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
         /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
@@ -173,15 +173,7 @@ DATA;
       /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
         /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
         /*#27=IFCDIRECTION((1.,0.,0.));*/
-    /*#18=IFCUNITASSIGNMENT((#5,#13,#17,#9));*/
-      /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
-        /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
-        /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
-          /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
-      /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
-        /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
-        /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
-          /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
+    /*#18=IFCUNITASSIGNMENT((#17,#9,#5,#13));*/
       /*#17=IFCCONVERSIONBASEDUNIT(#14,.PLANEANGLEUNIT.,'degree',#16);*/
         /*#14=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);*/
         /*#16=IFCMEASUREWITHUNIT(IFCREAL(0.0174532925199433),#15);*/
@@ -190,7 +182,15 @@ DATA;
         /*#6=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);*/
         /*#8=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#7);*/
           /*#7=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);*/
-  /*#33=IFCSITE('1tKEYqbezFRuwcMJV6GGCJ',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);*/
+      /*#5=IFCCONVERSIONBASEDUNIT(#2,.LENGTHUNIT.,'foot',#4);*/
+        /*#2=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);*/
+        /*#4=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#3);*/
+          /*#3=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);*/
+      /*#13=IFCCONVERSIONBASEDUNIT(#10,.VOLUMEUNIT.,'cubic foot',#12);*/
+        /*#10=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);*/
+        /*#12=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#11);*/
+          /*#11=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);*/
+  /*#33=IFCSITE('1rS27wKub17hq2FO4r6m3A',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);*/
     /*#56=IFCLOCALPLACEMENT($,#55);*/
       /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
         /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
@@ -208,14 +208,14 @@ DATA;
     /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
     /*#53=IFCDIRECTION((0.,0.,1.));*/
     /*#54=IFCDIRECTION((1.,0.,0.));*/
-#57=IFCRELAGGREGATES('0X7R33hNXAGeuWFkRCMQeI',$,$,$,#33,(#39));
-  /*#33=IFCSITE('1tKEYqbezFRuwcMJV6GGCJ',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);*/
+#57=IFCRELAGGREGATES('0uvZoeDW56nhFROp1R5paA',$,$,$,#33,(#39));
+  /*#33=IFCSITE('1rS27wKub17hq2FO4r6m3A',$,'My Site',$,$,#56,$,$,$,$,$,$,$,$);*/
     /*#56=IFCLOCALPLACEMENT($,#55);*/
       /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
         /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
         /*#53=IFCDIRECTION((0.,0.,1.));*/
         /*#54=IFCDIRECTION((1.,0.,0.));*/
-  /*#39=IFCBUILDING('0rY$S8t0b5J95Uh$Mmt_B6',$,'My Building',$,$,#62,$,$,$,$,$,$);*/
+  /*#39=IFCBUILDING('06Oy0ZVCj7vvzflFn9eUso',$,'My Building',$,$,#62,$,$,$,$,$,$);*/
     /*#62=IFCLOCALPLACEMENT(#56,#61);*/
       /*#56=IFCLOCALPLACEMENT($,#55);*/
         /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
@@ -243,8 +243,8 @@ DATA;
     /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
     /*#59=IFCDIRECTION((0.,0.,1.));*/
     /*#60=IFCDIRECTION((1.,0.,0.));*/
-#63=IFCRELAGGREGATES('1t5eomlwz7UAPdWRAt78$l',$,$,$,#39,(#45));
-  /*#39=IFCBUILDING('0rY$S8t0b5J95Uh$Mmt_B6',$,'My Building',$,$,#62,$,$,$,$,$,$);*/
+#63=IFCRELAGGREGATES('1Ym$J87WL5bPa0HYjigy47',$,$,$,#39,(#45));
+  /*#39=IFCBUILDING('06Oy0ZVCj7vvzflFn9eUso',$,'My Building',$,$,#62,$,$,$,$,$,$);*/
     /*#62=IFCLOCALPLACEMENT(#56,#61);*/
       /*#56=IFCLOCALPLACEMENT($,#55);*/
         /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
@@ -255,7 +255,7 @@ DATA;
         /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
         /*#59=IFCDIRECTION((0.,0.,1.));*/
         /*#60=IFCDIRECTION((1.,0.,0.));*/
-  /*#45=IFCBUILDINGSTOREY('0d7sn_4JX7FBfTQt7IXVVi',$,'My Storey',$,$,#68,$,$,$,$);*/
+  /*#45=IFCBUILDINGSTOREY('2BIvGUhpD81fY45KBZ5fTl',$,'My Storey',$,$,#68,$,$,$,$);*/
     /*#68=IFCLOCALPLACEMENT(#62,#67);*/
       /*#62=IFCLOCALPLACEMENT(#56,#61);*/
         /*#56=IFCLOCALPLACEMENT($,#55);*/
@@ -293,78 +293,147 @@ DATA;
     /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
     /*#65=IFCDIRECTION((0.,0.,1.));*/
     /*#66=IFCDIRECTION((1.,0.,0.));*/
-#69=IFCBUILDINGELEMENTPROXY('3JOryNTxP6FP8$b1mHXz3d',$,'Cube',$,$,#98,#87,$,.COMPLEX.);
-  /*#98=IFCLOCALPLACEMENT(#68,#97);*/
-    /*#68=IFCLOCALPLACEMENT(#62,#67);*/
-      /*#62=IFCLOCALPLACEMENT(#56,#61);*/
-        /*#56=IFCLOCALPLACEMENT($,#55);*/
-          /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
-            /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
-            /*#53=IFCDIRECTION((0.,0.,1.));*/
-            /*#54=IFCDIRECTION((1.,0.,0.));*/
-        /*#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);*/
-          /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
-          /*#59=IFCDIRECTION((0.,0.,1.));*/
-          /*#60=IFCDIRECTION((1.,0.,0.));*/
-      /*#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);*/
-        /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
-        /*#65=IFCDIRECTION((0.,0.,1.));*/
-        /*#66=IFCDIRECTION((1.,0.,0.));*/
-    /*#97=IFCAXIS2PLACEMENT3D(#94,#95,#96);*/
-      /*#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
-      /*#95=IFCDIRECTION((0.,0.,1.));*/
-      /*#96=IFCDIRECTION((1.,0.,0.));*/
-  /*#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#106,#109));*/
-    /*#106=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#105));*/
+#69=IFCANNOTATION('2IWhwimdb4f93GMIBXzzf1',$,'PLAN_VIEW',$,'DRAWING',#266,#80);
+  /*#266=IFCLOCALPLACEMENT($,#265);*/
+    /*#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);*/
+      /*#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));*/
+      /*#263=IFCDIRECTION((0.,0.,1.));*/
+      /*#264=IFCDIRECTION((1.,0.,0.));*/
+  /*#80=IFCPRODUCTDEFINITIONSHAPE($,$,(#271));*/
+    /*#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));*/
       /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
         /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
           /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
             /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
             /*#20=IFCDIRECTION((0.,0.,1.));*/
             /*#21=IFCDIRECTION((1.,0.,0.));*/
-      /*#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);*/
-        /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-        /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-          /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-          /*#101=IFCDIRECTION((0.,0.,-1.));*/
-          /*#102=IFCDIRECTION((1.,0.,0.));*/
-        /*#104=IFCDIRECTION((0.,0.,-1.));*/
-    /*#109=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#108));*/
-      /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-        /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-          /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-            /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-            /*#20=IFCDIRECTION((0.,0.,1.));*/
-            /*#21=IFCDIRECTION((1.,0.,0.));*/
-      /*#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);*/
-        /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#106,#109));
-  /*#106=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#105));*/
+      /*#270=IFCCSGSOLID(#269);*/
+        /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+          /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+            /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#80=IFCPRODUCTDEFINITIONSHAPE($,$,(#271));
+  /*#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));*/
     /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
       /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
         /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
           /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
           /*#20=IFCDIRECTION((0.,0.,1.));*/
           /*#21=IFCDIRECTION((1.,0.,0.));*/
-    /*#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);*/
-      /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-      /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-        /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-        /*#101=IFCDIRECTION((0.,0.,-1.));*/
-        /*#102=IFCDIRECTION((1.,0.,0.));*/
-      /*#104=IFCDIRECTION((0.,0.,-1.));*/
-  /*#109=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#108));*/
-    /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-      /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-        /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-          /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-          /*#20=IFCDIRECTION((0.,0.,1.));*/
-          /*#21=IFCDIRECTION((1.,0.,0.));*/
-    /*#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);*/
-      /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-#88=IFCRELCONTAINEDINSPATIALSTRUCTURE('2nv7GLm_DALxIvXyNMoYmM',$,$,$,(#69),#45);
-  /*#69=IFCBUILDINGELEMENTPROXY('3JOryNTxP6FP8$b1mHXz3d',$,'Cube',$,$,#98,#87,$,.COMPLEX.);*/
-    /*#98=IFCLOCALPLACEMENT(#68,#97);*/
+    /*#270=IFCCSGSOLID(#269);*/
+      /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+        /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+          /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#81=IFCGROUP('1yY$cHpI1F1hipFu87exyF',$,'PLAN_VIEW',$,'DRAWING');
+#82=IFCRELASSIGNSTOGROUP('3oQXe9Def7Lv3VW5AHAT1K',$,$,$,(#69,#92),$,#81);
+  /*#69=IFCANNOTATION('2IWhwimdb4f93GMIBXzzf1',$,'PLAN_VIEW',$,'DRAWING',#266,#80);*/
+    /*#266=IFCLOCALPLACEMENT($,#265);*/
+      /*#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);*/
+        /*#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));*/
+        /*#263=IFCDIRECTION((0.,0.,1.));*/
+        /*#264=IFCDIRECTION((1.,0.,0.));*/
+    /*#80=IFCPRODUCTDEFINITIONSHAPE($,$,(#271));*/
+      /*#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));*/
+        /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+              /*#20=IFCDIRECTION((0.,0.,1.));*/
+              /*#21=IFCDIRECTION((1.,0.,0.));*/
+        /*#270=IFCCSGSOLID(#269);*/
+          /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+            /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+              /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+  /*#92=IFCANNOTATION('00aB5XRjn4M8pFmXwr7kZh',$,'DIMENSION',$,'DIMENSION',#324,#103);*/
+    /*#324=IFCLOCALPLACEMENT($,#323);*/
+      /*#323=IFCAXIS2PLACEMENT3D(#320,#321,#322);*/
+        /*#320=IFCCARTESIANPOINT((3.,4.,2.));*/
+        /*#321=IFCDIRECTION((0.,0.,1.));*/
+        /*#322=IFCDIRECTION((1.,0.,0.));*/
+    /*#103=IFCPRODUCTDEFINITIONSHAPE($,$,(#329));*/
+      /*#329=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#328));*/
+        /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
+          /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
+            /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
+              /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
+              /*#27=IFCDIRECTION((1.,0.,0.));*/
+        /*#328=IFCGEOMETRICCURVESET((#327));*/
+          /*#327=IFCPOLYLINE((#325,#326));*/
+            /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+            /*#326=IFCCARTESIANPOINT((0.,0.));*/
+  /*#81=IFCGROUP('1yY$cHpI1F1hipFu87exyF',$,'PLAN_VIEW',$,'DRAWING');*/
+#83=IFCPROPERTYSET('2Gtx5_WNH44ABDUdHSMw_b',$,'EPset_Drawing',$,(#85,#86,#87,#88,#89,#90,#91));
+  /*#85=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);*/
+  /*#86=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/48'),$);*/
+  /*#87=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/4"=1''-0"'),$);*/
+  /*#88=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);*/
+  /*#89=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);*/
+  /*#90=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);*/
+  /*#91=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);*/
+#84=IFCRELDEFINESBYPROPERTIES('3GuStna3TBkOqdG5vVRWn4',$,$,$,(#69),#83);
+  /*#69=IFCANNOTATION('2IWhwimdb4f93GMIBXzzf1',$,'PLAN_VIEW',$,'DRAWING',#266,#80);*/
+    /*#266=IFCLOCALPLACEMENT($,#265);*/
+      /*#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);*/
+        /*#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));*/
+        /*#263=IFCDIRECTION((0.,0.,1.));*/
+        /*#264=IFCDIRECTION((1.,0.,0.));*/
+    /*#80=IFCPRODUCTDEFINITIONSHAPE($,$,(#271));*/
+      /*#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));*/
+        /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+              /*#20=IFCDIRECTION((0.,0.,1.));*/
+              /*#21=IFCDIRECTION((1.,0.,0.));*/
+        /*#270=IFCCSGSOLID(#269);*/
+          /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+            /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+              /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+  /*#83=IFCPROPERTYSET('2Gtx5_WNH44ABDUdHSMw_b',$,'EPset_Drawing',$,(#85,#86,#87,#88,#89,#90,#91));*/
+    /*#85=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);*/
+    /*#86=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/48'),$);*/
+    /*#87=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/4"=1''-0"'),$);*/
+    /*#88=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);*/
+    /*#89=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);*/
+    /*#90=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);*/
+    /*#91=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);*/
+#85=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);
+#86=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/48'),$);
+#87=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/4"=1''-0"'),$);
+#88=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);
+#89=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);
+#90=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);
+#91=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);
+#92=IFCANNOTATION('00aB5XRjn4M8pFmXwr7kZh',$,'DIMENSION',$,'DIMENSION',#324,#103);
+  /*#324=IFCLOCALPLACEMENT($,#323);*/
+    /*#323=IFCAXIS2PLACEMENT3D(#320,#321,#322);*/
+      /*#320=IFCCARTESIANPOINT((3.,4.,2.));*/
+      /*#321=IFCDIRECTION((0.,0.,1.));*/
+      /*#322=IFCDIRECTION((1.,0.,0.));*/
+  /*#103=IFCPRODUCTDEFINITIONSHAPE($,$,(#329));*/
+    /*#329=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#328));*/
+      /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
+        /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
+          /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
+            /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
+            /*#27=IFCDIRECTION((1.,0.,0.));*/
+      /*#328=IFCGEOMETRICCURVESET((#327));*/
+        /*#327=IFCPOLYLINE((#325,#326));*/
+          /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+          /*#326=IFCCARTESIANPOINT((0.,0.));*/
+#103=IFCPRODUCTDEFINITIONSHAPE($,$,(#329));
+  /*#329=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#328));*/
+    /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
+      /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
+        /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
+          /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
+          /*#27=IFCDIRECTION((1.,0.,0.));*/
+    /*#328=IFCGEOMETRICCURVESET((#327));*/
+      /*#327=IFCPOLYLINE((#325,#326));*/
+        /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+        /*#326=IFCCARTESIANPOINT((0.,0.));*/
+#148=IFCRELCONTAINEDINSPATIALSTRUCTURE('1kG5Kk8DL1lfP161AJ5mfI',$,$,$,(#164),#45);
+  /*#164=IFCWALL('3jZVHFT1P3kRbQP_iWQLhM',$,'Cube',$,$,#286,#182,$,.ELEMENTEDWALL.);*/
+    /*#286=IFCLOCALPLACEMENT(#68,#285);*/
       /*#68=IFCLOCALPLACEMENT(#62,#67);*/
         /*#62=IFCLOCALPLACEMENT(#56,#61);*/
           /*#56=IFCLOCALPLACEMENT($,#55);*/
@@ -380,35 +449,36 @@ DATA;
           /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
           /*#65=IFCDIRECTION((0.,0.,1.));*/
           /*#66=IFCDIRECTION((1.,0.,0.));*/
-      /*#97=IFCAXIS2PLACEMENT3D(#94,#95,#96);*/
-        /*#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
-        /*#95=IFCDIRECTION((0.,0.,1.));*/
-        /*#96=IFCDIRECTION((1.,0.,0.));*/
-    /*#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#106,#109));*/
-      /*#106=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#105));*/
+      /*#285=IFCAXIS2PLACEMENT3D(#282,#283,#284);*/
+        /*#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));*/
+        /*#283=IFCDIRECTION((0.,0.,1.));*/
+        /*#284=IFCDIRECTION((1.,0.,0.));*/
+    /*#182=IFCPRODUCTDEFINITIONSHAPE($,$,(#295,#298));*/
+      /*#295=IFCSHAPEREPRESENTATION(#24,'Body','Tessellation',(#294));*/
         /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
           /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
             /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
               /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
               /*#20=IFCDIRECTION((0.,0.,1.));*/
               /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);*/
-          /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-          /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-            /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-            /*#101=IFCDIRECTION((0.,0.,-1.));*/
-            /*#102=IFCDIRECTION((1.,0.,0.));*/
-          /*#104=IFCDIRECTION((0.,0.,-1.));*/
-      /*#109=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#108));*/
+        /*#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);*/
+          /*#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));*/
+          /*#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));*/
+          /*#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));*/
+          /*#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));*/
+          /*#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));*/
+          /*#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));*/
+          /*#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));*/
+      /*#298=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#297));*/
         /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
           /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
             /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
               /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
               /*#20=IFCDIRECTION((0.,0.,1.));*/
               /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);*/
-          /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-  /*#45=IFCBUILDINGSTOREY('0d7sn_4JX7FBfTQt7IXVVi',$,'My Storey',$,$,#68,$,$,$,$);*/
+        /*#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);*/
+          /*#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
+  /*#45=IFCBUILDINGSTOREY('2BIvGUhpD81fY45KBZ5fTl',$,'My Storey',$,$,#68,$,$,$,$);*/
     /*#68=IFCLOCALPLACEMENT(#62,#67);*/
       /*#62=IFCLOCALPLACEMENT(#56,#61);*/
         /*#56=IFCLOCALPLACEMENT($,#55);*/
@@ -424,14 +494,14 @@ DATA;
         /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
         /*#65=IFCDIRECTION((0.,0.,1.));*/
         /*#66=IFCDIRECTION((1.,0.,0.));*/
-#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));
-#95=IFCDIRECTION((0.,0.,1.));
-#96=IFCDIRECTION((1.,0.,0.));
-#97=IFCAXIS2PLACEMENT3D(#94,#95,#96);
-  /*#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
-  /*#95=IFCDIRECTION((0.,0.,1.));*/
-  /*#96=IFCDIRECTION((1.,0.,0.));*/
-#98=IFCLOCALPLACEMENT(#68,#97);
+#149=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));
+#150=IFCDIRECTION((0.,0.,1.));
+#151=IFCDIRECTION((1.,0.,0.));
+#152=IFCAXIS2PLACEMENT3D(#149,#150,#151);
+  /*#149=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
+  /*#150=IFCDIRECTION((0.,0.,1.));*/
+  /*#151=IFCDIRECTION((1.,0.,0.));*/
+#153=IFCLOCALPLACEMENT(#68,#152);
   /*#68=IFCLOCALPLACEMENT(#62,#67);*/
     /*#62=IFCLOCALPLACEMENT(#56,#61);*/
       /*#56=IFCLOCALPLACEMENT($,#55);*/
@@ -447,307 +517,213 @@ DATA;
       /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
       /*#65=IFCDIRECTION((0.,0.,1.));*/
       /*#66=IFCDIRECTION((1.,0.,0.));*/
-  /*#97=IFCAXIS2PLACEMENT3D(#94,#95,#96);*/
-    /*#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
-    /*#95=IFCDIRECTION((0.,0.,1.));*/
-    /*#96=IFCDIRECTION((1.,0.,0.));*/
-#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);
-#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));
-#101=IFCDIRECTION((0.,0.,-1.));
-#102=IFCDIRECTION((1.,0.,0.));
-#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);
-  /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-  /*#101=IFCDIRECTION((0.,0.,-1.));*/
-  /*#102=IFCDIRECTION((1.,0.,0.));*/
-#104=IFCDIRECTION((0.,0.,-1.));
-#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);
-  /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-  /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-    /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-    /*#101=IFCDIRECTION((0.,0.,-1.));*/
-    /*#102=IFCDIRECTION((1.,0.,0.));*/
-  /*#104=IFCDIRECTION((0.,0.,-1.));*/
-#106=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#105));
-  /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-        /*#20=IFCDIRECTION((0.,0.,1.));*/
-        /*#21=IFCDIRECTION((1.,0.,0.));*/
-  /*#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);*/
-    /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-    /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-      /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-      /*#101=IFCDIRECTION((0.,0.,-1.));*/
-      /*#102=IFCDIRECTION((1.,0.,0.));*/
-    /*#104=IFCDIRECTION((0.,0.,-1.));*/
-#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
-#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);
-  /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-#109=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#108));
-  /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-        /*#20=IFCDIRECTION((0.,0.,1.));*/
-        /*#21=IFCDIRECTION((1.,0.,0.));*/
-  /*#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);*/
-    /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-#110=IFCPROPERTYSET('3sWkzYMYDFMO6BZngmhM7p',$,'EPset_Drawing',$,(#112,#113));
-  /*#112=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/96'),$);*/
-  /*#113=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/8"=1''-0"'),$);*/
-#111=IFCRELDEFINESBYPROPERTIES('2g9_MoAcb6UxG9HzqZ_7X8',$,$,$,(#69),#110);
-  /*#69=IFCBUILDINGELEMENTPROXY('3JOryNTxP6FP8$b1mHXz3d',$,'Cube',$,$,#98,#87,$,.COMPLEX.);*/
-    /*#98=IFCLOCALPLACEMENT(#68,#97);*/
-      /*#68=IFCLOCALPLACEMENT(#62,#67);*/
-        /*#62=IFCLOCALPLACEMENT(#56,#61);*/
-          /*#56=IFCLOCALPLACEMENT($,#55);*/
-            /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
-              /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#53=IFCDIRECTION((0.,0.,1.));*/
-              /*#54=IFCDIRECTION((1.,0.,0.));*/
-          /*#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);*/
-            /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
-            /*#59=IFCDIRECTION((0.,0.,1.));*/
-            /*#60=IFCDIRECTION((1.,0.,0.));*/
-        /*#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);*/
-          /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
-          /*#65=IFCDIRECTION((0.,0.,1.));*/
-          /*#66=IFCDIRECTION((1.,0.,0.));*/
-      /*#97=IFCAXIS2PLACEMENT3D(#94,#95,#96);*/
-        /*#94=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
-        /*#95=IFCDIRECTION((0.,0.,1.));*/
-        /*#96=IFCDIRECTION((1.,0.,0.));*/
-    /*#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#106,#109));*/
-      /*#106=IFCSHAPEREPRESENTATION(#24,'Body','SweptSolid',(#105));*/
-        /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#20=IFCDIRECTION((0.,0.,1.));*/
-              /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#105=IFCEXTRUDEDAREASOLID(#99,#103,#104,2.00000000376181);*/
-          /*#99=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.00000000376181,2.00000000376181);*/
-          /*#103=IFCAXIS2PLACEMENT3D(#100,#101,#102);*/
-            /*#100=IFCCARTESIANPOINT((0.,0.,-1.00000001235897));*/
-            /*#101=IFCDIRECTION((0.,0.,-1.));*/
-            /*#102=IFCDIRECTION((1.,0.,0.));*/
-          /*#104=IFCDIRECTION((0.,0.,-1.));*/
-      /*#109=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#108));*/
-        /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#20=IFCDIRECTION((0.,0.,1.));*/
-              /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#108=IFCBOUNDINGBOX(#107,2.00000002471794,2.00000002471794,2.00000002471794);*/
-          /*#107=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
-  /*#110=IFCPROPERTYSET('3sWkzYMYDFMO6BZngmhM7p',$,'EPset_Drawing',$,(#112,#113));*/
-    /*#112=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/96'),$);*/
-    /*#113=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/8"=1''-0"'),$);*/
-#112=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/96'),$);
-#113=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('1/8"=1''-0"'),$);
-#114=IFCANNOTATION('1NdoroR$b6IBpfZ_wh2h22',$,'PLAN_VIEW',$,'DRAWING',#141,#125);
-  /*#141=IFCLOCALPLACEMENT($,#140);*/
-    /*#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);*/
-      /*#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));*/
-      /*#138=IFCDIRECTION((0.,0.,1.));*/
-      /*#139=IFCDIRECTION((1.,0.,0.));*/
-  /*#125=IFCPRODUCTDEFINITIONSHAPE($,$,(#124));*/
-    /*#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));*/
+  /*#152=IFCAXIS2PLACEMENT3D(#149,#150,#151);*/
+    /*#149=IFCCARTESIANPOINT((1.00000011013562,1.00000001235897,-1.00000001235897));*/
+    /*#150=IFCDIRECTION((0.,0.,1.));*/
+    /*#151=IFCDIRECTION((1.,0.,0.));*/
+#164=IFCWALL('3jZVHFT1P3kRbQP_iWQLhM',$,'Cube',$,$,#286,#182,$,.ELEMENTEDWALL.);
+  /*#286=IFCLOCALPLACEMENT(#68,#285);*/
+    /*#68=IFCLOCALPLACEMENT(#62,#67);*/
+      /*#62=IFCLOCALPLACEMENT(#56,#61);*/
+        /*#56=IFCLOCALPLACEMENT($,#55);*/
+          /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
+            /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
+            /*#53=IFCDIRECTION((0.,0.,1.));*/
+            /*#54=IFCDIRECTION((1.,0.,0.));*/
+        /*#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);*/
+          /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
+          /*#59=IFCDIRECTION((0.,0.,1.));*/
+          /*#60=IFCDIRECTION((1.,0.,0.));*/
+      /*#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);*/
+        /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
+        /*#65=IFCDIRECTION((0.,0.,1.));*/
+        /*#66=IFCDIRECTION((1.,0.,0.));*/
+    /*#285=IFCAXIS2PLACEMENT3D(#282,#283,#284);*/
+      /*#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));*/
+      /*#283=IFCDIRECTION((0.,0.,1.));*/
+      /*#284=IFCDIRECTION((1.,0.,0.));*/
+  /*#182=IFCPRODUCTDEFINITIONSHAPE($,$,(#295,#298));*/
+    /*#295=IFCSHAPEREPRESENTATION(#24,'Body','Tessellation',(#294));*/
       /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
         /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
           /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
             /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
             /*#20=IFCDIRECTION((0.,0.,1.));*/
             /*#21=IFCDIRECTION((1.,0.,0.));*/
-      /*#123=IFCCSGSOLID(#122);*/
-        /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-          /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-            /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));
-#121=IFCAXIS2PLACEMENT3D(#120,$,$);
-  /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);
-  /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-    /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#123=IFCCSGSOLID(#122);
-  /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-    /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-      /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));
-  /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-        /*#20=IFCDIRECTION((0.,0.,1.));*/
-        /*#21=IFCDIRECTION((1.,0.,0.));*/
-  /*#123=IFCCSGSOLID(#122);*/
-    /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-      /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-        /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#125=IFCPRODUCTDEFINITIONSHAPE($,$,(#124));
-  /*#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));*/
+      /*#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);*/
+        /*#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));*/
+        /*#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));*/
+        /*#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));*/
+        /*#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));*/
+        /*#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));*/
+        /*#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));*/
+        /*#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));*/
+    /*#298=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#297));*/
+      /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+        /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+          /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+            /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+            /*#20=IFCDIRECTION((0.,0.,1.));*/
+            /*#21=IFCDIRECTION((1.,0.,0.));*/
+      /*#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);*/
+        /*#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
+#182=IFCPRODUCTDEFINITIONSHAPE($,$,(#295,#298));
+  /*#295=IFCSHAPEREPRESENTATION(#24,'Body','Tessellation',(#294));*/
     /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
       /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
         /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
           /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
           /*#20=IFCDIRECTION((0.,0.,1.));*/
           /*#21=IFCDIRECTION((1.,0.,0.));*/
-    /*#123=IFCCSGSOLID(#122);*/
-      /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-        /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-          /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-#126=IFCGROUP('0XqIe1mh5DSwSDs2o02LEK',$,'PLAN_VIEW',$,'DRAWING');
-#127=IFCRELASSIGNSTOGROUP('31T3DRnQT7FxsXtc7De43r',$,$,$,(#142,#114),$,#126);
-  /*#142=IFCANNOTATION('0arcY2Q$jC_hww5nlZLL$9',$,'DIMENSION',$,'DIMENSION',#158,#153);*/
-    /*#158=IFCLOCALPLACEMENT($,#157);*/
-      /*#157=IFCAXIS2PLACEMENT3D(#154,#155,#156);*/
-        /*#154=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));*/
-        /*#155=IFCDIRECTION((0.,0.,1.));*/
-        /*#156=IFCDIRECTION((1.,0.,0.));*/
-    /*#153=IFCPRODUCTDEFINITIONSHAPE($,$,(#163));*/
-      /*#163=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#162));*/
-        /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
-          /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
-            /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
-              /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#27=IFCDIRECTION((1.,0.,0.));*/
-        /*#162=IFCGEOMETRICCURVESET((#161));*/
-          /*#161=IFCPOLYLINE((#159,#160));*/
-            /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-            /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
-  /*#114=IFCANNOTATION('1NdoroR$b6IBpfZ_wh2h22',$,'PLAN_VIEW',$,'DRAWING',#141,#125);*/
-    /*#141=IFCLOCALPLACEMENT($,#140);*/
-      /*#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);*/
-        /*#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));*/
-        /*#138=IFCDIRECTION((0.,0.,1.));*/
-        /*#139=IFCDIRECTION((1.,0.,0.));*/
-    /*#125=IFCPRODUCTDEFINITIONSHAPE($,$,(#124));*/
-      /*#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));*/
-        /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#20=IFCDIRECTION((0.,0.,1.));*/
-              /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#123=IFCCSGSOLID(#122);*/
-          /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-            /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-              /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-  /*#126=IFCGROUP('0XqIe1mh5DSwSDs2o02LEK',$,'PLAN_VIEW',$,'DRAWING');*/
-#128=IFCPROPERTYSET('3veorc5FL1zukXnL$a9jwr',$,'EPset_Drawing',$,(#130,#131,#132,#133,#134,#135,#136));
-  /*#130=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);*/
-  /*#131=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/4'),$);*/
-  /*#132=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('3"=1''-0"'),$);*/
-  /*#133=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);*/
-  /*#134=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);*/
-  /*#135=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);*/
-  /*#136=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);*/
-#129=IFCRELDEFINESBYPROPERTIES('1jEm9HNFH9buvIv8twkPTf',$,$,$,(#114),#128);
-  /*#114=IFCANNOTATION('1NdoroR$b6IBpfZ_wh2h22',$,'PLAN_VIEW',$,'DRAWING',#141,#125);*/
-    /*#141=IFCLOCALPLACEMENT($,#140);*/
-      /*#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);*/
-        /*#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));*/
-        /*#138=IFCDIRECTION((0.,0.,1.));*/
-        /*#139=IFCDIRECTION((1.,0.,0.));*/
-    /*#125=IFCPRODUCTDEFINITIONSHAPE($,$,(#124));*/
-      /*#124=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#123));*/
-        /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
-          /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
-            /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
-              /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
-              /*#20=IFCDIRECTION((0.,0.,1.));*/
-              /*#21=IFCDIRECTION((1.,0.,0.));*/
-        /*#123=IFCCSGSOLID(#122);*/
-          /*#122=IFCBLOCK(#121,164.041994750656,164.041994750656,32.8083989501312);*/
-            /*#121=IFCAXIS2PLACEMENT3D(#120,$,$);*/
-              /*#120=IFCCARTESIANPOINT((-82.0209973753281,-82.0209973753281,-32.8083989501312));*/
-  /*#128=IFCPROPERTYSET('3veorc5FL1zukXnL$a9jwr',$,'EPset_Drawing',$,(#130,#131,#132,#133,#134,#135,#136));*/
-    /*#130=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);*/
-    /*#131=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/4'),$);*/
-    /*#132=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('3"=1''-0"'),$);*/
-    /*#133=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);*/
-    /*#134=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);*/
-    /*#135=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);*/
-    /*#136=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);*/
-#130=IFCPROPERTYSINGLEVALUE('TargetView',$,IFCLABEL('PLAN_VIEW'),$);
-#131=IFCPROPERTYSINGLEVALUE('Scale',$,IFCLABEL('1/4'),$);
-#132=IFCPROPERTYSINGLEVALUE('HumanScale',$,IFCLABEL('3"=1''-0"'),$);
-#133=IFCPROPERTYSINGLEVALUE('HasUnderlay',$,IFCBOOLEAN(.F.),$);
-#134=IFCPROPERTYSINGLEVALUE('HasLinework',$,IFCBOOLEAN(.T.),$);
-#135=IFCPROPERTYSINGLEVALUE('HasAnnotation',$,IFCBOOLEAN(.T.),$);
-#136=IFCPROPERTYSINGLEVALUE('GlobalReferencing',$,IFCBOOLEAN(.T.),$);
-#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));
-#138=IFCDIRECTION((0.,0.,1.));
-#139=IFCDIRECTION((1.,0.,0.));
-#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);
-  /*#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));*/
-  /*#138=IFCDIRECTION((0.,0.,1.));*/
-  /*#139=IFCDIRECTION((1.,0.,0.));*/
-#141=IFCLOCALPLACEMENT($,#140);
-  /*#140=IFCAXIS2PLACEMENT3D(#137,#138,#139);*/
-    /*#137=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-1.00000011013562));*/
-    /*#138=IFCDIRECTION((0.,0.,1.));*/
-    /*#139=IFCDIRECTION((1.,0.,0.));*/
-#142=IFCANNOTATION('0arcY2Q$jC_hww5nlZLL$9',$,'DIMENSION',$,'DIMENSION',#158,#153);
-  /*#158=IFCLOCALPLACEMENT($,#157);*/
-    /*#157=IFCAXIS2PLACEMENT3D(#154,#155,#156);*/
-      /*#154=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));*/
-      /*#155=IFCDIRECTION((0.,0.,1.));*/
-      /*#156=IFCDIRECTION((1.,0.,0.));*/
-  /*#153=IFCPRODUCTDEFINITIONSHAPE($,$,(#163));*/
-    /*#163=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#162));*/
-      /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
-        /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
-          /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
-            /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
-            /*#27=IFCDIRECTION((1.,0.,0.));*/
-      /*#162=IFCGEOMETRICCURVESET((#161));*/
-        /*#161=IFCPOLYLINE((#159,#160));*/
-          /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-          /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
-#153=IFCPRODUCTDEFINITIONSHAPE($,$,(#163));
-  /*#163=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#162));*/
-    /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
-      /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
-        /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
-          /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
-          /*#27=IFCDIRECTION((1.,0.,0.));*/
-    /*#162=IFCGEOMETRICCURVESET((#161));*/
-      /*#161=IFCPOLYLINE((#159,#160));*/
-        /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-        /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
-#154=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));
-#155=IFCDIRECTION((0.,0.,1.));
-#156=IFCDIRECTION((1.,0.,0.));
-#157=IFCAXIS2PLACEMENT3D(#154,#155,#156);
-  /*#154=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));*/
-  /*#155=IFCDIRECTION((0.,0.,1.));*/
-  /*#156=IFCDIRECTION((1.,0.,0.));*/
-#158=IFCLOCALPLACEMENT($,#157);
-  /*#157=IFCAXIS2PLACEMENT3D(#154,#155,#156);*/
-    /*#154=IFCCARTESIANPOINT((0.,-4.93038120064184E-32,-4.28084000514874));*/
-    /*#155=IFCDIRECTION((0.,0.,1.));*/
-    /*#156=IFCDIRECTION((1.,0.,0.));*/
-#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));
-#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));
-#161=IFCPOLYLINE((#159,#160));
-  /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-  /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
-#162=IFCGEOMETRICCURVESET((#161));
-  /*#161=IFCPOLYLINE((#159,#160));*/
-    /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-    /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
-#163=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#162));
+    /*#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);*/
+      /*#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));*/
+      /*#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));*/
+      /*#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));*/
+      /*#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));*/
+      /*#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));*/
+      /*#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));*/
+      /*#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));*/
+  /*#298=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#297));*/
+    /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+      /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+        /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+          /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+          /*#20=IFCDIRECTION((0.,0.,1.));*/
+          /*#21=IFCDIRECTION((1.,0.,0.));*/
+    /*#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);*/
+      /*#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
+#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));
+#263=IFCDIRECTION((0.,0.,1.));
+#264=IFCDIRECTION((1.,0.,0.));
+#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);
+  /*#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));*/
+  /*#263=IFCDIRECTION((0.,0.,1.));*/
+  /*#264=IFCDIRECTION((1.,0.,0.));*/
+#266=IFCLOCALPLACEMENT($,#265);
+  /*#265=IFCAXIS2PLACEMENT3D(#262,#263,#264);*/
+    /*#262=IFCCARTESIANPOINT((2.00000002471794,2.00000002471794,2.99999993930026));*/
+    /*#263=IFCDIRECTION((0.,0.,1.));*/
+    /*#264=IFCDIRECTION((1.,0.,0.));*/
+#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));
+#268=IFCAXIS2PLACEMENT3D(#267,$,$);
+  /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);
+  /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+    /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#270=IFCCSGSOLID(#269);
+  /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+    /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+      /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#271=IFCSHAPEREPRESENTATION(#24,'Body','CSG',(#270));
+  /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+        /*#20=IFCDIRECTION((0.,0.,1.));*/
+        /*#21=IFCDIRECTION((1.,0.,0.));*/
+  /*#270=IFCCSGSOLID(#269);*/
+    /*#269=IFCBLOCK(#268,6.56167979002625,6.56167979002625,32.8083989501312);*/
+      /*#268=IFCAXIS2PLACEMENT3D(#267,$,$);*/
+        /*#267=IFCCARTESIANPOINT((-3.28083989501312,-3.28083989501312,-32.8083989501312));*/
+#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));
+#283=IFCDIRECTION((0.,0.,1.));
+#284=IFCDIRECTION((1.,0.,0.));
+#285=IFCAXIS2PLACEMENT3D(#282,#283,#284);
+  /*#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));*/
+  /*#283=IFCDIRECTION((0.,0.,1.));*/
+  /*#284=IFCDIRECTION((1.,0.,0.));*/
+#286=IFCLOCALPLACEMENT(#68,#285);
+  /*#68=IFCLOCALPLACEMENT(#62,#67);*/
+    /*#62=IFCLOCALPLACEMENT(#56,#61);*/
+      /*#56=IFCLOCALPLACEMENT($,#55);*/
+        /*#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);*/
+          /*#52=IFCCARTESIANPOINT((0.,0.,0.));*/
+          /*#53=IFCDIRECTION((0.,0.,1.));*/
+          /*#54=IFCDIRECTION((1.,0.,0.));*/
+      /*#61=IFCAXIS2PLACEMENT3D(#58,#59,#60);*/
+        /*#58=IFCCARTESIANPOINT((0.,0.,0.));*/
+        /*#59=IFCDIRECTION((0.,0.,1.));*/
+        /*#60=IFCDIRECTION((1.,0.,0.));*/
+    /*#67=IFCAXIS2PLACEMENT3D(#64,#65,#66);*/
+      /*#64=IFCCARTESIANPOINT((0.,0.,0.));*/
+      /*#65=IFCDIRECTION((0.,0.,1.));*/
+      /*#66=IFCDIRECTION((1.,0.,0.));*/
+  /*#285=IFCAXIS2PLACEMENT3D(#282,#283,#284);*/
+    /*#282=IFCCARTESIANPOINT((1.00000001235897,1.00000001235897,1.00000001235897));*/
+    /*#283=IFCDIRECTION((0.,0.,1.));*/
+    /*#284=IFCDIRECTION((1.,0.,0.));*/
+#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));
+#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));
+#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));
+#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));
+#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));
+#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));
+#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));
+#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);
+  /*#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));*/
+  /*#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));*/
+  /*#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));*/
+  /*#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));*/
+  /*#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));*/
+  /*#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));*/
+  /*#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));*/
+#295=IFCSHAPEREPRESENTATION(#24,'Body','Tessellation',(#294));
+  /*#24=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+        /*#20=IFCDIRECTION((0.,0.,1.));*/
+        /*#21=IFCDIRECTION((1.,0.,0.));*/
+  /*#294=IFCPOLYGONALFACESET(#293,$,(#287,#288,#289,#290,#291,#292),$);*/
+    /*#293=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,3.,-1.),(-1.,3.,1.),(2.,-1.,-1.),(2.,-1.,1.),(2.,3.,-1.),(2.,3.,1.)));*/
+    /*#287=IFCINDEXEDPOLYGONALFACE((1,2,4,3));*/
+    /*#288=IFCINDEXEDPOLYGONALFACE((3,4,8,7));*/
+    /*#289=IFCINDEXEDPOLYGONALFACE((7,8,6,5));*/
+    /*#290=IFCINDEXEDPOLYGONALFACE((5,6,2,1));*/
+    /*#291=IFCINDEXEDPOLYGONALFACE((3,7,5,1));*/
+    /*#292=IFCINDEXEDPOLYGONALFACE((8,4,2,6));*/
+#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
+#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);
+  /*#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
+#298=IFCSHAPEREPRESENTATION(#25,'Box','BoundingBox',(#297));
+  /*#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#23,$,.MODEL_VIEW.,$);*/
+    /*#23=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#22,$);*/
+      /*#22=IFCAXIS2PLACEMENT3D(#19,#20,#21);*/
+        /*#19=IFCCARTESIANPOINT((0.,0.,0.));*/
+        /*#20=IFCDIRECTION((0.,0.,1.));*/
+        /*#21=IFCDIRECTION((1.,0.,0.));*/
+  /*#297=IFCBOUNDINGBOX(#296,2.99999993930026,4.00000004943587,2.00000002471794);*/
+    /*#296=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));*/
+#320=IFCCARTESIANPOINT((3.,4.,2.));
+#321=IFCDIRECTION((0.,0.,1.));
+#322=IFCDIRECTION((1.,0.,0.));
+#323=IFCAXIS2PLACEMENT3D(#320,#321,#322);
+  /*#320=IFCCARTESIANPOINT((3.,4.,2.));*/
+  /*#321=IFCDIRECTION((0.,0.,1.));*/
+  /*#322=IFCDIRECTION((1.,0.,0.));*/
+#324=IFCLOCALPLACEMENT($,#323);
+  /*#323=IFCAXIS2PLACEMENT3D(#320,#321,#322);*/
+    /*#320=IFCCARTESIANPOINT((3.,4.,2.));*/
+    /*#321=IFCDIRECTION((0.,0.,1.));*/
+    /*#322=IFCDIRECTION((1.,0.,0.));*/
+#325=IFCCARTESIANPOINT((0.,-4.));
+#326=IFCCARTESIANPOINT((0.,0.));
+#327=IFCPOLYLINE((#325,#326));
+  /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+  /*#326=IFCCARTESIANPOINT((0.,0.));*/
+#328=IFCGEOMETRICCURVESET((#327));
+  /*#327=IFCPOLYLINE((#325,#326));*/
+    /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+    /*#326=IFCCARTESIANPOINT((0.,0.));*/
+#329=IFCSHAPEREPRESENTATION(#30,'Annotation','Annotation2D',(#328));
   /*#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#29,$,.PLAN_VIEW.,$);*/
     /*#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#28,$);*/
       /*#28=IFCAXIS2PLACEMENT2D(#26,#27);*/
         /*#26=IFCCARTESIANPOINT((0.,0.,0.));*/
         /*#27=IFCDIRECTION((1.,0.,0.));*/
-  /*#162=IFCGEOMETRICCURVESET((#161));*/
-    /*#161=IFCPOLYLINE((#159,#160));*/
-      /*#159=IFCCARTESIANPOINT((9.77766482535935E-08,0.));*/
-      /*#160=IFCCARTESIANPOINT((9.77766482535935E-08,2.00000002471794));*/
+  /*#328=IFCGEOMETRICCURVESET((#327));*/
+    /*#327=IFCPOLYLINE((#325,#326));*/
+      /*#325=IFCCARTESIANPOINT((0.,-4.));*/
+      /*#326=IFCCARTESIANPOINT((0.,0.));*/
 ENDSEC;
 END-ISO-10303-21;
diff --git a/Random_Tests/Annotation_Dimension/from_BlenderBIM/ifc-commenter Annotation_Blender_02.ifc --output Annotation_Blender_02_commented.ifc b/Random_Tests/Annotation_Dimension/from_BlenderBIM/ifc-commenter Annotation_Dimension_02.ifc --output Annotation_Dimension_02_commented.ifc
similarity index 100%
rename from Random_Tests/Annotation_Dimension/from_BlenderBIM/ifc-commenter Annotation_Blender_02.ifc --output Annotation_Blender_02_commented.ifc
rename to Random_Tests/Annotation_Dimension/from_BlenderBIM/ifc-commenter Annotation_Dimension_02.ifc --output Annotation_Dimension_02_commented.ifc