diff --git a/Random_Tests/Aggregate/from_Blender/Aggregate.blend b/Random_Tests/Aggregate/from_Blender/Aggregate.blend
new file mode 100644
index 0000000..1cede4a
Binary files /dev/null and b/Random_Tests/Aggregate/from_Blender/Aggregate.blend differ
diff --git a/Random_Tests/Aggregate/from_Blender/Aggregate.ifc b/Random_Tests/Aggregate/from_Blender/Aggregate.ifc
new file mode 100644
index 0000000..d43c552
--- /dev/null
+++ b/Random_Tests/Aggregate/from_Blender/Aggregate.ifc
@@ -0,0 +1,125 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
+FILE_NAME('Aggregate.ifc','2021-10-05T23:10:42-05:00',(),(),'IfcOpenShell 0.6.0b0','BlenderBIM 0.0.210913','Nobody');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPERSON('HSeldon','Seldon','Hari',$,$,$,$,$);
+#2=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
+#3=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
+#4=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
+#5=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://blenderbim.org',$);
+#6=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
+#7=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#3),(#4,#5,#6));
+#8=IFCAPPLICATION(#7,'0.0.210913','BlenderBIM Add-on','BlenderBIM');
+#9=IFCPERSONANDORGANIZATION(#1,#2,$);
+#10=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1633493210,#9,#8,1633493210);
+#11=IFCPROJECT('0plnu2csf6mQByZgRWWZpv',#10,'My Project',$,$,$,$,(#29,#36),#24);
+#12=IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
+#13=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#14=IFCMEASUREWITHUNIT(IFCREAL(0.3048),#13);
+#15=IFCCONVERSIONBASEDUNIT(#12,.LENGTHUNIT.,'foot',#14);
+#16=IFCDIMENSIONALEXPONENTS(2,0,0,0,0,0,0);
+#17=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#18=IFCMEASUREWITHUNIT(IFCREAL(0.09290304),#17);
+#19=IFCCONVERSIONBASEDUNIT(#16,.AREAUNIT.,'square foot',#18);
+#20=IFCDIMENSIONALEXPONENTS(3,0,0,0,0,0,0);
+#21=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#22=IFCMEASUREWITHUNIT(IFCREAL(0.0283168467116885),#21);
+#23=IFCCONVERSIONBASEDUNIT(#20,.VOLUMEUNIT.,'cubic foot',#22);
+#24=IFCUNITASSIGNMENT((#15,#23,#19));
+#25=IFCCARTESIANPOINT((0.,0.,0.));
+#26=IFCDIRECTION((0.,0.,1.));
+#27=IFCDIRECTION((1.,0.,0.));
+#28=IFCAXIS2PLACEMENT3D(#25,#26,#27);
+#29=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#28,$);
+#30=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#29,$,.MODEL_VIEW.,$);
+#31=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#29,$,.MODEL_VIEW.,$);
+#32=IFCCARTESIANPOINT((0.,0.,0.));
+#33=IFCDIRECTION((0.,0.,1.));
+#34=IFCDIRECTION((1.,0.,0.));
+#35=IFCAXIS2PLACEMENT3D(#32,#33,#34);
+#36=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#35,$);
+#37=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#36,$,.PLAN_VIEW.,$);
+#38=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493210,#9,#8,1633493210);
+#39=IFCSITE('3krOWiUcf5Yv4YV8XqDRue',#38,'My Site',$,$,#65,$,$,$,$,$,$,$,$);
+#45=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493210,#9,#8,1633493210);
+#46=IFCBUILDING('36MLYRa4H81AyM9M_o6eDs',#45,'My Building',$,$,#72,$,$,$,$,$,$);
+#52=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493210,#9,#8,1633493210);
+#53=IFCBUILDINGSTOREY('3uKpV2g0L0PR_JcwDahrUo',#52,'My Storey',$,$,#79,$,$,$,$);
+#59=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1633493210,#9,#8,1633493210);
+#60=IFCRELAGGREGATES('0z4wj5tZ512vCvx2pNDUcx',#59,$,$,#11,(#39));
+#61=IFCCARTESIANPOINT((0.,0.,0.));
+#62=IFCDIRECTION((0.,0.,1.));
+#63=IFCDIRECTION((1.,0.,0.));
+#64=IFCAXIS2PLACEMENT3D(#61,#62,#63);
+#65=IFCLOCALPLACEMENT($,#64);
+#66=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1633493210,#9,#8,1633493210);
+#67=IFCRELAGGREGATES('1omyqJKRz9QRAek7dA6cTI',#66,$,$,#39,(#46));
+#68=IFCCARTESIANPOINT((0.,0.,0.));
+#69=IFCDIRECTION((0.,0.,1.));
+#70=IFCDIRECTION((1.,0.,0.));
+#71=IFCAXIS2PLACEMENT3D(#68,#69,#70);
+#72=IFCLOCALPLACEMENT(#65,#71);
+#73=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1633493210,#9,#8,1633493210);
+#74=IFCRELAGGREGATES('0jQ9gbC2f5EgKMDOq51qCN',#73,$,$,#46,(#53));
+#75=IFCCARTESIANPOINT((0.,0.,0.));
+#76=IFCDIRECTION((0.,0.,1.));
+#77=IFCDIRECTION((1.,0.,0.));
+#78=IFCAXIS2PLACEMENT3D(#75,#76,#77);
+#79=IFCLOCALPLACEMENT(#72,#78);
+#80=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1633493231,#9,#8,1633493231);
+#81=IFCDOORTYPE('3DzecSuuHAjvz97OCOwJ3S',#80,'Empty',$,$,$,$,$,$,.DOOR.,$,$,$);
+#82=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493285,#9,#8,1633493285);
+#83=IFCDOORTYPE('1pWoXEmRL28xIpqCjoQWB6',#82,'Cube',$,$,$,(#100,#105),$,$,.DOOR.,$,$,$);
+#84=IFCINDEXEDPOLYGONALFACE((1,2,4,3));
+#85=IFCINDEXEDPOLYGONALFACE((3,4,8,7));
+#86=IFCINDEXEDPOLYGONALFACE((7,8,6,5));
+#87=IFCINDEXEDPOLYGONALFACE((5,6,2,1));
+#88=IFCINDEXEDPOLYGONALFACE((3,7,5,1));
+#89=IFCINDEXEDPOLYGONALFACE((8,4,2,6));
+#90=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,1.,-1.),(-1.,1.,1.),(1.,-1.,-1.),(1.,-1.,1.),(1.,1.,-1.),(1.,1.,1.)));
+#91=IFCPOLYGONALFACESET(#90,$,(#84,#85,#86,#87,#88,#89),$);
+#92=IFCSHAPEREPRESENTATION(#30,'Body','Tessellation',(#91));
+#93=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
+#94=IFCBOUNDINGBOX(#93,2.00000002471794,2.00000002471794,2.00000002471794);
+#95=IFCSHAPEREPRESENTATION(#31,'Box','BoundingBox',(#94));
+#96=IFCCARTESIANPOINT((0.,0.,0.));
+#97=IFCDIRECTION((1.,0.,0.));
+#98=IFCDIRECTION((0.,0.,1.));
+#99=IFCAXIS2PLACEMENT3D(#96,#98,#97);
+#100=IFCREPRESENTATIONMAP(#99,#95);
+#101=IFCCARTESIANPOINT((0.,0.,0.));
+#102=IFCDIRECTION((1.,0.,0.));
+#103=IFCDIRECTION((0.,0.,1.));
+#104=IFCAXIS2PLACEMENT3D(#101,#103,#102);
+#105=IFCREPRESENTATIONMAP(#104,#92);
+#106=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493285,#9,#8,1633493285);
+#107=IFCDOORTYPE('0t8UnpF_XBTvgW$2xpXfP1',#106,'Cube.001',$,$,$,(#124,#129),$,$,.DOOR.,$,$,$);
+#108=IFCINDEXEDPOLYGONALFACE((1,2,4,3));
+#109=IFCINDEXEDPOLYGONALFACE((3,4,8,7));
+#110=IFCINDEXEDPOLYGONALFACE((7,8,6,5));
+#111=IFCINDEXEDPOLYGONALFACE((5,6,2,1));
+#112=IFCINDEXEDPOLYGONALFACE((3,7,5,1));
+#113=IFCINDEXEDPOLYGONALFACE((8,4,2,6));
+#114=IFCCARTESIANPOINTLIST3D(((-1.,-1.,-1.),(-1.,-1.,1.),(-1.,1.,-1.),(-1.,1.,1.),(1.,-1.,-1.),(1.,-1.,1.),(1.,1.,-1.),(1.,1.,1.)));
+#115=IFCPOLYGONALFACESET(#114,$,(#108,#109,#110,#111,#112,#113),$);
+#116=IFCSHAPEREPRESENTATION(#30,'Body','Tessellation',(#115));
+#117=IFCCARTESIANPOINT((-1.00000001235897,-1.00000001235897,-1.00000001235897));
+#118=IFCBOUNDINGBOX(#117,2.00000002471794,2.00000002471794,2.00000002471794);
+#119=IFCSHAPEREPRESENTATION(#31,'Box','BoundingBox',(#118));
+#120=IFCCARTESIANPOINT((0.,0.,0.));
+#121=IFCDIRECTION((1.,0.,0.));
+#122=IFCDIRECTION((0.,0.,1.));
+#123=IFCAXIS2PLACEMENT3D(#120,#122,#121);
+#124=IFCREPRESENTATIONMAP(#123,#119);
+#125=IFCCARTESIANPOINT((0.,0.,0.));
+#126=IFCDIRECTION((1.,0.,0.));
+#127=IFCDIRECTION((0.,0.,1.));
+#128=IFCAXIS2PLACEMENT3D(#125,#127,#126);
+#129=IFCREPRESENTATIONMAP(#128,#116);
+#130=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1633493427,#9,#8,1633493324);
+#131=IFCRELAGGREGATES('22h$CEIdXCl8cGoANsisdh',#130,$,$,#81,(#107,#83,#81));
+ENDSEC;
+END-ISO-10303-21;
diff --git a/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_01.blend b/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_01.blend
index 378e774..720255b 100644
Binary files a/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_01.blend and b/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_01.blend differ
diff --git a/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_02.ifc b/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_02.ifc
index 5d2e279..78b647d 100644
--- a/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_02.ifc
+++ b/Random_Tests/Beam_W_section/from_Blender/Beam_W_section_02.ifc
@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('Beam_W_section_02.ifc','2021-09-25T16:21:14-05:00',(),(),'IfcOpenShell 0.6.0b0','BlenderBIM 0.0.210913','Nobody');
+FILE_NAME('Beam_W_section_02.ifc','2021-09-25T17:17:18-05:00',(),(),'IfcOpenShell 0.6.0b0','BlenderBIM 0.0.210913','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
diff --git a/Random_Tests/Door/from_Revit/Door_01.rvt b/Random_Tests/Door/from_Revit/Door_01.rvt
index 1311d5a..55cbe59 100644
Binary files a/Random_Tests/Door/from_Revit/Door_01.rvt and b/Random_Tests/Door/from_Revit/Door_01.rvt differ
diff --git a/Random_Tests/Door/from_Revit/Door_02.ifc b/Random_Tests/Door/from_Revit/Door_02.ifc
index a65f9de..4a8ce6f 100644
--- a/Random_Tests/Door/from_Revit/Door_02.ifc
+++ b/Random_Tests/Door/from_Revit/Door_02.ifc
@@ -4,23 +4,23 @@ HEADER;
 /******************************************************************************************
 * STEP Physical File produced by: The EXPRESS Data Manager Version 5.02.0100.07 : 28 Aug 2013
 * Module:                         EDMstepFileFactory/EDMstandAlone
-* Creation date:                  Sat Jan 02 17:02:59 2021
-* Host:                           DESKTOP-VD6CFD1
-* Database:                       C:\Users\ryan\AppData\Local\Temp\2dfbc7a9-2681-4201-baac-a7119c79f5a3\e9dc0b80-edf5-4eab-a501-962b8095deeb\ifc
+* Creation date:                  Mon Oct 11 19:15:00 2021
+* Host:                           DESKTOP-CJF9H2M
+* Database:                       C:\Users\Owner\AppData\Local\Temp\73f5a0c9-64c6-4248-94f3-ac236d753ab8\ddfc9c37-a435-4723-915e-ba5e736226eb\ifc
 * Database version:               5507
-* Database creation date:         Sat Jan 02 17:02:56 2021
+* Database creation date:         Mon Oct 11 19:14:56 2021
 * Schema:                         IFC4
 * Model:                          DataRepository.ifc
-* Model creation date:            Sat Jan 02 17:02:56 2021
+* Model creation date:            Mon Oct 11 19:14:57 2021
 * Header model:                   DataRepository.ifc_HeaderModel
-* Header model creation date:     Sat Jan 02 17:02:56 2021
+* Header model creation date:     Mon Oct 11 19:14:57 2021
 * EDMuser:                        sdai-user
 * EDMgroup:                       sdai-group
 * License ID and type:            5605 : Permanent license. Expiry date: 
 * EDMstepFileFactory options:     020000
 ******************************************************************************************/
 FILE_DESCRIPTION(('ViewDefinition [DesignTransferView_V1.0]'),'2;1');
-FILE_NAME('Project Number','2021-01-02T17:02:59',(''),(''),'The EXPRESS Data Manager Version 5.02.0100.07 : 28 Aug 2013','20200826_1250(x64) - Exporter 20.2.1.0 - Alternate UI 20.2.1.0','');
+FILE_NAME('Project Number','2021-10-11T19:15:00',(''),(''),'The EXPRESS Data Manager Version 5.02.0100.07 : 28 Aug 2013','20200210_1400(x64) - Exporter 20.2.12.1 - Alternate UI 20.2.12.1','');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 
@@ -40,11 +40,11 @@ DATA;
 #28= IFCDIRECTION((0.,1.));
 #30= IFCDIRECTION((0.,-1.));
 #32= IFCAXIS2PLACEMENT3D(#6,$,$);
-#33= IFCLOCALPLACEMENT(#161,#32);
+#33= IFCLOCALPLACEMENT(#382,#32);
 #36= IFCPERSON($,'','ryan@openingdesign.com',$,$,$,$,$);
 #38= IFCORGANIZATION($,'','',$,$);
 #39= IFCPERSONANDORGANIZATION(#36,#38,$);
-#42= IFCOWNERHISTORY(#39,#5,$,.NOCHANGE.,$,$,$,1609628553);
+#42= IFCOWNERHISTORY(#39,#5,$,.NOCHANGE.,$,$,$,1633996150);
 #43= IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
 #44= IFCDIMENSIONALEXPONENTS(1,0,0,0,0,0,0);
 #45= IFCMEASUREWITHUNIT(IFCRATIOMEASURE(0.3048),#43);
@@ -65,200 +65,175 @@ DATA;
 #61= IFCDERIVEDUNITELEMENT(#60,1);
 #62= IFCDERIVEDUNITELEMENT(#43,-3);
 #63= IFCDERIVEDUNIT((#61,#62),.MASSDENSITYUNIT.,$);
-#65= IFCDERIVEDUNITELEMENT(#43,4);
-#66= IFCDERIVEDUNIT((#65),.MOMENTOFINERTIAUNIT.,$);
-#68= IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
-#69= IFCSIUNIT(*,.FREQUENCYUNIT.,$,.HERTZ.);
-#70= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.KELVIN.);
-#71= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.DEGREE_CELSIUS.);
-#72= IFCDERIVEDUNITELEMENT(#60,1);
-#73= IFCDERIVEDUNITELEMENT(#70,-1);
-#74= IFCDERIVEDUNITELEMENT(#68,-3);
-#75= IFCDERIVEDUNIT((#72,#73,#74),.THERMALTRANSMITTANCEUNIT.,$);
-#77= IFCDERIVEDUNITELEMENT(#43,3);
-#78= IFCDERIVEDUNITELEMENT(#68,-1);
-#79= IFCDERIVEDUNIT((#77,#78),.VOLUMETRICFLOWRATEUNIT.,$);
-#81= IFCSIUNIT(*,.ELECTRICCURRENTUNIT.,$,.AMPERE.);
-#82= IFCSIUNIT(*,.ELECTRICVOLTAGEUNIT.,$,.VOLT.);
-#83= IFCSIUNIT(*,.POWERUNIT.,$,.WATT.);
-#84= IFCSIUNIT(*,.FORCEUNIT.,$,.NEWTON.);
-#85= IFCSIUNIT(*,.ILLUMINANCEUNIT.,$,.LUX.);
-#86= IFCSIUNIT(*,.LUMINOUSFLUXUNIT.,$,.LUMEN.);
-#87= IFCSIUNIT(*,.LUMINOUSINTENSITYUNIT.,$,.CANDELA.);
-#88= IFCDERIVEDUNITELEMENT(#60,-1);
-#89= IFCDERIVEDUNITELEMENT(#43,-2);
-#90= IFCDERIVEDUNITELEMENT(#68,3);
-#91= IFCDERIVEDUNITELEMENT(#86,1);
-#92= IFCDERIVEDUNIT((#88,#89,#90,#91),.USERDEFINED.,'Luminous Efficacy');
-#94= IFCDERIVEDUNITELEMENT(#43,1);
-#95= IFCDERIVEDUNITELEMENT(#68,-1);
-#96= IFCDERIVEDUNIT((#94,#95),.LINEARVELOCITYUNIT.,$);
-#98= IFCSIUNIT(*,.PRESSUREUNIT.,$,.PASCAL.);
-#99= IFCDERIVEDUNITELEMENT(#43,-2);
-#100= IFCDERIVEDUNITELEMENT(#60,1);
-#101= IFCDERIVEDUNITELEMENT(#68,-2);
-#102= IFCDERIVEDUNIT((#99,#100,#101),.USERDEFINED.,'Friction Loss');
-#104= IFCDERIVEDUNITELEMENT(#60,1);
-#105= IFCDERIVEDUNITELEMENT(#43,1);
-#106= IFCDERIVEDUNITELEMENT(#68,-2);
-#107= IFCDERIVEDUNITELEMENT(#43,-1);
-#108= IFCDERIVEDUNIT((#104,#105,#106,#107),.LINEARFORCEUNIT.,$);
-#110= IFCDERIVEDUNITELEMENT(#60,1);
-#111= IFCDERIVEDUNITELEMENT(#43,1);
-#112= IFCDERIVEDUNITELEMENT(#68,-2);
-#113= IFCDERIVEDUNITELEMENT(#43,-2);
-#114= IFCDERIVEDUNIT((#110,#111,#112,#113),.PLANARFORCEUNIT.,$);
-#116= IFCUNITASSIGNMENT((#46,#51,#55,#59,#60,#63,#66,#68,#69,#71,#75,#79,#81,#82,#83,#84,#85,#86,#87,#92,#96,#98,#102,#108,#114));
-#118= IFCAXIS2PLACEMENT3D(#6,$,$);
-#119= IFCDIRECTION((6.12303176911189E-17,1.));
-#121= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,0.0001,#118,#119);
-#125= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#121,$,.GRAPH_VIEW.,$);
-#127= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#121,$,.MODEL_VIEW.,$);
-#128= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#121,$,.MODEL_VIEW.,$);
-#129= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('FootPrint','Model',*,*,*,*,#121,$,.MODEL_VIEW.,$);
-#130= IFCPROJECT('2D8$ezOE16Jfl9ro85DRrf',#42,'Project Number',$,$,'Project Name','Project Status',(#121),#116);
-#141= IFCPOSTALADDRESS($,$,$,$,('Enter address here'),$,'','','','<Default>');
-#145= IFCBUILDING('2D8$ezOE16Jfl9ro85DRre',#42,'',$,$,#33,$,'',.ELEMENT.,$,$,#141);
-#155= IFCAXIS2PLACEMENT3D(#6,$,$);
-#156= IFCLOCALPLACEMENT(#33,#155);
-#158= IFCBUILDINGSTOREY('2D8$ezOE16Jfl9roBwoaFw',#42,'Level 1',$,'Level:Story Level',#156,$,'Level 1',.ELEMENT.,0.);
-#160= IFCAXIS2PLACEMENT3D(#6,$,$);
-#161= IFCLOCALPLACEMENT($,#160);
-#162= IFCSITE('2D8$ezOE16Jfl9ro85DRrh',#42,'Default',$,$,#161,$,$,.ELEMENT.,(42,21,30,344238),(-71,-3,-35,-194702),0.,$,$);
-#166= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Project Information'),$);
-#174= IFCPROPERTYSET('1b7tIashzEUx2OMcE24_7R',#42,'Pset_SiteCommon',$,(#166));
-#182= IFCRELDEFINESBYPROPERTIES('1u_$_4ETLEmBjIUKx9Y8iq',#42,$,$,(#162),#174);
-#191= IFCAXIS2PLACEMENT3D(#6,$,$);
-#192= IFCLOCALPLACEMENT(#156,#191);
-#193= IFCCARTESIANPOINT((10.,0.));
-#195= IFCPOLYLINE((#10,#193));
-#197= IFCSHAPEREPRESENTATION(#125,'Axis','Curve2D',(#195));
-#204= IFCCARTESIANPOINT((5.,0.));
-#206= IFCAXIS2PLACEMENT2D(#204,#26);
-#207= IFCRECTANGLEPROFILEDEF(.AREA.,$,#206,10.,0.5);
-#210= IFCAXIS2PLACEMENT3D(#6,$,$);
-#211= IFCEXTRUDEDAREASOLID(#207,#210,#20,10.);
-#212= IFCCOLOURRGB($,0.470588235294118,0.470588235294118,0.470588235294118);
-#213= IFCSURFACESTYLERENDERING(#212,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(64.),.NOTDEFINED.);
-#214= IFCSURFACESTYLE('Testy Wall Material',.BOTH.,(#213));
-#216= IFCSTYLEDITEM(#211,(#214),$);
-#219= IFCSHAPEREPRESENTATION(#127,'Body','SweptSolid',(#211));
-#222= IFCPRODUCTDEFINITIONSHAPE($,$,(#197,#219));
-#228= IFCWALL('3bZWClUVv0SA_B_$WeMblc',#42,'Basic Wall:Testy Wall Type:153052',$,'Basic Wall:Testy Wall Type',#192,#222,'153052',.NOTDEFINED.);
-#243= IFCQUANTITYLENGTH('Height',$,$,10.,$);
-#246= IFCQUANTITYLENGTH('Length',$,$,10.,$);
-#247= IFCQUANTITYLENGTH('Width',$,$,0.5,$);
-#248= IFCQUANTITYAREA('GrossFootprintArea',$,$,5.,$);
-#249= IFCQUANTITYVOLUME('GrossVolume',$,$,39.5,$);
-#250= IFCQUANTITYAREA('GrossSideArea',$,$,79.,$);
-#251= IFCQUANTITYAREA('NetSideArea',$,$,79.,$);
-#252= IFCQUANTITYVOLUME('NetVolume',$,$,39.5,$);
-#253= IFCELEMENTQUANTITY('2en6Gg21z5eBcePUyT3N$o',#42,'Qto_WallBaseQuantities',$,$,(#243,#246,#247,#248,#249,#250,#251,#252));
-#255= IFCRELDEFINESBYPROPERTIES('3L7b0dSSX2ARCAOVQTn5vJ',#42,$,$,(#228),#253);
-#259= IFCMATERIAL('Testy Wall Material',$,'Materials');
-#266= IFCSTYLEDITEM($,(#214),$);
-#268= IFCSTYLEDREPRESENTATION(#121,'Style','Material',(#266));
-#271= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#268),#259);
-#275= IFCMATERIALLAYER(#259,0.5,$,'Testy Wall Material',$,'Materials',$);
-#277= IFCMATERIALLAYERSET((#275),'Basic Wall:Testy Wall Type',$);
-#280= IFCMATERIALLAYERSETUSAGE(#277,.AXIS2.,.NEGATIVE.,0.25,$);
-#282= IFCWALLTYPE('2MiAr4$fjE1RodqLE4_GbH',#42,'Basic Wall:Testy Wall Type',$,$,(#286,#290,#294),$,'41083',$,.NOTDEFINED.);
-#285= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Testy Wall Type'),$);
-#286= IFCPROPERTYSET('0jRqVRk_j9gQCHQufG6mcj',#42,'Pset_EnvironmentalImpactIndicators',$,(#285));
-#289= IFCPROPERTYSINGLEVALUE('Reference',$,IFCLABEL('Testy Wall Type'),$);
-#290= IFCPROPERTYSET('2MSz9lGfD8yQjhwgcdni4o',#42,'Pset_ReinforcementBarPitchOfWall',$,(#289));
-#293= IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.F.),$);
-#294= IFCPROPERTYSET('2MiAr4$fjE1Rodsgw4_GbH',#42,'Pset_WallCommon',$,(#285,#293));
-#301= IFCPROPERTYSET('0ju_9KXxbBcgepvXB3hevP',#42,'Pset_EnvironmentalImpactIndicators',$,(#285));
-#303= IFCPROPERTYSINGLEVALUE('Reference',$,IFCLABEL('Testy Wall Type'),$);
-#304= IFCPROPERTYSET('3rf6Bd6HD7xe7$Y3E4v37i',#42,'Pset_ReinforcementBarPitchOfWall',$,(#303));
-#307= IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.T.),$);
-#308= IFCPROPERTYSINGLEVALUE('LoadBearing',$,IFCBOOLEAN(.F.),$);
-#309= IFCPROPERTYSINGLEVALUE('ExtendToStructure',$,IFCBOOLEAN(.F.),$);
-#310= IFCPROPERTYSET('3bZWClUVv0SA_By0KeMblc',#42,'Pset_WallCommon',$,(#285,#307,#308,#309));
-#315= IFCRELDEFINESBYPROPERTIES('3V3TDez81BwR$4bKX7uj4T',#42,$,$,(#228),#301);
-#318= IFCRELDEFINESBYPROPERTIES('21KKmG9AzFahkG4vlKx0o$',#42,$,$,(#228),#304);
-#321= IFCRELDEFINESBYPROPERTIES('2y5PYUYNfFduSbidq5roVR',#42,$,$,(#228),#310);
-#324= IFCCLASSIFICATION('https://www.csiresources.org/standards/uniformat','1998',$,'Uniformat',$,$,$);
-#327= IFCCLASSIFICATIONREFERENCE('https://www.csiresources.org/standards/uniformat','B2010156','Ext. Wall - Brick Composite',#324,$,$);
-#332= IFCRELASSOCIATESCLASSIFICATION('3uD8PkpeD93ATaJ3DWnumm',#42,'Uniformat Classification','',(#228),#327);
-#336= IFCCARTESIANPOINT((0.,0.));
-#338= IFCAXIS2PLACEMENT2D(#336,#24);
-#339= IFCRECTANGLEPROFILEDEF(.AREA.,'TestyDoorType',#338,0.166666666666667,3.);
-#340= IFCCARTESIANPOINT((1.5,0.25,0.));
-#342= IFCAXIS2PLACEMENT3D(#340,#20,#16);
-#343= IFCEXTRUDEDAREASOLID(#339,#342,#20,7.);
-#344= IFCSHAPEREPRESENTATION(#127,'Body','SweptSolid',(#343));
-#346= IFCAXIS2PLACEMENT3D(#6,$,$);
-#347= IFCREPRESENTATIONMAP(#346,#344);
-#351= IFCDOORLININGPROPERTIES('3bZWClUVv0SA_B_$aeMbVD',#42,'TestyDoor:TestyDoorType:154103',$,$,$,$,$,$,$,$,$,$,$,$,$,$);
-#352= IFCDOORPANELPROPERTIES('3bZWClUVv0SA_B_$eeMbVD',#42,'TestyDoor:TestyDoorType:154103',$,$,.NOTDEFINED.,$,.NOTDEFINED.,$);
-#353= IFCDOORTYPE('3bZWClUVv0SA_B__qeMcyJ',#42,'TestyDoor:TestyDoorType',$,$,(#351,#352,#398,#400),(#347),'154084',$,.DOOR.,.NOTDEFINED.,.F.,$);
-#358= IFCMATERIAL(' <Unnamed>',$,$);
-#361= IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#6,1.,$);
-#362= IFCMAPPEDITEM(#347,#361);
-#364= IFCSHAPEREPRESENTATION(#127,'Body','MappedRepresentation',(#362));
-#366= IFCPRODUCTDEFINITIONSHAPE($,$,(#364));
-#369= IFCCARTESIANPOINT((2.,-0.25000000000001,0.));
-#371= IFCAXIS2PLACEMENT3D(#369,$,$);
-#515= IFCLOCALPLACEMENT(#492,#514);
-#373= IFCDOOR('3bZWClUVv0SA_B_$WeMbVD',#42,'TestyDoor:TestyDoorType:154103',$,'TestyDoor:TestyDoorType',#515,#366,'154103',7.,3.,.DOOR.,.NOTDEFINED.,$);
-#377= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('TestyDoorType'),$);
-#378= IFCPROPERTYSET('3bZWClUVv0SA_By0WeMbVD',#42,'Pset_DoorCommon',$,(#293,#377));
-#381= IFCPROPERTYSET('1IDMY5PoPD_ARzUu3MyTXm',#42,'Pset_EnvironmentalImpactIndicators',$,(#377));
-#383= IFCRELDEFINESBYPROPERTIES('23$KtlX8vBeBVjcXHSxvO6',#42,$,$,(#373),#378);
-#387= IFCRELDEFINESBYPROPERTIES('0WkBwHHn921hCGzS_ff$SL',#42,$,$,(#373),#381);
-#390= IFCQUANTITYLENGTH('Height','',$,7.,$);
-#391= IFCQUANTITYLENGTH('Width','',$,3.,$);
-#392= IFCQUANTITYAREA('Area','area measured in geometry',$,22.6666666666667,$);
-#393= IFCELEMENTQUANTITY('1Kzm4ErEP3He9J_Gr6GaKw',#42,'Qto_DoorBaseQuantities',$,$,(#390,#391,#392));
-#395= IFCRELDEFINESBYPROPERTIES('32S4h64D5FTPfGysAUHVLZ',#42,$,$,(#373),#393);
-#398= IFCPROPERTYSET('3bZWClUVv0SA_By0WeMbVU',#42,'Pset_DoorCommon',$,(#293,#377));
-#400= IFCPROPERTYSET('3beuFoxVX7J8Hkl3qu4Jkl',#42,'Pset_EnvironmentalImpactIndicators',$,(#377));
-#406= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Story Level'),$);
-#407= IFCPROPERTYSINGLEVALUE('AboveGround',$,IFCLOGICAL(.U.),$);
-#408= IFCPROPERTYSET('2MayaW1Gv4GviuBtqfLNUo',#42,'Pset_BuildingStoreyCommon',$,(#406,#407));
-#412= IFCRELDEFINESBYPROPERTIES('1CChUvVtj4rO7HOMKchpWS',#42,$,$,(#158),#408);
-#416= IFCRELCONTAINEDINSPATIALSTRUCTURE('2MayaW1Gv4Gviu990fLNUo',#42,$,$,(#228,#373),#158);
-#421= IFCRELAGGREGATES('1fXfyYM714eQSnHpTUsUsa',#42,$,$,#130,(#162));
-#425= IFCRELAGGREGATES('1xgHC6nUj8oeS4n$7damb3',#42,$,$,#162,(#145));
-#429= IFCRELAGGREGATES('1b7tIashzEUx2OKPg24_7R',#42,$,$,#145,(#158));
-#433= IFCPROPERTYSINGLEVALUE('NumberOfStoreys',$,IFCINTEGER(1),$);
-#434= IFCPROPERTYSINGLEVALUE('IsLandmarked',$,IFCLOGICAL(.U.),$);
-#435= IFCPROPERTYSET('1b7tIashzEUx2OMdA24_7R',#42,'Pset_BuildingCommon',$,(#166,#433,#434));
-#439= IFCPROPERTYSET('1yKB137J596fnQbLalFFCi',#42,'Pset_BuildingElementProxyCommon',$,(#166,#293));
-#441= IFCPROPERTYSET('1b7tIashzEUx2OMdM24_7R',#42,'Pset_BuildingStoreyCommon',$,(#166,#407));
-#443= IFCPROPERTYSET('3q4cHt3X93Y8CdFSfgmo5T',#42,'Pset_BuildingSystemCommon',$,(#166));
-#445= IFCRELDEFINESBYPROPERTIES('3hTKOmG$DCo9XijOpo4x6E',#42,$,$,(#145),#435);
-#449= IFCRELDEFINESBYPROPERTIES('1_DIswMe9FXe0778uBRypu',#42,$,$,(#145),#439);
-#452= IFCRELDEFINESBYPROPERTIES('3eabfYgnnBuu7OFYP$aKOO',#42,$,$,(#145),#441);
-#455= IFCRELDEFINESBYPROPERTIES('22TOIcy8zFtxP_TLHGNXoX',#42,$,$,(#145),#443);
-#458= IFCRELASSOCIATESMATERIAL('3bLwTcE2nCQPjsiycgfYvl',#42,$,$,(#228),#280);
-#461= IFCRELASSOCIATESMATERIAL('06obxdkdL4depI1XG6dtc3',#42,$,$,(#282),#277);
-#465= IFCRELASSOCIATESMATERIAL('3xcbcn83b3p9Zw2t3k_hkf',#42,$,$,(#353,#373),#358);
-#470= IFCRELDEFINESBYTYPE('2B4$AL6iz49gwq$UXUNCy3',#42,$,$,(#228),#282);
-#474= IFCRELDEFINESBYTYPE('359GVkmqXE39HwYmL$B7V9',#42,$,$,(#373),#353);
-#478= IFCCARTESIANPOINT((3.5,1.5));
-#480= IFCAXIS2PLACEMENT2D(#478,#24);
-#481= IFCRECTANGLEPROFILEDEF(.AREA.,$,#480,7.,3.);
-#482= IFCAXIS2PLACEMENT3D(#6,#16,#20);
-#483= IFCEXTRUDEDAREASOLID(#481,#482,#20,0.5);
-#484= IFCSHAPEREPRESENTATION(#127,'Body','SweptSolid',(#483));
-#486= IFCPRODUCTDEFINITIONSHAPE($,$,(#484));
-#489= IFCCARTESIANPOINT((2.,-0.25000000000001,0.));
-#491= IFCAXIS2PLACEMENT3D(#489,$,$);
-#492= IFCLOCALPLACEMENT(#192,#491);
-#494= IFCOPENINGELEMENT('3bZWClUVv0SA_B__ieMbVD',#42,'TestyDoor:TestyDoorType:154103:1',$,'Opening',#492,#486,'154103',.OPENING.);
-#499= IFCRELVOIDSELEMENT('3bZWClUVv0SA_B__meMbVD',#42,$,$,#228,#494);
-#502= IFCQUANTITYLENGTH('Depth',$,$,0.5,$);
-#503= IFCQUANTITYLENGTH('Height',$,$,3.,$);
-#504= IFCQUANTITYLENGTH('Width',$,$,7.,$);
-#505= IFCELEMENTQUANTITY('2dqQBhto97EROMQfVVTUXa',#42,'Qto_OpeningElementBaseQuantities',$,$,(#502,#503,#504));
-#507= IFCRELDEFINESBYPROPERTIES('2Meu$MH61BRhOMUI01hWEt',#42,$,$,(#494),#505);
-#511= IFCRELFILLSELEMENT('1HQN4f0CPEtv2aqaYKpuWY',#42,$,$,#494,#373);
-#514= IFCAXIS2PLACEMENT3D(#6,$,$);
-#518= IFCPRESENTATIONLAYERASSIGNMENT('A-DOOR',$,(#344,#364),$);
-#522= IFCPRESENTATIONLAYERASSIGNMENT('A-WALL',$,(#197,#219,#484),$);
+#65= IFCSIUNIT(*,.TIMEUNIT.,$,.SECOND.);
+#66= IFCSIUNIT(*,.FREQUENCYUNIT.,$,.HERTZ.);
+#67= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.KELVIN.);
+#68= IFCSIUNIT(*,.THERMODYNAMICTEMPERATUREUNIT.,$,.DEGREE_CELSIUS.);
+#69= IFCDERIVEDUNITELEMENT(#60,1);
+#70= IFCDERIVEDUNITELEMENT(#67,-1);
+#71= IFCDERIVEDUNITELEMENT(#65,-3);
+#72= IFCDERIVEDUNIT((#69,#70,#71),.THERMALTRANSMITTANCEUNIT.,$);
+#74= IFCDERIVEDUNITELEMENT(#43,3);
+#75= IFCDERIVEDUNITELEMENT(#65,-1);
+#76= IFCDERIVEDUNIT((#74,#75),.VOLUMETRICFLOWRATEUNIT.,$);
+#78= IFCSIUNIT(*,.ELECTRICCURRENTUNIT.,$,.AMPERE.);
+#79= IFCSIUNIT(*,.ELECTRICVOLTAGEUNIT.,$,.VOLT.);
+#80= IFCSIUNIT(*,.POWERUNIT.,$,.WATT.);
+#81= IFCSIUNIT(*,.FORCEUNIT.,$,.NEWTON.);
+#82= IFCSIUNIT(*,.ILLUMINANCEUNIT.,$,.LUX.);
+#83= IFCSIUNIT(*,.LUMINOUSFLUXUNIT.,$,.LUMEN.);
+#84= IFCSIUNIT(*,.LUMINOUSINTENSITYUNIT.,$,.CANDELA.);
+#85= IFCDERIVEDUNITELEMENT(#60,-1);
+#86= IFCDERIVEDUNITELEMENT(#43,-2);
+#87= IFCDERIVEDUNITELEMENT(#65,3);
+#88= IFCDERIVEDUNITELEMENT(#83,1);
+#89= IFCDERIVEDUNIT((#85,#86,#87,#88),.USERDEFINED.,'Luminous Efficacy');
+#91= IFCDERIVEDUNITELEMENT(#43,1);
+#92= IFCDERIVEDUNITELEMENT(#65,-1);
+#93= IFCDERIVEDUNIT((#91,#92),.LINEARVELOCITYUNIT.,$);
+#95= IFCSIUNIT(*,.PRESSUREUNIT.,$,.PASCAL.);
+#96= IFCDERIVEDUNITELEMENT(#43,-2);
+#97= IFCDERIVEDUNITELEMENT(#60,1);
+#98= IFCDERIVEDUNITELEMENT(#65,-2);
+#99= IFCDERIVEDUNIT((#96,#97,#98),.USERDEFINED.,'Friction Loss');
+#101= IFCUNITASSIGNMENT((#46,#51,#55,#59,#60,#63,#65,#66,#68,#72,#76,#78,#79,#80,#81,#82,#83,#84,#89,#93,#95,#99));
+#103= IFCAXIS2PLACEMENT3D(#6,$,$);
+#104= IFCDIRECTION((6.12303176911189E-17,1.));
+#106= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,0.0001,#103,#104);
+#110= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Axis','Model',*,*,*,*,#106,$,.GRAPH_VIEW.,$);
+#112= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#106,$,.MODEL_VIEW.,$);
+#113= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#106,$,.MODEL_VIEW.,$);
+#114= IFCGEOMETRICREPRESENTATIONSUBCONTEXT('FootPrint','Model',*,*,*,*,#106,$,.MODEL_VIEW.,$);
+#115= IFCGEOMETRICREPRESENTATIONCONTEXT($,'Annotation',3,0.0001,#103,#104);
+#116= IFCGEOMETRICREPRESENTATIONSUBCONTEXT($,'Annotation',*,*,*,*,#115,0.01,.PLAN_VIEW.,$);
+#118= IFCPROJECT('2D8$ezOE16Jfl9ro85DRrf',#42,'Project Number',$,$,'Project Name','Project Status',(#106,#115),#101);
+#129= IFCPOSTALADDRESS($,$,$,$,('Enter address here'),$,'','','','<Default>');
+#133= IFCBUILDING('2D8$ezOE16Jfl9ro85DRre',#42,'',$,$,#33,$,'',.ELEMENT.,$,$,$);
+#143= IFCAXIS2PLACEMENT3D(#6,$,$);
+#144= IFCLOCALPLACEMENT(#33,#143);
+#146= IFCBUILDINGSTOREY('2D8$ezOE16Jfl9roBwoaFw',#42,'Level 1',$,'Level:Story Level',#144,$,'Level 1',.ELEMENT.,0.);
+#153= IFCAXIS2PLACEMENT3D(#6,$,$);
+#154= IFCLOCALPLACEMENT(#144,#153);
+#155= IFCCARTESIANPOINT((10.,0.));
+#157= IFCPOLYLINE((#10,#155));
+#159= IFCSHAPEREPRESENTATION(#110,'Axis','Curve2D',(#157));
+#166= IFCCARTESIANPOINT((5.,0.));
+#168= IFCAXIS2PLACEMENT2D(#166,#26);
+#169= IFCRECTANGLEPROFILEDEF(.AREA.,$,#168,10.,0.5);
+#172= IFCAXIS2PLACEMENT3D(#6,$,$);
+#173= IFCEXTRUDEDAREASOLID(#169,#172,#20,10.);
+#174= IFCCOLOURRGB($,0.470588235294118,0.470588235294118,0.470588235294118);
+#175= IFCSURFACESTYLERENDERING(#174,0.,$,$,$,$,IFCNORMALISEDRATIOMEASURE(0.5),IFCSPECULAREXPONENT(64.),.NOTDEFINED.);
+#176= IFCSURFACESTYLE('Testy Wall Material',.BOTH.,(#175));
+#178= IFCPRESENTATIONSTYLEASSIGNMENT((#176));
+#180= IFCSTYLEDITEM(#173,(#178),$);
+#183= IFCSHAPEREPRESENTATION(#112,'Body','SweptSolid',(#173));
+#186= IFCPRODUCTDEFINITIONSHAPE($,$,(#159,#183));
+#192= IFCWALL('3bZWClUVv0SA_B_$WeMblc',#42,'Basic Wall:Testy Wall Type:153052',$,'Basic Wall:Testy Wall Type',#154,#186,'153052',.NOTDEFINED.);
+#207= IFCMATERIAL('Testy Wall Material',$,'Materials');
+#214= IFCPRESENTATIONSTYLEASSIGNMENT((#176));
+#216= IFCSTYLEDITEM($,(#214),$);
+#218= IFCSTYLEDREPRESENTATION(#106,'Style','Material',(#216));
+#221= IFCMATERIALDEFINITIONREPRESENTATION($,$,(#218),#207);
+#225= IFCMATERIALLAYER(#207,0.5,$,'Testy Wall Material',$,'Materials',$);
+#227= IFCMATERIALLAYERSET((#225),'Basic Wall:Testy Wall Type',$);
+#230= IFCMATERIALLAYERSETUSAGE(#227,.AXIS2.,.NEGATIVE.,0.25,$);
+#232= IFCWALLTYPE('2MiAr4$fjE1RodqLE4_GbH',#42,'Basic Wall:Testy Wall Type',$,$,(#243,#252,#256),$,'41083',$,.NOTDEFINED.);
+#235= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Testy Wall Type'),$);
+#243= IFCPROPERTYSET('3mkO0qDaXB$wFrfUamMihF',#42,'Pset_EnvironmentalImpactIndicators',$,(#235));
+#251= IFCPROPERTYSINGLEVALUE('Reference',$,IFCLABEL('Testy Wall Type'),$);
+#252= IFCPROPERTYSET('2dxxBs$7H6RAaqgsHKcUPe',#42,'Pset_ReinforcementBarPitchOfWall',$,(#251));
+#255= IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.F.),$);
+#256= IFCPROPERTYSET('2MiAr4$fjE1Rodsgw4_GbH',#42,'Pset_WallCommon',$,(#235,#255));
+#263= IFCPROPERTYSET('1f_Qh73ij9T8HivQhpDYkA',#42,'Pset_EnvironmentalImpactIndicators',$,(#235));
+#265= IFCPROPERTYSINGLEVALUE('Reference',$,IFCLABEL('Testy Wall Type'),$);
+#266= IFCPROPERTYSET('0Kobq2vwXDwRrn8JMi2aKp',#42,'Pset_ReinforcementBarPitchOfWall',$,(#265));
+#269= IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.T.),$);
+#270= IFCPROPERTYSINGLEVALUE('LoadBearing',$,IFCBOOLEAN(.F.),$);
+#271= IFCPROPERTYSINGLEVALUE('ExtendToStructure',$,IFCBOOLEAN(.F.),$);
+#272= IFCPROPERTYSET('3bZWClUVv0SA_By0KeMblc',#42,'Pset_WallCommon',$,(#235,#269,#270,#271));
+#277= IFCRELDEFINESBYPROPERTIES('3sneA72xTB4A9gsBeB7IYG',#42,$,$,(#192),#263);
+#281= IFCRELDEFINESBYPROPERTIES('3XvJ2PQFr12unjMNWD$9W2',#42,$,$,(#192),#266);
+#284= IFCRELDEFINESBYPROPERTIES('3cAIT6JX59FxhYoDzMBiHj',#42,$,$,(#192),#272);
+#287= IFCCLASSIFICATION('http://www.csiorg.net/uniformat','1998',$,'Uniformat',$,$,$);
+#290= IFCCLASSIFICATIONREFERENCE('http://www.csiorg.net/uniformat','B2010156','Ext. Wall - Brick Composite',#287,$,$);
+#295= IFCRELASSOCIATESCLASSIFICATION('1bgK_S5Vf3793fshaGpxA4',#42,'Uniformat Classification','',(#192),#290);
+#299= IFCCARTESIANPOINT((0.,0.));
+#301= IFCAXIS2PLACEMENT2D(#299,#24);
+#302= IFCRECTANGLEPROFILEDEF(.AREA.,'TestyDoorType',#301,0.166666666666667,3.);
+#303= IFCCARTESIANPOINT((1.5,0.25,0.));
+#305= IFCAXIS2PLACEMENT3D(#303,#20,#16);
+#306= IFCEXTRUDEDAREASOLID(#302,#305,#20,7.);
+#307= IFCSHAPEREPRESENTATION(#112,'Body','SweptSolid',(#306));
+#309= IFCCARTESIANPOINT((3.,0.25));
+#311= IFCAXIS2PLACEMENT2D(#309,#24);
+#312= IFCCIRCLE(#311,3.);
+#313= IFCTRIMMEDCURVE(#312,(IFCPARAMETERVALUE(90.)),(IFCPARAMETERVALUE(180.)),.T.,.PARAMETER.);
+#316= IFCCARTESIANPOINT((3.,0.25));
+#318= IFCCARTESIANPOINT((3.,3.25));
+#320= IFCPOLYLINE((#316,#318));
+#322= IFCGEOMETRICSET((#313,#320));
+#324= IFCSHAPEREPRESENTATION(#116,'FootPrint','GeometricSet',(#322));
+#327= IFCAXIS2PLACEMENT3D(#6,$,$);
+#328= IFCREPRESENTATIONMAP(#327,#307);
+#332= IFCREPRESENTATIONMAP(#327,#324);
+#334= IFCDOORLININGPROPERTIES('3bZWClUVv0SA_B_$aeMbVD',#42,'TestyDoor:TestyDoorType:154103',$,$,$,$,$,$,$,$,$,$,$,$,$,$);
+#335= IFCDOORPANELPROPERTIES('3Dio$iPTjFngA3Hqqrviw3',#42,'TestyDoor:TestyDoorType:154103',$,$,.SWINGING.,$,.NOTDEFINED.,$);
+#336= IFCDOORTYPE('3Ckk5wyU96xQowkxIHzsJ0',#42,'TestyDoorType',$,$,(#334,#335,#374,#376),(#328,#332),'154084',$,.DOOR.,.SINGLE_SWING_RIGHT.,.F.,$);
+#341= IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#6,1.,$);
+#342= IFCMAPPEDITEM(#328,#341);
+#344= IFCSHAPEREPRESENTATION(#112,'Body','MappedRepresentation',(#342));
+#346= IFCMAPPEDITEM(#332,#341);
+#348= IFCSHAPEREPRESENTATION(#116,'FootPrint','MappedRepresentation',(#346));
+#350= IFCPRODUCTDEFINITIONSHAPE($,$,(#344,#348));
+#354= IFCCARTESIANPOINT((2.,-0.25000000000001,0.));
+#356= IFCAXIS2PLACEMENT3D(#354,$,$);
+#472= IFCLOCALPLACEMENT(#458,#471);
+#358= IFCDOOR('3bZWClUVv0SA_B_$WeMbVD',#42,'TestyDoor:TestyDoorType:154103',$,'TestyDoor:TestyDoorType',#472,#350,'154103',7.,3.,.DOOR.,.SINGLE_SWING_RIGHT.,$);
+#361= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('TestyDoorType'),$);
+#362= IFCPROPERTYSET('3bZWClUVv0SA_By0WeMbVD',#42,'Pset_DoorCommon',$,(#255,#361));
+#365= IFCPROPERTYSET('10hyMU8S5CJxLwFVZvx5AB',#42,'Pset_EnvironmentalImpactIndicators',$,(#361));
+#367= IFCRELDEFINESBYPROPERTIES('2JLOHP0q15_QyzHmZ$Rzyc',#42,$,$,(#358),#362);
+#371= IFCRELDEFINESBYPROPERTIES('0ERU_pvkz8MhvNB$hzF$Q_',#42,$,$,(#358),#365);
+#374= IFCPROPERTYSET('3bZWClUVv0SA_By0WeMbVU',#42,'Pset_DoorCommon',$,(#255,#361));
+#376= IFCPROPERTYSET('1FO8IJvejAsej1ktkoR7vf',#42,'Pset_EnvironmentalImpactIndicators',$,(#361));
+#381= IFCAXIS2PLACEMENT3D(#6,$,$);
+#382= IFCLOCALPLACEMENT($,#381);
+#383= IFCPOSTALADDRESS($,$,$,$,('Enter address here'),$,'','','','<Default>');
+#385= IFCSITE('2D8$ezOE16Jfl9ro85DRrh',#42,'Default',$,$,#382,$,$,.ELEMENT.,(42,21,30,344238),(-71,-3,-35,-194702),0.,$,$);
+#390= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Story Level'),$);
+#391= IFCPROPERTYSINGLEVALUE('AboveGround',$,IFCLOGICAL(.U.),$);
+#392= IFCPROPERTYSET('2MayaW1Gv4GviuBtqfLNUo',#42,'Pset_BuildingStoreyCommon',$,(#390,#391));
+#396= IFCRELDEFINESBYPROPERTIES('2Tx7d0g5vFoeXciSEz9k4r',#42,$,$,(#146),#392);
+#400= IFCRELCONTAINEDINSPATIALSTRUCTURE('2MayaW1Gv4Gviu990fLNUo',#42,$,$,(#192,#358),#146);
+#405= IFCRELAGGREGATES('1_ISpx0qD0OwwSPpkQX8MF',#42,$,$,#118,(#385));
+#409= IFCRELAGGREGATES('34p3qLSMf1p9jEeU6aVa5F',#42,$,$,#385,(#133));
+#413= IFCRELAGGREGATES('1b7tIashzEUx2OKPg24_7R',#42,$,$,#133,(#146));
+#417= IFCPROPERTYSINGLEVALUE('Reference',$,IFCIDENTIFIER('Project Information'),$);
+#418= IFCPROPERTYSINGLEVALUE('NumberOfStoreys',$,IFCINTEGER(1),$);
+#419= IFCPROPERTYSINGLEVALUE('IsLandmarked',$,IFCLOGICAL(.U.),$);
+#420= IFCPROPERTYSET('1b7tIashzEUx2OMdA24_7R',#42,'Pset_BuildingCommon',$,(#417,#418,#419));
+#425= IFCRELDEFINESBYPROPERTIES('08Cqg9l6H5x9w2uRuBGzfq',#42,$,$,(#133),#420);
+#429= IFCRELASSOCIATESMATERIAL('2hZcht67z1Ph9Hq_oKfI98',#42,$,$,(#192),#230);
+#432= IFCRELASSOCIATESMATERIAL('2cOehwuOD8Au_jZfS92M8U',#42,$,$,(#232),#227);
+#436= IFCRELDEFINESBYTYPE('3sQEfw2jD4COkEWOt7wmFw',#42,$,$,(#192),#232);
+#440= IFCRELDEFINESBYTYPE('1vYUM$HxDE182aVUkwtvrl',#42,$,$,(#358),#336);
+#444= IFCCARTESIANPOINT((3.5,1.5));
+#446= IFCAXIS2PLACEMENT2D(#444,#24);
+#447= IFCRECTANGLEPROFILEDEF(.AREA.,$,#446,7.,3.);
+#448= IFCAXIS2PLACEMENT3D(#6,#16,#20);
+#449= IFCEXTRUDEDAREASOLID(#447,#448,#20,0.5);
+#450= IFCSHAPEREPRESENTATION(#112,'Body','SweptSolid',(#449));
+#452= IFCPRODUCTDEFINITIONSHAPE($,$,(#450));
+#455= IFCCARTESIANPOINT((2.,-0.25000000000001,0.));
+#457= IFCAXIS2PLACEMENT3D(#455,$,$);
+#458= IFCLOCALPLACEMENT(#154,#457);
+#460= IFCOPENINGELEMENT('3bZWClUVv0SA_B__ieMbVD',#42,'TestyDoor:TestyDoorType:154103:1',$,'Opening',#458,#452,$,.OPENING.);
+#465= IFCRELVOIDSELEMENT('3bZWClUVv0SA_B__meMbVD',#42,$,$,#192,#460);
+#468= IFCRELFILLSELEMENT('1USl2ui5z27wVno0jwdqPY',#42,$,$,#460,#358);
+#471= IFCAXIS2PLACEMENT3D(#6,$,$);
+#475= IFCPRESENTATIONLAYERASSIGNMENT('A-DOOR',$,(#307,#324,#344,#348),$);
+#481= IFCPRESENTATIONLAYERASSIGNMENT('A-WALL',$,(#159,#183,#450),$);
 ENDSEC;
 
 END-ISO-10303-21;
diff --git a/Random_Tests/Door/from_Revit/Door_03.blend b/Random_Tests/Door/from_Revit/Door_03.blend
index ab5479e..db06671 100644
Binary files a/Random_Tests/Door/from_Revit/Door_03.blend and b/Random_Tests/Door/from_Revit/Door_03.blend differ
diff --git a/Random_Tests/Door/from_Revit/Door_03.png b/Random_Tests/Door/from_Revit/Door_03.png
new file mode 100644
index 0000000..c357fa4
Binary files /dev/null and b/Random_Tests/Door/from_Revit/Door_03.png differ
diff --git a/Random_Tests/Door/from_Revit/Door_03.rvt b/Random_Tests/Door/from_Revit/Door_03.rvt
new file mode 100644
index 0000000..5c4f7e5
Binary files /dev/null and b/Random_Tests/Door/from_Revit/Door_03.rvt differ
diff --git a/Random_Tests/Door/from_Revit/Door_03_linked.png b/Random_Tests/Door/from_Revit/Door_03_linked.png
new file mode 100644
index 0000000..da32568
Binary files /dev/null and b/Random_Tests/Door/from_Revit/Door_03_linked.png differ
diff --git a/Random_Tests/Door/from_Revit/Door_03_linked.rvt b/Random_Tests/Door/from_Revit/Door_03_linked.rvt
new file mode 100644
index 0000000..d02665a
Binary files /dev/null and b/Random_Tests/Door/from_Revit/Door_03_linked.rvt differ
diff --git a/Random_Tests/WindowType/from_Blender/Window_Type_01.blend b/Random_Tests/WindowType/from_Blender/Window_Type_01.blend
new file mode 100644
index 0000000..e288cf3
Binary files /dev/null and b/Random_Tests/WindowType/from_Blender/Window_Type_01.blend differ
diff --git a/Random_Tests/WindowType/from_Blender/Window_Type_02.ifc b/Random_Tests/WindowType/from_Blender/Window_Type_02.ifc
new file mode 100644
index 0000000..a30e262
--- /dev/null
+++ b/Random_Tests/WindowType/from_Blender/Window_Type_02.ifc
@@ -0,0 +1,61 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
+FILE_NAME('Window_Type_02.ifc','2021-10-08T14:29:05-05:00',(),(),'IfcOpenShell -9853d3d8','BlenderBIM 0.0.211008','Nobody');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPERSON('HSeldon','Seldon','Hari',$,$,$,$,$);
+#2=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
+#5=IFCTELECOMADDRESS(.USERDEFINED.,$,'WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
+#6=IFCORGANIZATION('IfcOpenShell','IfcOpenShell','IfcOpenShell is an open source software library that helps users and software developers to work with IFC data.',(#4),(#5));
+#7=IFCAPPLICATION(#6,'0.0.211008','BlenderBIM Add-on','BlenderBIM');
+#8=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633721335,#3,#7,1633721335);
+#9=IFCPROJECT('1HnnfmH1zDlv5scj6mvvGz',#8,'My Project',$,$,$,$,(#18,#24),#13);
+#10=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#11=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#12=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#13=IFCUNITASSIGNMENT((#11,#12,#10));
+#14=IFCCARTESIANPOINT((0.,0.,0.));
+#15=IFCDIRECTION((0.,0.,1.));
+#16=IFCDIRECTION((1.,0.,0.));
+#17=IFCAXIS2PLACEMENT3D(#14,#15,#16);
+#18=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#17,$);
+#19=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#18,$,.MODEL_VIEW.,$);
+#20=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#18,$,.MODEL_VIEW.,$);
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCDIRECTION((1.,0.,0.));
+#23=IFCAXIS2PLACEMENT2D(#21,#22);
+#24=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#23,$);
+#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#24,$,.PLAN_VIEW.,$);
+#26=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633721335,#3,#7,1633721335);
+#27=IFCSITE('1OibzltSD2Qfj6SUjDuujM',#26,'My Site',$,$,#53,$,$,$,$,$,$,$,$);
+#33=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633721336,#3,#7,1633721335);
+#34=IFCBUILDING('0edSdu1F92YRCWqhHwWazG',#33,'My Building',$,$,#60,$,$,$,$,$,$);
+#40=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633721336,#3,#7,1633721335);
+#41=IFCBUILDINGSTOREY('09ouOcOxTCdvoLualQU5xw',#40,'My Storey',$,$,#67,$,$,$,$);
+#47=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633721335,#3,#7,1633721335);
+#48=IFCRELAGGREGATES('00WwK5HvfBPP7uppMgtGaT',#47,$,$,#9,(#27));
+#49=IFCCARTESIANPOINT((0.,0.,0.));
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCAXIS2PLACEMENT3D(#49,#50,#51);
+#53=IFCLOCALPLACEMENT($,#52);
+#54=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633721335,#3,#7,1633721335);
+#55=IFCRELAGGREGATES('3i3K3ZYDf63frQAFIuT99$',#54,$,$,#27,(#34));
+#56=IFCCARTESIANPOINT((0.,0.,0.));
+#57=IFCDIRECTION((0.,0.,1.));
+#58=IFCDIRECTION((1.,0.,0.));
+#59=IFCAXIS2PLACEMENT3D(#56,#57,#58);
+#60=IFCLOCALPLACEMENT(#53,#59);
+#61=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633721336,#3,#7,1633721336);
+#62=IFCRELAGGREGATES('3pMQa8ji11fRpei$hH584q',#61,$,$,#34,(#41));
+#63=IFCCARTESIANPOINT((0.,0.,0.));
+#64=IFCDIRECTION((0.,0.,1.));
+#65=IFCDIRECTION((1.,0.,0.));
+#66=IFCAXIS2PLACEMENT3D(#63,#64,#65);
+#67=IFCLOCALPLACEMENT(#60,#66);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/Starter_Files/Blender/Template_Metric.blend.ifc b/Starter_Files/Blender/Template_Metric.blend.ifc
index c3de7ed..285bcf9 100644
--- a/Starter_Files/Blender/Template_Metric.blend.ifc
+++ b/Starter_Files/Blender/Template_Metric.blend.ifc
@@ -1,138 +1,61 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('Template_Metric.blend.ifc','2021-09-25T16:14:37-05:00',(),(),'IfcOpenShell 0.6.0b0','BlenderBIM 0.0.210913','Nobody');
+FILE_NAME('Template_Metric.blend.ifc','2021-10-08T14:10:31-05:00',(),(),'IfcOpenShell -9853d3d8','BlenderBIM 0.0.211008','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
 #1=IFCPERSON('HSeldon','Seldon','Hari',$,$,$,$,$);
 #2=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
-#3=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
-#4=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
-#5=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://blenderbim.org',$);
-#6=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
-#7=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#3),(#4,#5,#6));
-#8=IFCAPPLICATION(#7,'0.0.210913','BlenderBIM Add-on','BlenderBIM');
-#9=IFCPERSONANDORGANIZATION(#1,#2,$);
-#10=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632603963,#9,#8,1632603963);
-#11=IFCPROJECT('2nulbh_2H1jedzYwBzmo$p',#10,'My Project',$,$,$,$,(#20,#27),#15);
-#12=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
-#13=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
-#14=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
-#15=IFCUNITASSIGNMENT((#12,#13,#14));
-#16=IFCCARTESIANPOINT((0.,0.,0.));
-#17=IFCDIRECTION((0.,0.,1.));
-#18=IFCDIRECTION((1.,0.,0.));
-#19=IFCAXIS2PLACEMENT3D(#16,#17,#18);
-#20=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#19,$);
-#21=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#20,$,.MODEL_VIEW.,$);
-#22=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#20,$,.MODEL_VIEW.,$);
-#23=IFCCARTESIANPOINT((0.,0.,0.));
-#24=IFCDIRECTION((0.,0.,1.));
-#25=IFCDIRECTION((1.,0.,0.));
-#26=IFCAXIS2PLACEMENT3D(#23,#24,#25);
-#27=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#26,$);
-#28=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#27,$,.PLAN_VIEW.,$);
-#29=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1632603963,#9,#8,1632603963);
-#30=IFCSITE('2LWZhkSDb6ZPgV$YpbI$vO',#29,'My Site',$,$,#56,$,$,$,$,$,$,$,$);
-#36=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1632603963,#9,#8,1632603963);
-#37=IFCBUILDING('132AJsQm14UwwwY84AsjU6',#36,'My Building',$,$,#63,$,$,$,$,$,$);
-#43=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1632603963,#9,#8,1632603963);
-#44=IFCBUILDINGSTOREY('2sHPHrSdPDuu0bxtQULPLP',#43,'My Storey',$,$,#70,$,$,$,$);
-#50=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632603963,#9,#8,1632603963);
-#51=IFCRELAGGREGATES('0IkyNqQW97A8Crc8Nnf98_',#50,$,$,#11,(#30));
-#52=IFCCARTESIANPOINT((0.,0.,0.));
-#53=IFCDIRECTION((0.,0.,1.));
-#54=IFCDIRECTION((1.,0.,0.));
-#55=IFCAXIS2PLACEMENT3D(#52,#53,#54);
-#56=IFCLOCALPLACEMENT($,#55);
-#57=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632603963,#9,#8,1632603963);
-#58=IFCRELAGGREGATES('2DoARUnQf6sPrv7MljWwON',#57,$,$,#30,(#37));
-#59=IFCCARTESIANPOINT((0.,0.,0.));
-#60=IFCDIRECTION((0.,0.,1.));
-#61=IFCDIRECTION((1.,0.,0.));
-#62=IFCAXIS2PLACEMENT3D(#59,#60,#61);
-#63=IFCLOCALPLACEMENT(#56,#62);
-#64=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632603963,#9,#8,1632603963);
-#65=IFCRELAGGREGATES('17NUgZ1Gf7U99iA32KUFNn',#64,$,$,#37,(#44));
-#66=IFCCARTESIANPOINT((0.,0.,0.));
-#67=IFCDIRECTION((0.,0.,1.));
-#68=IFCDIRECTION((1.,0.,0.));
-#69=IFCAXIS2PLACEMENT3D(#66,#67,#68);
-#70=IFCLOCALPLACEMENT(#63,#69);
-#72=IFCBEAMTYPE('31lTcjHz5DABs7Q1Hyf1zc',$,'DEMO1',$,$,$,$,$,$,$);
-#74=IFCMATERIAL('Unknown',$,$);
-#75=IFCISHAPEPROFILEDEF(.AREA.,'DEMO-I',$,0.1,0.2,0.005,0.01,0.005,$,$);
-#76=IFCMATERIALPROFILE($,$,#74,#75,$,$);
-#77=IFCMATERIALPROFILESET($,$,(#76),$);
-#78=IFCRELASSOCIATESMATERIAL('14YLYhEp93p9EVnoqLrbUt',$,$,$,(#72),#77);
-#79=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1632604477,#9,#8,1632604294);
-#80=IFCBEAM('14uAvzAEf5sA9Rrucj0X90',#79,'Beam',$,$,#187,#96,$,$);
-#81=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632604294,#9,#8,1632604294);
-#82=IFCRELDEFINESBYTYPE('0dhJeavAfDex6LXvDkxH6E',#81,$,$,(#80,#102),#72);
-#83=IFCMATERIALPROFILESETUSAGE(#77,$,$);
-#84=IFCRELASSOCIATESMATERIAL('0s7gFBVgHBoPdmGO4yLuOF',$,$,$,(#80,#102),#83);
-#96=IFCPRODUCTDEFINITIONSHAPE($,$,(#190,#194));
-#97=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632604294,#9,#8,1632604294);
-#98=IFCPROPERTYSET('37FtP3F4bAuBUqAL6AzX$Q',#97,'EPset_Parametric',$,(#101));
-#99=IFCOWNERHISTORY(#9,#8,.READWRITE.,.ADDED.,1632604294,#9,#8,1632604294);
-#100=IFCRELDEFINESBYPROPERTIES('0sj2sJ3sLEZ9KQyGR8s6kZ',#99,$,$,(#80),#98);
-#101=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('BlenderBIM.DumbProfile'),$);
-#102=IFCBEAM('1lsBGVk0z1ZP79vSDFq6By',#130,'Beam',$,$,#173,#137,$,$);
-#103=IFCRELDEFINESBYPROPERTIES('1Je1cm7Ur8g9LTJqVoChQV',#99,$,$,(#102),#104);
-#104=IFCPROPERTYSET('37FtP3F4bAuBUqAL6AzX$Q',#105,'EPset_Parametric',$,(#124));
-#105=IFCOWNERHISTORY(#106,#109,.READWRITE.,.ADDED.,1632604294,#115,#118,1632604294);
-#106=IFCPERSONANDORGANIZATION(#107,#108,$);
-#107=IFCPERSON('HSeldon','Seldon','Hari',$,$,$,$,$);
-#108=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
-#109=IFCAPPLICATION(#110,'0.0.210913','BlenderBIM Add-on','BlenderBIM');
-#110=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#111),(#112,#113,#114));
-#111=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
-#112=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
-#113=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://blenderbim.org',$);
-#114=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
-#115=IFCPERSONANDORGANIZATION(#116,#117,$);
-#116=IFCPERSON('HSeldon','Seldon','Hari',$,$,$,$,$);
-#117=IFCORGANIZATION('APTR','Aperture Science',$,$,$);
-#118=IFCAPPLICATION(#119,'0.0.210913','BlenderBIM Add-on','BlenderBIM');
-#119=IFCORGANIZATION($,'IfcOpenShell','IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.',(#120),(#121,#122,#123));
-#120=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
-#121=IFCTELECOMADDRESS(.USERDEFINED.,'The main webpage of the software collection.','WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
-#122=IFCTELECOMADDRESS(.USERDEFINED.,'The BlenderBIM Add-on webpage of the software collection.','WEBPAGE',$,$,$,$,'https://blenderbim.org',$);
-#123=IFCTELECOMADDRESS(.USERDEFINED.,'The source code repository of the software collection.','REPOSITORY',$,$,$,$,'https://github.com/IfcOpenShell/IfcOpenShell.git',$);
-#124=IFCPROPERTYSINGLEVALUE('Engine',$,IFCLABEL('BlenderBIM.DumbProfile'),$);
-#130=IFCOWNERHISTORY(#9,#8,.READWRITE.,.MODIFIED.,1632604477,#9,#8,1632604294);
-#137=IFCPRODUCTDEFINITIONSHAPE($,$,(#176,#180));
-#138=IFCCOLOURRGB($,0.800000011920929,0.800000011920929,0.800000011920929);
-#139=IFCCOLOURRGB($,0.800000011920929,0.800000011920929,0.800000011920929);
-#140=IFCSURFACESTYLERENDERING(#138,0.,#139,$,$,$,$,$,.NOTDEFINED.);
-#141=IFCSURFACESTYLE('Unknown',.BOTH.,(#140));
-#142=IFCSTYLEDITEM($,(#141),'Unknown');
-#143=IFCSTYLEDREPRESENTATION(#21,'Body',$,(#142));
-#144=IFCMATERIALDEFINITIONREPRESENTATION($,$,(#143),#74);
-#169=IFCCARTESIANPOINT((-2.86115398040465E-08,0.65455573797226,0.));
-#170=IFCDIRECTION((1.,4.37113882867379E-08,-4.37113882867379E-08));
-#171=IFCDIRECTION((-4.37113882867379E-08,1.,0.));
-#172=IFCAXIS2PLACEMENT3D(#169,#170,#171);
-#173=IFCLOCALPLACEMENT($,#172);
-#174=IFCDIRECTION((0.,0.,1.));
-#175=IFCEXTRUDEDAREASOLID(#75,$,#174,1.84999990463257);
-#176=IFCSHAPEREPRESENTATION(#21,'Body','SweptSolid',(#175));
-#178=IFCCARTESIANPOINT((-0.0500000007450581,-0.100000001490116,0.));
-#179=IFCBOUNDINGBOX(#178,0.100000001490116,0.200000002980232,1.84999990463257);
-#180=IFCSHAPEREPRESENTATION(#22,'Box','BoundingBox',(#179));
-#181=IFCSTYLEDITEM(#175,(#141),'Unknown');
-#183=IFCCARTESIANPOINT((-1.64589965343475,-7.19445623076354E-08,7.19445623076354E-08));
-#184=IFCDIRECTION((1.,4.37113882867379E-08,-4.37113882867379E-08));
-#185=IFCDIRECTION((-4.37113882867379E-08,1.,0.));
-#186=IFCAXIS2PLACEMENT3D(#183,#184,#185);
-#187=IFCLOCALPLACEMENT($,#186);
-#188=IFCDIRECTION((0.,0.,1.));
-#189=IFCEXTRUDEDAREASOLID(#75,$,#188,7.11007022857666);
-#190=IFCSHAPEREPRESENTATION(#21,'Body','SweptSolid',(#189));
-#192=IFCCARTESIANPOINT((-0.0499999113380909,-0.100000090897083,0.));
-#193=IFCBOUNDINGBOX(#192,0.100000001490116,0.200000002980232,7.11007022857666);
-#194=IFCSHAPEREPRESENTATION(#22,'Box','BoundingBox',(#193));
-#195=IFCSTYLEDITEM(#189,(#141),'Unknown');
+#3=IFCPERSONANDORGANIZATION(#1,#2,$);
+#4=IFCACTORROLE(.USERDEFINED.,'CONTRIBUTOR',$);
+#5=IFCTELECOMADDRESS(.USERDEFINED.,$,'WEBPAGE',$,$,$,$,'https://ifcopenshell.org',$);
+#6=IFCORGANIZATION('IfcOpenShell','IfcOpenShell','IfcOpenShell is an open source software library that helps users and software developers to work with IFC data.',(#4),(#5));
+#7=IFCAPPLICATION(#6,'0.0.211008','BlenderBIM Add-on','BlenderBIM');
+#8=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633720206,#3,#7,1633720206);
+#9=IFCPROJECT('2cLlw_QJn829ezUObEww8H',#8,'My Project',$,$,$,$,(#18,#24),#13);
+#10=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#11=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#12=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#13=IFCUNITASSIGNMENT((#10,#11,#12));
+#14=IFCCARTESIANPOINT((0.,0.,0.));
+#15=IFCDIRECTION((0.,0.,1.));
+#16=IFCDIRECTION((1.,0.,0.));
+#17=IFCAXIS2PLACEMENT3D(#14,#15,#16);
+#18=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#17,$);
+#19=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#18,$,.MODEL_VIEW.,$);
+#20=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Box','Model',*,*,*,*,#18,$,.MODEL_VIEW.,$);
+#21=IFCCARTESIANPOINT((0.,0.,0.));
+#22=IFCDIRECTION((1.,0.,0.));
+#23=IFCAXIS2PLACEMENT2D(#21,#22);
+#24=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#23,$);
+#25=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#24,$,.PLAN_VIEW.,$);
+#26=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633720206,#3,#7,1633720206);
+#27=IFCSITE('3_XNKrZdr06Q0Xxhd3646H',#26,'My Site',$,$,#53,$,$,$,$,$,$,$,$);
+#33=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633720206,#3,#7,1633720206);
+#34=IFCBUILDING('1aTKCHc6P1iBHUe9nrid6F',#33,'My Building',$,$,#60,$,$,$,$,$,$);
+#40=IFCOWNERHISTORY(#3,#7,.READWRITE.,.MODIFIED.,1633720206,#3,#7,1633720206);
+#41=IFCBUILDINGSTOREY('1EyPB9qHjAiAT5XttC2mEE',#40,'My Storey',$,$,#67,$,$,$,$);
+#47=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633720206,#3,#7,1633720206);
+#48=IFCRELAGGREGATES('2YIjDiuFf7FhFeOMtSFeB6',#47,$,$,#9,(#27));
+#49=IFCCARTESIANPOINT((0.,0.,0.));
+#50=IFCDIRECTION((0.,0.,1.));
+#51=IFCDIRECTION((1.,0.,0.));
+#52=IFCAXIS2PLACEMENT3D(#49,#50,#51);
+#53=IFCLOCALPLACEMENT($,#52);
+#54=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633720206,#3,#7,1633720206);
+#55=IFCRELAGGREGATES('1vrITrQhP04QNnVGnF6SBf',#54,$,$,#27,(#34));
+#56=IFCCARTESIANPOINT((0.,0.,0.));
+#57=IFCDIRECTION((0.,0.,1.));
+#58=IFCDIRECTION((1.,0.,0.));
+#59=IFCAXIS2PLACEMENT3D(#56,#57,#58);
+#60=IFCLOCALPLACEMENT(#53,#59);
+#61=IFCOWNERHISTORY(#3,#7,.READWRITE.,.ADDED.,1633720206,#3,#7,1633720206);
+#62=IFCRELAGGREGATES('39mCAeCHT7PPEPaD69lcTY',#61,$,$,#34,(#41));
+#63=IFCCARTESIANPOINT((0.,0.,0.));
+#64=IFCDIRECTION((0.,0.,1.));
+#65=IFCDIRECTION((1.,0.,0.));
+#66=IFCAXIS2PLACEMENT3D(#63,#64,#65);
+#67=IFCLOCALPLACEMENT(#60,#66);
 ENDSEC;
 END-ISO-10303-21;
diff --git a/Starter_Files/Blender/Template_Metric.blend b/Starter_Files/Blender/Template_Metric.blend@
similarity index 60%
rename from Starter_Files/Blender/Template_Metric.blend
rename to Starter_Files/Blender/Template_Metric.blend@
index 84f0ffb..8d6601e 100644
Binary files a/Starter_Files/Blender/Template_Metric.blend and b/Starter_Files/Blender/Template_Metric.blend@ differ