Minor fixes to IfcTester

IfcTester now integrated into BlenderBIM Add-on UI
Minor fix
2026-08-28 07:49:59 +00:00 · 2022-08-16 11:52:01 +10:00 · 2022-08-16 11:52:01 +10:00 · 2022-08-16 11:52:01 +10:00 · 2022-08-15 19:40:51 +01:00 · 2022-08-15 16:59:32 +02:00
1344 changed files with 182112 additions and 31127 deletions
@@ -28,7 +28,7 @@ jobs:
        sudo apt update
        sudo apt-get install --no-install-recommends \
        git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-dev \
-        liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev \
+        libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
        libhdf5-dev libcgal-dev

    -
@@ -47,7 +47,7 @@ jobs:
         -DCMAKE_PREFIX_PATH=/usr \
         -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
         -DBUILD_PACKAGE=On \
-         -DOCC_INCLUDE_DIR=/usr/include/oce \
+         -DOCC_INCLUDE_DIR=/usr/include/opencascade \
         -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
         -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
@@ -0,0 +1,98 @@
+name: Publish-blenderbim-chocolatey package
+
+on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "55 23 * * *" # 5min before utc midnight
+
+env:
+  major: 0
+  minor: 0
+  name: blenderbim
+  choco_version: 1.1.0
+  CHOCO_TOKEN:   ${{ secrets.CHOCO_TOKEN }}
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set env
+      run: echo ok go
+
+  build:
+    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [py310]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+        with:
+          python-version: '3.7.7' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+      - run: echo ${{ env.DATE }}
+
+      - name: Check in published releases if we should do a choco release
+        id: do_choco
+        run: |
+          echo "::set-output name=choco_release::$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --do_choco_release?)"
+
+      - name: Compile
+        if: ${{steps.do_choco.outputs.choco_release}} == 'do_choco_release'
+        run: |
+          target_os=${{ matrix.config.short_name }} &&
+          pyver=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --pyver?) &&
+          cp -r src/blenderbim src/blenderbim_$target_os_$pyver &&
+          cd src/blenderbim_$target_os_$pyver &&
+          make dist PLATFORM=$target_os PYVERSION=$pyver
+
+      - name: Fill chocolatey scripts on win with latest blender python
+        if: ${{steps.do_choco.outputs.choco_release}} == 'do_choco_release'
+        run: |
+          today_non_iso="$(date +'%y%m%d' | tr -d '\n')" &&
+          target_os=${{ matrix.config.short_name }} &&
+          latest_blender_python_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_python_version_maj_min?) &&
+          echo "latest_blender_python_version_maj_min?: $latest_blender_python_version_maj_min" &&
+          pyver=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --pyver?) &&
+          export latest_blender_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min?) &&
+          export latest_blender_version_maj_min_pat=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min_pat?) &&
+          echo   latest_blender_version_maj_min_pat?: $latest_blender_version_maj_min_pat &&
+          export blenderbim_build_version="${{ env.major }}.${{ env.minor }}.$today_non_iso" &&
+          export url_blenderbim_py310_win_zip="https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-$today_non_iso/blenderbim-$today_non_iso-$pyver-$target_os.zip" &&
+          export sha256sum_blenderbim_py310_win_zip=$( sha256sum src/blenderbim_$target_os_$pyver/dist/blenderbim-$today_non_iso-$pyver-$target_os.zip  --tag | cut -d ' ' -f 4  | tr -d '\n') &&
+          echo   sha256sum_blenderbim_py310_win_zip: $sha256sum_blenderbim_py310_win_zip &&
+          python3 choco/blenderbim/fill_dynamic_parameters.py &&
+          echo __build choco with mono &&
+          wget "https://github.com/chocolatey/choco/archive/refs/tags/$choco_version.tar.gz" --quiet &&
+          tar -xzf "$choco_version.tar.gz" &&
+          cd choco-$choco_version &&
+          chmod +x build.sh zip.sh &&
+          ./build.sh &&
+          cp -r build_output/chocolatey /opt/chocolatey &&
+          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
+          echo __choco pack &&
+          mono /opt/chocolatey/choco.exe --version &&
+          mono /opt/chocolatey/choco.exe pack --allow-unofficial &&
+          echo __choco set apiKey &&
+          mono /opt/chocolatey/choco.exe setapikey --key="$CHOCO_TOKEN" --source="https://push.chocolatey.org/" --allow-unofficial # &&
+          echo __choco push &&
+          mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose
+
+      - name: Inform user about not packaging
+        if: ${{steps.do_choco.outputs.choco_release}} != 'do_choco_release'
+        run: |
+          echo "no releases found today ${{ env.DATE }}, therefore choco packaging is skipped."
+
@@ -3,8 +3,18 @@ name: Publish-blenderbim-multiplatform
 on:
  push:
    paths:
-      - 'src/blenderbim/**'
      - '.github/workflows/ci-blenderbim-matrix.yml'
+      - 'src/blenderbim/**'
+      - 'src/ifcopenshell-python/ifcopenshell/**'
+      - 'src/bcf/src/bcf/**'
+      - 'src/ifcclash/ifcclash/**'
+      - 'src/ifccobie/**'
+      - 'src/ifcdiff/**'
+      - 'src/ifccsv/**'
+      - 'src/ifcpatch/ifcpatch/**'
+      - 'src/ifc4d/ifc4d/**'
+      - 'src/ifc5d/ifc5d/**'
+      - 'src/ifccityjson/**'
    branches:
      - v0.7.0

@@ -23,12 +33,13 @@ jobs:
      run: echo ok go

  build:
+    needs: activate
    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py37, py39]
+        pyver: [py37, py39, py310]
        config:
          - {
            name: "Windows Build",
@@ -0,0 +1,72 @@
+name: ci-ifcopenshell-daily
+
+on:
+  push:
+    paths:
+      - src/**
+      - conda/**
+      - .github/workflows/ci-daily-build.yml
+    branches:
+      - pr-daily-builds
+# Only trigger, when the build workflow succeeded
+  workflow_run:
+    workflows: ["ci"]
+    types:
+      - completed
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+      - name: Set env
+        run: echo ok go
+
+  test:
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    needs: activate
+    runs-on: ${{ matrix.platform.distver }}
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [
+          { name: py39, distver: '3.9' },
+          { name: py310, distver: '3.10'}
+        ]
+        platform: [
+          { name: Windows, distver: windows-2022, upload: 'true' },
+          { name: Windows, distver: windows-2019, upload: 'false' },
+          { name: Linux, distver: ubuntu-20.04,  upload: 'false' },
+          { name: Linux, distver: ubuntu-18.04,  upload: 'true' },
+          { name: macOS, distver: macos-11, upload: 'true' },
+          { name: macOS, distver: macos-10.15, upload: 'false' }
+        ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Download MacOSX SDK
+        if: ${{ matrix.platform.name == 'macOS' }}
+        run: |
+          curl -o MacOSX10.13.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz && \
+          tar xf MacOSX10.13.sdk.tar.xz && \
+          sudo mv -v MacOSX10.13.sdk /opt/ && \
+          ls /opt/
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - uses: conda-incubator/setup-miniconda@v2  # https://github.com/conda-incubator/setup-miniconda
+        with:
+          activate-environment: conda-build
+          python-version: ${{ matrix.pyver.distver }}
+          environment-file: conda/environment.yml
+      - name: build, test and upload ifcopenshell
+        if: ${{ matrix.platform.upload == 'true' }}
+        run: |
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell --no-remove-work-dir
+      - name: build & test ifcopenshell
+        if: ${{ matrix.platform.upload == 'false' }}
+        run: |
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --no-remove-work-dir
@@ -0,0 +1,95 @@
+name: ci_py_only
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'test/**'
+      - 'conda/**'
+      - 'cmake/**'
+      - '.github/workflows/ci_py_only.yml'
+  pull_request:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      !contains(github.event.head_commit.message, 'skip ci')
+    steps:
+      - run: echo ok go
+
+  build:
+    runs-on: ubuntu-20.04
+    needs: activate
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: recursive
+      - name: Install C++ dependencies
+        run: |
+          sudo apt update
+          sudo apt-get install --no-install-recommends \
+          git cmake gcc g++ \
+          libboost-date-time-dev \
+          libboost-filesystem-dev \
+          libboost-iostreams-dev \
+          libboost-program-options-dev \
+          libboost-regex-dev \
+          libboost-system-dev \
+          libboost-thread-dev \
+          python3-all-dev python3-pip \
+          swig libpcre3-dev libxml2-dev \
+          libtbb-dev nlohmann-json3-dev \
+          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
+          libhdf5-dev libcgal-dev
+          
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+
+      - name: Build ifcopenshell
+        run: |
+          mkdir build && cd build
+          cmake \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_PREFIX_PATH=/usr \
+               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
+               -DCOLLADA_SUPPORT=Off \
+               "-DSCHEMA_VERSIONS=2x3;4" \
+               -DBUILD_CONVERT=Off \
+               -DGLTF_SUPPORT=On \
+               -DJSON_INCLUDE_DIR=/usr/include \
+               -DCGAL_INCLUDE_DIR=/usr/include \
+               -DGMP_INCLUDE_DIR=/usr/include \
+               -DMPFR_INCLUDE_DIR=/usr/include \
+               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+             ../cmake
+          sudo make -j $(nproc)
+          sudo make install
+
+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx
+
+      - name: Test
+        run: |
+          cd test
+          sudo /usr/bin/python tests.py
+          cd ../src/ifcopenshell-python
+          mv ifcopenshell ifcopenshell-local # Force testing on installed module
+          make test
@@ -41,7 +41,7 @@ jobs:
          python3-all-dev python3-pip \
          swig libpcre3-dev libxml2-dev \
          libtbb-dev nlohmann-json3-dev \
-          liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev \
+          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
          libhdf5-dev libcgal-dev
          
      - name: ccache
@@ -53,17 +53,16 @@ jobs:
          cmake \
               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-               -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
-               -DOCC_INCLUDE_DIR=/usr/include/oce \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
               -DCOLLADA_SUPPORT=Off \
-               "-DSCHEMA_VERSIONS=2x3;4" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3" \
               -DGLTF_SUPPORT=On \
               -DJSON_INCLUDE_DIR=/usr/include \
               -DCGAL_INCLUDE_DIR=/usr/include \
@@ -83,6 +82,8 @@ jobs:
          sudo /usr/bin/python -m pip install src/bcf
          sudo /usr/bin/python -m pip install pytest
          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx

      - name: Test
        run: |
@@ -18,14 +18,24 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2
        with:
-          lfs: true
-      - 
-        name: Update ubuntu
+          submodules: recursive
+      - name: Install C++ dependencies
        run: |
          sudo apt update
-          sudo apt-get install git cmake gcc g++ libboost1.67-all-dev python3-all-dev swig libpcre3-dev libxml2-dev
-          sudo apt-get install liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev \
-          libhdf5-dev
+          sudo apt-get install --no-install-recommends \
+          git cmake gcc g++ \
+          libboost-date-time-dev \
+          libboost-filesystem-dev \
+          libboost-iostreams-dev \
+          libboost-program-options-dev \
+          libboost-regex-dev \
+          libboost-system-dev \
+          libboost-thread-dev \
+          python3-all-dev python3-pip \
+          swig libpcre3-dev libxml2-dev \
+          libtbb-dev nlohmann-json3-dev \
+          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
+          libhdf5-dev libcgal-dev opencollada-dev
          
      - name: Build
        env:
@@ -39,15 +49,23 @@ jobs:
           -DCMAKE_PREFIX_PATH=/usr \
           -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
           -DBUILD_PACKAGE=On \
-           -DOCC_INCLUDE_DIR=/usr/include/oce \
+           -DOCC_INCLUDE_DIR=/usr/include/opencascade \
           -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
           -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
-           -DCOLLADA_SUPPORT=Off \
           -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
           -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
+           -DGLTF_SUPPORT=On \
+           -DJSON_INCLUDE_DIR=/usr/include \
+           -DCGAL_INCLUDE_DIR=/usr/include \
+           -DGMP_INCLUDE_DIR=/usr/include \
+           -DMPFR_INCLUDE_DIR=/usr/include \
+           -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+           -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
           -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+           -DOPENCOLLADA_INCLUDE_DIR=/usr/include/opencollada \
+           -DOPENCOLLADA_LIBRARY_DIR=/usr/lib/opencollada/ \
           ../cmake
          make -j $(nproc)
          make install
@@ -5,6 +5,15 @@
 /_installed-vs*-x*/
 /build/

+# output directories
+/cmake/out/
+/docs/out/
+/src/examples/out/
+/src/ifcmax/out/
+/src/ifcwrap/out/
+/src/qtviewer/out/
+
+
 /win/BuildDepsCache*.txt
 # IfcExpressParser residue
 /src/ifcexpressparser/express_parser.py
@@ -13,6 +22,7 @@ __pycache__
 *.py.bak
 # Visual Studio Code files
 .vscode
+.vs
 # PyCharm files
 .idea

@@ -57,3 +67,9 @@ htmlcov

 # Blender
 *.blend1
+
+# Sphinx
+_build/
+
+# IDS Docs
+src/ifcopenshell-python/test/build
@@ -8,3 +8,6 @@
 [submodule "src/svgfill"]
 	path = src/svgfill
 	url = https://github.com/IfcOpenShell/svgfill
+[submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
+	path = src/ifcopenshell-python/test/Sample-BIM-Files
+	url = https://github.com/IfcOpenShell/ids-test-files
@@ -1,19 +1,23 @@
 IfcOpenShell 
 ============
 IfcOpenShell is an open source ([LGPL]) software library for working with the Industry Foundation Classes ([IFC]) 
-file format. Currently supported IFC releases are [IFC2x3 TC1] and [IFC4 Add2 TC1].
+file format. Extensive geometric support is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1].
+Support for parsing is provided for IFC4x1, IFC4x2, and the IFC4x3 release candidates. Extending with support for
+arbitrary IFC schemas is possible at compile-time when using C++ and at run-time when using Python.

 For more information, see
 * [http://ifcopenshell.org](http://ifcopenshell.org)  
 * [http://academy.ifcopenshell.org](http://academy.ifcopenshell.org)

-[![Build Status](https://travis-ci.org/IfcOpenShell/IfcOpenShell.svg?branch=v0.6.0)](https://travis-ci.org/IfcOpenShell/IfcOpenShell)
+[![Build Status](https://travis-ci.com/IfcOpenShell/IfcOpenShell.svg?branch=v0.6.0)](https://travis-ci.com/IfcOpenShell/IfcOpenShell)
+
+[![Financial Contributors](https://opencollective.com/opensourcebim/tiers/badge.svg)](https://opencollective.com/opensourcebim/)

 Prerequisites
 -------------
 * Git
-* CMake (2.6 or newer)
-* Windows: [Visual Studio] 2008 or newer with C++ toolset (or [Visual C++ Build Tools]) or [MSYS2] + MinGW
+* CMake (3.1.3 or newer)
+* Windows: [Visual Studio] 2008 to 2019 (2022 not yet supported by dependency CMake) with C++ toolset (or [Visual C++ Build Tools]) or [MSYS2] + MinGW
 * *nix: GCC 4.7 or newer, or Clang (any version)

 Dependencies
@@ -33,7 +37,11 @@ Dependencies
 Building IfcOpenShell
 ---------------------

-**Note:** The path where the source code is cloned to can contain spaces but non-ASCII characters are very likely to cause problems with the build.
+Note 1: The path where the source code is cloned to can contain spaces but non-ASCII characters are very likely to cause problems with the build.
+
+Note 2: If you had not used `git clone --recursive https://github.com/IfcOpenShell/IfcOpenshell.git`, update the submodules by running `git submodule init & git submodule update`.
+
+Note 3: Be careful with special characters is the path when using the nix or win build scripts, because the OpenCASCADE build will fail on paths containing ++ and likely other situations.

 ### Compiling on Windows
 The preferred way to fetch and build this project's dependencies is to use the build scripts
@@ -81,17 +89,26 @@ The following instructions are for Ubuntu, modify as required for other operatin
 can be experimented with and studied for pointers for other operating systems, but note that this script is not currently
 meant to be used for a typical IfcOpenShell workspace setup.

-Note: where `make -j` is written, add a number roughly equal to the amount of CPU cores + 1.
+Note 1: It is recommeded to use OCCT for IfcOpenShell. You could use OCE as well, but sometimes it may lag behind OCCT and 
+therefore not compile with the latest IfcOpenShell.
+
+Note 2: where `make -j` is written, add a number roughly equal to the amount of CPU cores + 1.

 **1)** Install most of the prerequisites and dependencies:

-    $ sudo apt-get install git cmake gcc g++ libboost-all-dev
+    $ sudo apt-get install git cmake gcc g++ libboost-all-dev libcgal-dev

-**2a)** Either use an OCE package from your operating system's software repository
+**2a)** Either use an OCCT package from your operating system's software repository
+
+    $ sudo apt-get install libocct-data-exchange-dev libocct-draw-dev libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev
+
+**2b)** or, if OCCT is not available or the latest code is wanted, obtain and compile OCCT from https://dev.opencascade.org/release
+
+**2c)** or, if you'd like to try using OCE, use the package from your operating system's software repository

    $ sudo apt-get install liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev

-**2b)** or (if not available, or the latest code is wanted) compile OCE yourself (note that the build takes a long time):
+**2d)** or if OCE is not available, or the latest code is wanted, compile OCE yourself (note that the build takes a long time)

    $ sudo apt-get install libftgl-dev libtbb2 libtbb-dev libgl1-mesa-dev libfreetype6-dev
    $ git clone https://github.com/tpaviot/oce.git
@@ -101,8 +118,6 @@ Note: where `make -j` is written, add a number roughly equal to the amount of CP
    $ make -j
    $ sudo make install

-**2c)** or obtain and compile OCCT from https://dev.opencascade.org/release
-
 **3)** For building IfcConvert with COLLADA (.dae) support (on by default), OpenCOLLADA is needed:

    $ sudo apt-get install libpcre3-dev libxml2-dev
@@ -128,7 +143,13 @@ dependencies' paths. `OCC_INCLUDE_DIR` might be needed to set also. `OPENCOLLADA
    $ cmake ../cmake -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/ \
          -DOPENCOLLADA_INCLUDE_DIR="/usr/local/include/opencollada" \
          -DOPENCOLLADA_LIBRARY_DIR="/usr/local/lib/opencollada"  \
-          -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/
+          -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/ \
+          -DCGAL_INCLUDE_DIR=/usr/include \
+          -DGMP_INCLUDE_DIR=/usr/include \
+          -DMPFR_INCLUDE_DIR=/usr/include \
+          -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+          -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+          -DHDF5_SUPPORT=Off
    $ make -j

 If all worked out correctly you can now use IfcOpenShell. See the examples below.
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>blenderbim-nightly</id>
+    <version>blenderbim_build_version</version>
+    <packageSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</packageSourceUrl>
+    <owners>fbpyr</owners>
+    <!-- == SOFTWARE SPECIFIC SECTION == -->
+    <title>BlenderBIM install nightly</title>
+    <authors>Dion Moult and many more, see: https://github.com/IfcOpenShell/IfcOpenShell/graphs/contributors</authors>
+    <projectUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectUrl>
+    <iconUrl>https://rawcdn.githack.com/fbpyr/IfcOpenShell/9662598ad4a7e4b6cd8980e430d07263835d0eda/choco/blenderbim/blenderbim.png</iconUrl>
+    <!-- <copyright>Year Software Vendor</copyright> -->
+    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.7.0/COPYING</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
+    <docsUrl>https://blenderbim.org/docs/</docsUrl>
+    <!--<mailingListUrl></mailingListUrl>-->
+    <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
+    <tags>blender bim blenderbim python opensource foss</tags>
+    <summary>opensource bim</summary>
+    <description>opensource bim addon for blender</description>
+    <!-- <releaseNotes>__REPLACE_OR_REMOVE__MarkDown_Okay</releaseNotes> -->
+
+    <dependencies>
+      <dependency id="blender" version="latest_blender_version_maj_min_pat" />
+      <dependency id="7zip"    version="22.1"/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
@@ -0,0 +1,79 @@
+import datetime
+import re
+import sys
+from urllib import request
+
+
+def request_repo_info(url: str):
+    req  = request.Request(url)
+    resp = request.urlopen(req)
+    if not resp.status == 200:
+        print(f"[ERROR] could not contact server: {url}")
+        quit(1)
+    return resp
+
+
+if sys.argv[1] == "--do_choco_release?":
+    now = datetime.datetime.now()
+    blenderbim_date = now.strftime("%y%m%d")
+    url = "https://github.com/IfcOpenShell/IfcOpenShell/releases/latest"
+    resp = request_repo_info(url)
+    if blenderbim_date in resp.url:
+        print("do_choco_release", end="")
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min_pat?":
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        print(found[0], end="")
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min?":
+    re_blender_version_min_maj = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj, html_txt)
+    if found:
+        print(found[0], end="")
+
+
+elif sys.argv[1] == "--latest_blender_python_version_maj_min?":
+    # get latest blender version first
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        latest_blender_version_tag = f"v{found[0]}"
+        re_blender_python_version_maj_min = r"SET\(PYTHON_VERSION (\d+.\d+) "
+        url = f"https://raw.githubusercontent.com/blender/blender/{latest_blender_version_tag}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+        resp = request_repo_info(url)
+        html_txt = str(resp.read())
+        found = re.findall(re_blender_python_version_maj_min, html_txt)
+        if found:
+            print(found[0], end="")
+
+
+elif sys.argv[1] == "--pyver?":
+    # get latest blender version first
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        latest_blender_version_tag = f"v{found[0]}"
+        re_blender_python_version_maj_min = r"SET\(PYTHON_VERSION (\d+.\d+) "
+        url = f"https://raw.githubusercontent.com/blender/blender/{latest_blender_version_tag}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+        resp = request_repo_info(url)
+        html_txt = str(resp.read())
+        found = re.findall(re_blender_python_version_maj_min, html_txt)
+        if found:
+            print(f"py{found[0].replace('.', '')}", end="")
+
@@ -0,0 +1,49 @@
+import os
+from pathlib import Path
+
+
+print("[INFO] inserting dynamic chocolatey package parameters")
+HERE_DIR = Path(__file__).parent.absolute()
+# print(f"[INFO] HERE_DIR: {HERE_DIR}")
+
+topics = {
+    "spec": {
+        "path": HERE_DIR / "blenderbim.nuspec",
+        "env_vars": {
+            "latest_blender_version_maj_min_pat",
+            "blenderbim_build_version",
+        },
+    },
+    "install": {
+        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
+        "env_vars": {
+            "url_blenderbim_py310_win_zip",
+            "sha256sum_blenderbim_py310_win_zip",
+            "latest_blender_version_maj_min",
+        },
+    },
+    "uninstall": {
+        "path": HERE_DIR / "tools" / "chocolateyuninstall.ps1",
+        "env_vars": {
+            "latest_blender_version_maj_min",
+        },
+    },
+}
+
+for topic, info in topics.items():
+    print(f"[INFO] {topic}:")
+    for env_var_name in info["env_vars"]:
+        print(f"[INFO] {env_var_name} exists?: {os.environ[env_var_name]}")
+
+    with open(info["path"], encoding="utf-8") as txt:
+        content = txt.read()
+
+    for env_var_name in info["env_vars"]:
+        # print(f"[INFO] replace: {env_var_name}")
+        content = content.replace(env_var_name, os.environ[env_var_name])
+
+    with open(info["path"], "w", encoding="utf-8") as txt:
+        txt.write(content)
+        print(f"[INFO] written: {info['path']}")
+
+print("[INFO] inserting dynamic chocolatey package parameters successful")
@@ -0,0 +1,11 @@
+$processName      = "blender"
+$blenderIsRunning = Get-Process -Name $processName -ErrorAction SilentlyContinue
+
+if($blenderIsRunning -eq $null) {
+    echo "Blender is not running ready for next action."
+}
+else {
+    Write-Warning "$processName is still running - installer cannot safely proceed to next action."
+    Write-Warning "Please retry after closing all running blender applications."
+    exit 1
+}
@@ -0,0 +1,29 @@
+$ErrorActionPreference = 'Stop'
+
+$url64          = 'url_blenderbim_py310_win_zip'
+$checksum64     = 'sha256sum_blenderbim_py310_win_zip'
+$checksumType64 = 'sha256'
+
+$appDataUserDir  = [System.Environment]::GetEnvironmentVariable('appdata')
+$unzipTargetDir  = "$appDataUserDir\Blender Foundation\Blender\latest_blender_version_maj_min\scripts\addons"
+
+$chocoBaseDir    = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall')
+$addonEnable     = "$chocoBaseDir\lib\blenderbim\tools\enable_blenderbim_addon.py"
+
+$programFilesDir = [System.Environment]::GetEnvironmentVariable('ProgramFiles')
+$blenderExePath  = "$env:ProgramFiles\Blender Foundation\Blender latest_blender_version_maj_min\blender.exe"
+
+$processName      = "blender"
+$blenderIsRunning = Get-Process -Name $processName -ErrorAction SilentlyContinue
+
+
+if($blenderIsRunning -eq $null) {
+    echo "attempting to install blenderbim."
+    Install-ChocolateyZipPackage -PackageName $env:ChocolateyPackageName -Url64 $url64 -Checksum64 $checksum64 -checksumType $checksumType64 -UnzipLocation $unzipTargetDir
+    Start-Process -FilePath  $blenderExePath -ArgumentList "-b", "-y", "--python", "$addonEnable"
+}
+else {
+    Write-Warning "$processName is still running - blenderbim cannot be safely installed."
+    Write-Warning "Please retry after closing all running blender applications."
+    exit 1
+}
@@ -0,0 +1,22 @@
+$appDataUserDir = [System.Environment]::GetEnvironmentVariable('appdata')
+$unzippedDir = "$appDataUserDir\Blender Foundation\Blender\latest_blender_version_maj_min\scripts\addons\blenderbim"
+
+$chocoBaseDir    = [System.Environment]::GetEnvironmentVariable('ChocolateyInstall')
+$addonDisable     = "$chocoBaseDir\lib\blenderbim\tools\disable_blenderbim_addon.py"
+
+$programFilesDir = [System.Environment]::GetEnvironmentVariable('ProgramFiles')
+$blenderExePath  = "$env:ProgramFiles\Blender Foundation\Blender latest_blender_version_maj_min\blender.exe"
+
+$processName      = "blender"
+$blenderIsRunning = Get-Process -Name $processName -ErrorAction SilentlyContinue
+
+if($blenderIsRunning -eq $null) {
+    echo "attempting to uninstall blenderbim."
+    Start-Process -FilePath $blenderExePath -ArgumentList "-b", "-y", "--python", "$addonDisable"
+    Remove-Item -LiteralPath $unzippedDir -Force -Recurse
+}
+else {
+    Write-Warning "$processName is still running - blenderbim cannot be safely uninstalled."
+    Write-Warning "Please retry after closing all running blender applications."
+    exit 1
+}
@@ -0,0 +1,8 @@
+import bpy
+
+
+bpy.ops.preferences.addon_disable(module='blenderbim')
+bpy.ops.wm.save_userpref()
+
+print("disabled blenderbim addon successfully.")
+
@@ -0,0 +1,8 @@
+import bpy
+
+
+bpy.ops.preferences.addon_enable(module='blenderbim')
+bpy.ops.wm.save_userpref()
+
+print("enabled blenderbim addon successfully.")
+
@@ -38,7 +38,7 @@ MESSAGE(STATUS "Autodesk 3ds Max SDK found at ${max_sdk}")
 set(HAS_MAX TRUE)
 endif()
 endforeach()
-
+OPTION(MINIMAL_BUILD "The build is to make a minimal version of IFC converter from OCCT into IFC." OFF)
 OPTION(COLLADA_SUPPORT "Build IfcConvert with COLLADA support (requires OpenCOLLADA)." ON)
 OPTION(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 OPTION(ENABLE_BUILD_OPTIMIZATIONS "Enable certain compiler and linker optimizations on RelWithDebInfo and Release builds." OFF)
@@ -53,6 +53,7 @@ OPTION(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 OPTION(USE_VLD "Use Visual Leak Detector for debugging memory leaks, MSVC-only." OFF)
 OPTION(USE_MMAP "Adds a command line options to parse IFC files from memory mapped files using Boost.Iostreams" OFF)
 OPTION(BUILD_SHARED_LIBS "Build IfcParse and IfcGeom as shared libs (SO/DLL)." OFF)
+OPTION(MSVC_PARALLEL_BUILD "Multi-threaded compilation in Microsoft Visual Studio (/MP)" OFF)
 if (${HAS_MAX})
 OPTION(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 endif()
@@ -60,9 +61,18 @@ if (${BUILD_CONVERT})
 OPTION(GLTF_SUPPORT "Build IfcConvert with glTF support (requires json.hpp)." OFF)
 endif()
 OPTION(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
+OPTION(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)

-# TODO QtViewer is deprecated ATM as it uses the 0.4 API
-# OPTION(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer (requires Qt 4 framework)." OFF)
+IF(NOT CMAKE_BUILD_TYPE)
+	SET(CMAKE_BUILD_TYPE "Release")
+ENDIF()
+
+if(MSVC AND MSVC_PARALLEL_BUILD)
+	add_definitions("/MP")
+endif()
+
+# QtViewer requires Qt5
+OPTION(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF)
 include(GNUInstallDirs)
 if((BUILD_CONVERT OR BUILD_GEOMSERVER OR BUILD_IFCPYTHON) AND (NOT BUILD_IFCGEOM))
    message(STATUS "'IfcGeom' is required with current outputs")
@@ -116,6 +126,7 @@ ENDMACRO()

 UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
+if (NOT MINIMAL_BUILD)
 UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
@@ -125,17 +136,20 @@ UNIFY_ENVVARS_AND_CACHE(PYTHON_EXECUTABLE)
 UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
+endif()
 UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
 UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)

+if (NOT MINIMAL_BUILD)
 UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
+endif()

-if (GLTF_SUPPORT AND BUILD_CONVERT)
+if (NOT MINIMAL_BUILD AND GLTF_SUPPORT AND BUILD_CONVERT)
 UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
 FIND_FILE(json_hpp "json.hpp" ${JSON_INCLUDE_DIR}/nlohmann)
 IF(json_hpp)
@@ -144,6 +158,7 @@ ELSE()
 	MESSAGE(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
 ENDIF()
 add_definitions(-DWITH_GLTF)
+set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()

 # Set INSTALL_RPATH for target
@@ -195,11 +210,14 @@ if(USE_MMAP)
    add_definitions(-DUSE_MMAP)
 endif()

+if (NOT MINIMAL_BUILD)
 # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
-find_package(LibXml2 REQUIRED)
+  find_package(LibXml2 REQUIRED)
+endif()

-if (IFCXML_SUPPORT)
+if (NOT MINIMAL_BUILD AND IFCXML_SUPPORT)
    add_definitions(-DWITH_IFCXML)
+	set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML)
 endif()

 FIND_PACKAGE(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
@@ -339,7 +357,7 @@ endif()

 endif(BUILD_IFCGEOM)

-IF(COLLADA_SUPPORT)
+IF(NOT MINIMAL_BUILD AND COLLADA_SUPPORT)
 	# Find OpenCOLLADA
 	IF("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
 		MESSAGE(STATUS "No OpenCOLLADA include directory specified")
@@ -371,6 +389,8 @@ IF(COLLADA_SUPPORT)
 	IF(COLLADASWStreamWriter_h)
 		MESSAGE(STATUS "OpenCOLLADA header files found")
 		ADD_DEFINITIONS(-DWITH_OPENCOLLADA)
+		set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
+
 		SET(OPENCOLLADA_LIBRARY_NAMES
 			GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
 			OpenCOLLADAStreamWriter UTF buffer ftoa
@@ -417,7 +437,7 @@ IF(COLLADA_SUPPORT)
 	ENDIF()
 ENDIF()

-if(HDF5_SUPPORT)
+if(NOT MINIMAL_BUILD AND HDF5_SUPPORT)
    IF("${HDF5_INCLUDE_DIR}" STREQUAL "")
 		MESSAGE(STATUS "No HDF5 include directory specified")
 	ElSE()
@@ -432,26 +452,60 @@ if(HDF5_SUPPORT)

    if (HDF5_LIBRARY_DIR)
    	# result of the HDF5 ctest package
-    	
-        if (WIN32)
-        	set(zlib_post lib)
-        	set(lib_ext lib)
-        else()
-        	set(lib_ext a)
+        # Find zlib using cmake find_library. How should this be implemented?
+        # FIND_LIBRARY(NAMES z libz libz_debug PATHS ... NO_DEFAULT_PATH)
+
+
+        if ("$ENV{CONDA_BUILD}" STREQUAL "")
+            # result of the HDF5 ctest package
+
+            if (WIN32)
+                set(zlib_post lib)
+                set(lib_ext lib)
+            else()
+                set(lib_ext a)
+            endif()
+
+            if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+                set(debug_postfix "_debug")
+            endif()
+
+            SET(HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp${debug_postfix}.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5${debug_postfix}.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libz${zlib_post}${debug_postfix}.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libsz${debug_postfix}.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libaec${debug_postfix}.${lib_ext}"
+                    )
+
+        ELSE()
+            MESSAGE(STATUS "Packaging hdf5 and zlib for conda distribution")
+            if (WIN32)
+                # Windows
+                set(zlib_post zlib)
+                set(lib_ext lib)
+            elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                # macOS
+                set(zlib_post libz)
+                set(lib_ext dylib)
+            else()
+                # linux
+                set(zlib_post libz)
+                set(lib_ext so)
+            endif()
+
+            SET(HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
+                    )
        endif()
-        
-        SET(HDF5_LIBRARIES 
-            "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libz${zlib_post}.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libsz.${lib_ext}"
-            "${HDF5_LIBRARY_DIR}/libaec.${lib_ext}"
-        )
+
    endif()
-    
+
    if (NOT HDF5_LIBRARIES)
    	# debian default
-    	
+
        SET(HDF5_LIBRARIES
            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
@@ -462,12 +516,9 @@ if(HDF5_SUPPORT)
    endif()
    
    add_definitions(-DWITH_HDF5)
+	set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
 endif()

-IF(NOT CMAKE_BUILD_TYPE)
-	SET(CMAKE_BUILD_TYPE "Release")
-ENDIF()
-
 if(ENABLE_BUILD_OPTIMIZATIONS)
 	if(MSVC)
        # NOTE: RelWithDebInfo and Release use O2 (= /Ox /Gl /Gy/ = Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) by default,
@@ -569,13 +620,16 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
 endfunction()

 if(NOT SCHEMA_VERSIONS)
-    set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4")
+    set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4" "4x3")
 endif()

 foreach(s ${SCHEMA_VERSIONS})
 	add_definitions(-DHAS_SCHEMA_${s})
 endforeach()

+string(REPLACE ";" ")(" schema_version_seq "(${SCHEMA_VERSIONS})")
+ADD_DEFINITIONS(-DSCHEMA_SEQ=${schema_version_seq})
+
 if(COMPILE_SCHEMA)
 	# @todo, this appears to be untested at the moment

@@ -645,7 +699,7 @@ if (BUILD_IFCGEOM)
 	endforeach()
 	set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 endif()
-if (BUILD_CONVERT)
+if (BUILD_CONVERT OR BUILD_IFCPYTHON)
 	foreach(s ${SCHEMA_VERSIONS})
 		set(SERIALIZER_SCHEMA_LIBRARIES ${SERIALIZER_SCHEMA_LIBRARIES} Serializers_ifc${s})
 	endforeach()
@@ -692,7 +746,7 @@ TARGET_LINK_LIBRARIES(IfcParse ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} ${LIBXML2_
 if (BUILD_IFCGEOM)

 # IfcGeom
-file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h)
+file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h ../src/ifcgeom/*.i)
 file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
 set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})

@@ -718,7 +772,7 @@ TARGET_LINK_LIBRARIES(IfcGeom IfcParse ${IFCGEOM_SCHEMA_LIBRARIES} ${CMAKE_THREA

 endif(BUILD_IFCGEOM)

-if (BUILD_CONVERT)
+if (BUILD_CONVERT OR BUILD_IFCPYTHON)

 # Serializers
 file(GLOB SERIALIZERS_H_FILES ../src/serializers/*.h)
@@ -739,6 +793,10 @@ set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS $

 TARGET_LINK_LIBRARIES(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES})

+endif(BUILD_CONVERT or BUILD_IFCPYTHON)
+
+if (BUILD_CONVERT)
+
 # IfcConvert
 file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
 file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
@@ -764,7 +822,7 @@ INSTALL(TARGETS IfcConvert
 endif(BUILD_CONVERT)

 # IfcGeomServer
-if(BUILD_GEOMSERVER)
+if(NOT MINIMAL_BUILD AND BUILD_GEOMSERVER)

 file(GLOB CPP_FILES ../src/ifcgeomserver/*.cpp)
 file(GLOB H_FILES ../src/ifcgeomserver/*.h)
@@ -784,21 +842,20 @@ INSTALL(TARGETS IfcGeomServer

 endif()

+if (ADD_COMMIT_SHA)
 find_package (Git)
 if (GIT_FOUND)
 	message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
 	execute_process(
-		COMMAND ${GIT_EXECUTABLE} show -s --pretty=%D HEAD
+		COMMAND ${GIT_EXECUTABLE} branch --contains HEAD
 		OUTPUT_VARIABLE git_branches
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	string(REPLACE ", " ";" git_branch_list "${git_branches}")
-	string(REPLACE " -> " ";" git_branch_list "${git_branch_list}")
+	string(REPLACE "\n" ";" git_branch_list "${git_branches}")
 	foreach(git_branch_candidate IN ITEMS ${git_branch_list})
-		if (NOT git_branch_candidate MATCHES "/")
-			if (NOT git_branch_candidate MATCHES "^HEAD$")
-				set(git_branch ${git_branch_candidate})
-			endif()
+		string(STRIP "${git_branch_candidate}" git_branch_candidate_2)
+		if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
+			set(git_branch ${git_branch_candidate_2})
 		endif()
 	endforeach()
 	execute_process(
@@ -806,11 +863,12 @@ if (GIT_FOUND)
 		OUTPUT_VARIABLE git_sha
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	message(STATUS "IfcOpenShell branch ${git_branch}")
-	message(STATUS "IfcOpenShell commit ${git_sha}")
+	message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
+	message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
 	add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
 	add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
 endif()
+endif()

 # Documentation
 IF(BUILD_DOCUMENTATION)
@@ -818,7 +876,7 @@ IF(BUILD_DOCUMENTATION)
 	ADD_SUBDIRECTORY(../docs docs)
 ENDIF()

-IF(BUILD_IFCPYTHON)
+IF(NOT MINIMAL_BUILD AND BUILD_IFCPYTHON)
 	ADD_SUBDIRECTORY(../src/ifcwrap ifcwrap)
 ENDIF()

@@ -826,11 +884,12 @@ IF(BUILD_EXAMPLES)
 	ADD_SUBDIRECTORY(../src/examples examples)
 ENDIF()

-IF(BUILD_IFCMAX)
+IF(NOT MINIMAL_BUILD AND BUILD_IFCMAX)
 	ADD_SUBDIRECTORY(../src/ifcmax ifcmax)
 ENDIF()
-
+if (NOT MINIMAL_BUILD)
 ADD_SUBDIRECTORY(../src/svgfill svgfill)
+endif()

 # CMake installation targets
 INSTALL(FILES ${IFCPARSE_H_FILES}
@@ -875,6 +934,9 @@ INSTALL(FILES  ${SERIALIZERS_S_FILES}
 )
 endif()

+IF(BUILD_QTVIEWER)
+    ADD_SUBDIRECTORY(../src/qtviewer qtviewer)
+endif()

 list(APPEND CPACK_SOURCE_IGNORE_FILES
  .git
@@ -0,0 +1,11 @@
+compile:
+	conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.4
+
+debug:
+	conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4
+
+install:
+	conda env create -f environment.yml
+
+update:
+	conda env update -n conda-build --file environment.yml --prune
@@ -1,29 +1,42 @@
 mkdir build && cd build

-REM Remove dot from PY_VER for use in library name
-REM From https://github.com/tpaviot/pythonocc-core/blob/master/ci/conda/bld.bat
 set MY_PY_VER=%PY_VER:.=%
+set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"

-cmake -G "NMake Makefiles" ^
- -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
- -DCMAKE_BUILD_TYPE=Release ^
- -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
- -DCMAKE_SYSTEM_PREFIX_PATH="%LIBRARY_PREFIX%" ^
- -DPYTHON_EXECUTABLE="%PYTHON%" ^
- -DPYTHON_INCLUDE_DIR="%PREFIX%"/include ^
- -DPYTHON_LIBRARY="%PREFIX%"/libs/python%MY_PY_VER%.lib ^
- -DBOOST_LIBRARYDIR="%LIBRARY_PREFIX%\lib" ^
- -DBOOST_INCLUDEDIR="%LIBRARY_PREFIX%\include" ^
- -DOCC_INCLUDE_DIR="%LIBRARY_PREFIX%\include\oce" ^
- -DOCC_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^
- -DCOLLADA_SUPPORT=Off ^
- -DBUILD_EXAMPLES=Off ^
- -DBUILD_GEOMSERVER=Off ^
- -DBUILD_CONVERT=Off ^
- ../cmake
- 
+cmake -G "Ninja" ^
+ -D CMAKE_BUILD_TYPE:STRING=Release ^
+ -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
+ -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
+ -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
+ -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include\opencascade" ^
+ -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D CGAL_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
+ -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D COLLADA_SUPPORT=OFF ^
+ -D HDF5_SUPPORT=ON ^
+ -D HDF5_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^
+ -D HDF5_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^
+ -D JSON_INCLUDE_DIR="%LIBRARY_PREFIX%\include" ^
+ -D PYTHON_INCLUDE_DIR=%PREFIX%\include ^
+ -D PYTHON_EXECUTABLE:FILEPATH=%PREFIX%\python.exe ^
+ -D PYTHON_LIBRARY:FILEPATH="%PREFIX%"\libs/python%MY_PY_VER%.lib ^
+ -D BUILD_IFCPYTHON=ON ^
+ -D BUILD_IFCGEOM=ON ^
+ -D COLLADA_SUPPORT:BOOL=OFF ^
+ -D BUILD_EXAMPLES:BOOL=OFF ^
+ -D BUILD_GEOMSERVER:BOOL=OFF ^
+ -D GLTF_SUPPORT:BOOL=OFF ^
+ -D BUILD_CONVERT:BOOL=ON ^
+ -D BUILD_IFCMAX:BOOL=OFF ^
+ -D IFCXML_SUPPORT:BOOL=OFF ^
+ -D BOOST_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D BOOST_INCLUDEDIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
+ -D BOOST_USE_STATIC_LIBS:BOOL=OFF ^
+ %SRC_DIR%/cmake
 if errorlevel 1 exit 1

-cmake --build . --target INSTALL --config Release
+:: Build and install
+cmake --build . -- install

 if errorlevel 1 exit 1
@@ -1,34 +1,44 @@
-# From https://github.com/tpaviot/pythonocc-core/blob/master/ci/conda/build.sh
-if [ "$PY3K" == "1" ]; then
-    MY_PY_VER="${PY_VER}m"
-else
-    MY_PY_VER="${PY_VER}"
+#!/bin/bash
+
+declare -a CMAKE_PLATFORM_FLAGS
+
+if [[ ${HOST} =~ .*linux.* ]]; then
+    CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE=$RECIPE_DIR/cross-linux.cmake)
 fi

 if [ `uname` == Darwin ]; then
-    PY_LIB="libpython${MY_PY_VER}.dylib"
-    export   CFLAGS="$CFLAGS   -Wl,-flat_namespace,-undefined,suppress"
-    export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
-    export  LDFLAGS="$LDFLAGS  -Wl,-flat_namespace,-undefined,suppress"
-else
-    PY_LIB="libpython${MY_PY_VER}.so"
+  export CFLAGS="$CFLAGS   -Wl,-flat_namespace,-undefined,suppress"
+  export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
+  export LDFLAGS="$LDFLAGS  -Wl,-flat_namespace,-undefined,suppress"
 fi

-mkdir build && cd build
-
-cmake \
- -DCMAKE_INSTALL_PREFIX=$PREFIX \
+cmake -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=$PREFIX \
+  ${CMAKE_PLATFORM_FLAGS[@]} \
 -DCMAKE_PREFIX_PATH=$PREFIX \
 -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
- -DOCC_INCLUDE_DIR=$PREFIX/include/oce \
+ -DPython3_FIND_STRATEGY=LOCATION \
+ -DPython3_FIND_FRAMEWORK=NEVER \
+ -DGMP_LIBRARY_DIR=$PREFIX/lib \
+ -DMPFR_LIBRARY_DIR=$PREFIX/lib \
+ -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \
 -DOCC_LIBRARY_DIR=$PREFIX/lib \
- -DPYTHON_EXECUTABLE:FILEPATH=$PYTHON \
- -DPYTHON_INCLUDE_DIR:PATH=$PREFIX/include/python$MY_PY_VER \
- -DPYTHON_LIBRARY:FILEPATH=$PREFIX/lib/${PY_LIB} \
- -DCOLLADA_SUPPORT=Off \
- ../cmake
+ -DHDF5_SUPPORT:BOOL=ON \
+ -DHDF5_INCLUDE_DIR=$PREFIX/include \
+ -DHDF5_LIBRARY_DIR=$PREFIX/lib \
+ -DJSON_INCLUDE_DIR=$PREFIX/include \
+ -DCGAL_INCLUDE_DIR=$PREFIX/include \
+ -DCOLLADA_SUPPORT=0 \
+ -DBUILD_EXAMPLES:BOOL=OFF \
+ -DIFCXML_SUPPORT:BOOL=OFF \
+ -DBUILD_CONVERT:BOOL=ON \
+ -DBUILD_IFCPYTHON:BOOL=ON \
+ -DBUILD_IFCGEOM:BOOL=ON \
+ -DBUILD_GEOMSERVER:BOOL=OFF \
+ -DBOOST_USE_STATIC_LIBS:BOOL=OFF \
+ ./cmake

-make -j$CPU_COUNT _ifcopenshell_wrapper
-cd ifcwrap
-make install/local
+ninja
+
+ninja install
@@ -0,0 +1,2 @@
+CONDA_BUILD_SYSROOT:
+  - /opt/MacOSX10.13.sdk       # [osx]
@@ -0,0 +1,16 @@
+# this one is important
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_PLATFORM Linux)
+
+# specify the cross compiler
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+
+# where is the target environment
+set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot)
+
+# search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -0,0 +1,14 @@
+name: conda-build
+channels:
+  - conda-forge
+dependencies:
+  - conda-build
+  - conda-verify
+  - anaconda-client
+  - ninja
+  - doxygen
+  - ripgrep
+  - pip
+  - pip:
+      - --extra-index-url https://lief.s3-website.fr-par.scw.cloud/latest
+      - lief==0.13.0.dev0
@@ -1,36 +1,77 @@
+{% set name = "ifcopenshell" %}
+{% set version = "0.7.0" %}
+{% set occt_version = "7.6.2" %}
+{% set cgal_cpp_version = "5.3" %}
+{% set hdf5_version = "1.12.1" %}
+
 package:
-  name: ifcopenshell
-  version: "0.6.0a1"
+  name: {{ name }}
+  version: {{ version }}

 source:
-  git_rev: "v0.6.0a1"
-  git_url: https://github.com/IfcOpenShell/IfcOpenShell
+  path: ..

 build:
-  number: 0
-  features:
-    - vc9     # [win and py27]
-    - vc10    # [win and py34]
-    - vc14    # [win and py35]
-    - vc14    # [win and py36]
+  binary_relocation: false [osx]

 requirements:
  build:
-    - gcc     # [osx]
-    - make
-    - python
-    - oce ==0.18.3
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
+    - ninja >=1.10.2
    - cmake
-    - swig >=3.0.9
-    - libboost
-    - icu
-  run:
-    - libgcc  # [osx]
+    - swig >=4.0.2
+
+  host:
    - python
-    - oce ==0.18.3
-    - libboost
-    - icu
+    - occt >={{ occt_version }}
+    - hdf5 >={{ hdf5_version }}
+    - cgal-cpp >={{ cgal_cpp_version }}
+    - nlohmann_json
+    - libxml2
+
+  run:
+    - python
+    - occt >={{ occt_version }}
+    - cgal-cpp >={{ cgal_cpp_version }}
+    - hdf5 >={{ hdf5_version }}
+    - lark-parser
+    - deepdiff
+    - requests
+    - nlohmann_json
+    - isodate
+    - numpy >=1.17
+
+test:
+  imports:
+    - ifcopenshell
+  requires:
+    - pytest
+    - pytest-cov
+    - numpy
+    - lxml
+    - isodate
+    - lark
+    - networkx
+    - xmlschema
+  #source_files:
+  #  - src/ifcopenshell-python/test/api
+  #  - src/ifcopenshell-python/test/util
+  #  - src/ifcopenshell-python/test/bootstrap.py
+  #  - src/ifcopenshell-python/test/test_file.py
+  #  - src/ifcopenshell-python/test/test_wall_opening.py
+  #  - src/ifcopenshell-python/test/__init__.py
+  #commands:
+  #  #- pip install bcf-client
+  #  - cd ../src/ifcopenshell-python/test && pytest -p no:pytest-blender

 about:
  home: http://ifcopenshell.org
-  license: LGPL
+  license: LGPL-3.0-or-later
+  license_file: COPYING
+  summary: 'IfcOpenShell is a library to support the IFC file format'
+  description: |
+    IfcOpenShell is an open source (LGPL) software library for 
+    working with the Industry Foundation Classes (IFC) file format.
+  doc_url: http://ifcopenshell.org/
+  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
@@ -70,6 +70,7 @@ logger.addHandler(ch)

 PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
+ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")

 PYTHON_VERSIONS = ["3.6.14", "3.7.12", "3.8.12", "3.9.7", "3.10.0"]
 JSON_VERSION = "v3.6.1"
@@ -137,7 +138,7 @@ IFCOS_NUM_BUILD_PROCS = os.getenv("IFCOS_NUM_BUILD_PROCS", multiprocessing.cpu_c

 CMAKE_DIR = os.path.realpath(os.path.join("..", "cmake"))

-path = ["..", "build", platform.system()]
+path = ["..", "build", platform.system(), platform.machine()]
 if TOOLSET:
    path.append(TOOLSET)
 DEFAULT_DEPS_DIR = os.path.realpath(os.path.join(*path))
@@ -258,7 +259,7 @@ def run(cmds, cwd=None):
        print("-" * 70)
        print(stderr)
        print("-" * 70)
-        raise Exception(f"Command `{' '.join(cmds)}` returned exit code {proc.returncode}")
+        raise RuntimeError(f"Command `{' '.join(cmds)}` returned exit code {proc.returncode}")

    return stdout.strip()

@@ -507,7 +508,7 @@ if USE_OCCT and "occ" in targets:
            "-DBUILD_MODULE_Draw=0",
            "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off"
        ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
        download_name = "occt",
        download_tool=download_tool_git,
        patch=None if OCCT_VERSION >= "7.4" else "./patches/occt/enable-exception-handling.patch",
@@ -579,13 +580,25 @@ if "python" in targets and not USE_CURRENT_PYTHON_VERSION:
        PYTHON_CONFIGURE_ARGS = ["--disable-static", "--enable-shared"]

    for PYTHON_VERSION in PYTHON_VERSIONS:
-        build_dependency(
-            f"python-{PYTHON_VERSION}",
-            "autoconf",
-            PYTHON_CONFIGURE_ARGS,
-            f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
-            f"Python-{PYTHON_VERSION}.tgz"
-        )
+        try:
+            build_dependency(
+                f"python-{PYTHON_VERSION}",
+                "autoconf",
+                PYTHON_CONFIGURE_ARGS,
+                f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
+                f"Python-{PYTHON_VERSION}.tgz"
+            )
+        except RuntimeError as e:
+            # Sometimes setting up modules such as pip/lzma can cause
+            # the python installer script to return a non zero exit
+            # code where actually the headers and dynamic libraries
+            # are installed correctly. This is all we need so we catch
+            # the exception and only reraise if a partially successful
+            # install is not detected.
+            if not os.path.exists(
+                os.path.join(DEPS_DIR, "install", f"python-{PYTHON_VERSION}")
+            ):
+                raise e

    os.environ["CXXFLAGS"] = OLD_CXX_FLAGS
    os.environ["CFLAGS"] = OLD_C_FLAGS
@@ -652,13 +665,12 @@ if "cgal" in targets:
 cecho("Building IfcOpenShell:", GREEN)

 IFCOS_DIR = os.path.join(DEPS_DIR, "build", "ifcopenshell")
-if os.path.exists(IFCOS_DIR):
-    shutil.rmtree(IFCOS_DIR)
-os.makedirs(IFCOS_DIR)
-
+if os.environ.get("NO_CLEAN", "").lower() not in {"1", "on", "true"}:
+    if os.path.exists(IFCOS_DIR):
+        shutil.rmtree(IFCOS_DIR)
+os.makedirs(IFCOS_DIR, exist_ok=True)
 executables_dir = os.path.join(IFCOS_DIR, "executables")
-if not os.path.exists(executables_dir):
-    os.makedirs(executables_dir)
+os.makedirs(executables_dir, exist_ok=True)

 logger.info("\rConfiguring executables...")

@@ -680,6 +692,7 @@ cmake_args = [
    "-DGLTF_SUPPORT="                  "ON",
    "-DJSON_INCLUDE_DIR="              f"{DEPS_DIR}/install/json",
    "-DBoost_NO_BOOST_CMAKE="          "On",
+    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off")
 ]

 if "cgal" in targets:
@@ -761,15 +774,16 @@ if "IfcOpenShell-Python" in targets:
        if os.path.exists(cache_path):
            os.remove(cache_path)

-        os.environ["python_library_BASENAME"] = os.path.basename(python_library)
+        os.environ["PYTHON_LIBRARY_BASENAME"] = os.path.basename(python_library)

        run_cmake("",
            cmake_args + [
-                "-Dpython_library="          +python_library,
-                "-Dpython_executable="       +python_executable,
-                "-Dpython_include_DIR="      +python_include,
+                "-DPYTHON_LIBRARY="          +python_library,
+                "-DPYTHON_EXECUTABLE="       +python_executable,
+                "-DPYTHON_INCLUDE_DIR="      +python_include,
                "-DSWIG_EXECUTABLE="         f"{DEPS_DIR}/install/swig/bin/swig",
                "-DCMAKE_INSTALL_PREFIX="    f"{DEPS_DIR}/install/ifcopenshell/tmp",
+                "-DUSERSPACE_PYTHON_PREFIX=" +["Off", "On"][os.environ.get("PYTHON_USER_SITE", "").lower() in {"1", "on", "true"}]
            ], cmake_dir=CMAKE_DIR, cwd=python_dir)

        logger.info(f"\rBuilding python {python_version} wrapper...   ")
@@ -787,7 +801,12 @@ if "IfcOpenShell-Python" in targets:

    if USE_CURRENT_PYTHON_VERSION:
        python_info = sysconfig.get_paths()
-        compile_python_wrapper(platform.python_version(), python_info["purelib"], python_info["include"], sys.executable)
+        python_lib = os.path.join(
+            sysconfig.get_config_var('LIBDIR'), 
+            sysconfig.get_config_var('multiarchsubdir').replace("/", ""), 
+            sysconfig.get_config_var("INSTSONAME")
+        )
+        compile_python_wrapper(platform.python_version(), python_lib, python_info["include"], sys.executable)
    else:
        for python_version in PYTHON_VERSIONS:
            python_library = run([bash, "-c", f"ls    {DEPS_DIR}/install/python-{python_version}/lib/libpython*.*"])
@@ -646,7 +646,7 @@ class BcfXml:
    def get_comments(self, guid):
        comments = {}
        data = self._read_xml(os.path.join(guid, "markup.bcf"), "markup.xsd")
-        if "Comments" not in data["Topics"]:
+        if "Comments" not in data["Topic"]:
            return comments

        for item in data["Topic"]["Comments"].get("Comment", []):
@@ -46,7 +46,7 @@ class RelatedTopic:

 class HeaderFile:
    def __init__(self):
-        self.file_name = ""
+        self.filename = ""
        self.date = None
        self.reference = ""
        self.ifc_project = None
@@ -27,6 +27,10 @@ ifeq ($(PYVERSION), py39)
 PYLIBDIR:=python3.9
 PYNUMBER:=39
 endif
+ifeq ($(PYVERSION), py310)
+PYLIBDIR:=python3.10
+PYNUMBER:=31
+endif

 ifeq ($(PLATFORM), linux)
 ifeq ($(PYVERSION), py37)
@@ -41,6 +45,12 @@ EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/ei
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py39h5472131_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
 endif
+ifeq ($(PYVERSION), py310)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/linux-64/hpp-fcl-1.8.0-py310hdaf7e41_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/linux-64/eigenpy-2.6.11-py310hf3e5c9c_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py310h7c3ba0c_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/25/1e/19b46d8e8881fe0df2e20945d51919eeb1817836d62a90efa8506530e45c/lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
+endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/linux-64/octomap-1.9.7-h4bd325d_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2
@@ -59,6 +69,12 @@ EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eige
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py39ha641261_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
 endif
+ifeq ($(PYVERSION), py310)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-64/hpp-fcl-1.8.0-py310h651ac30_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/osx-64/eigenpy-2.6.11-py310hc03097c_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py310h509978a_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
+endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/osx-64/octomap-1.9.7-h940c156_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2
@@ -77,6 +93,12 @@ EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eige
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py39hefe7e4c_3.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
 endif
+ifeq ($(PYVERSION), py310)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/win-64/hpp-fcl-1.8.0-py310hc5a3c62_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/win-64/eigenpy-2.6.11-py310hbd43d28_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py310hc781a3c_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
+endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/win-64/assimp-5.0.1-hc2aa0de_6.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/win-64/octomap-1.9.7-h5362a0b_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2
@@ -93,9 +115,9 @@ endif
 	cp -r blenderbim/* dist/blenderbim/

 	# Provides IfcOpenShell Python functionality
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-$(PYNUMBER)-v0.7.0-9853d3d-$(PLATFORM)64.zip
-	cd dist/working && unzip ifcblender*
-	cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/blenderbim/libs/site/packages/
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-cb8cfd7-$(PLATFORM)64.zip
+	cd dist/working && unzip ifcopenshell-python*
+	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/

 	# See bug #812
 	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/blenderbim/occ_utils.py
@@ -121,6 +143,8 @@ endif
 	cd dist/working && . env/bin/activate && pip install babel
 	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
+	# Provides IFCTester functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifctester/ifctester dist/blenderbim/libs/site/packages/
 	# Provides IFCCOBie functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
 	# Provides IFCDiff functionality
@@ -133,6 +157,8 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
 	# Provides IFC5D functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
+	# Provides IFCCityJSON functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Provides Mustache templating in construction documentation
@@ -186,9 +212,9 @@ endif

 	# Required by IFCDiff
 	mkdir dist/working
-	cd dist/working && wget https://github.com/Moult/deepdiff/archive/master.zip
-	cd dist/working && unzip master.zip
-	cp -r dist/working/deepdiff-master/deepdiff dist/blenderbim/libs/site/packages/
+	cd dist/working && wget https://files.pythonhosted.org/packages/0f/ca/caead2949fbb824c7142e3774fa841aa853bb4d4331b440da8c8514dfc6f/deepdiff-5.8.1.tar.gz
+	cd dist/working && tar -xzvf deepdiff*
+	cp -r dist/working/deepdiff-5.8.1/deepdiff dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Required by deepdiff
@@ -214,16 +240,16 @@ endif

 	# Required by bcf
 	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/bb/41/ad9ce53bb978b68af8ae415293cafc89b165b8ad55a593725299dca76729/xmlschema-1.1.1.tar.gz
+	cd dist/working && wget https://files.pythonhosted.org/packages/5b/ef/f97c3e1a7efa00e989a793fe15297214fc95ad7d9e3810586bd08ce9f0f3/xmlschema-2.0.2.tar.gz
 	cd dist/working && tar -xzvf xmlschema*
-	cp -r dist/working/xmlschema-1.1.1/xmlschema dist/blenderbim/libs/site/packages/
+	cp -r dist/working/xmlschema-2.0.2/xmlschema dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Required by bcf
 	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/12/f9/f9960222d5274944b01391749e55e4dcdf28d8f0c108b64ac931ceff6fdb/elementpath-1.4.3.tar.gz
+	cd dist/working && wget https://files.pythonhosted.org/packages/11/bc/5afb61dd5d863e5cf77cd952445c50c17e65953405986f19e97e4389692a/elementpath-3.0.2.tar.gz
 	cd dist/working && tar -xzvf elementpath*
-	cp -r dist/working/elementpath-1.4.3/elementpath dist/blenderbim/libs/site/packages/
+	cp -r dist/working/elementpath-3.0.2/elementpath dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Required by bcf
@@ -240,6 +266,30 @@ endif
 	cp -r dist/working/lark-parser-0.8.5/lark dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

+	# Required by IFC4D
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/b0/bb/9c4dddd3ca173cb56241cfb2eddfae24690dc676d357ac4cab17d0a36d9d/PyP6Xer-1.13.0.tar.gz
+	cd dist/working && tar -xzvf PyP6Xer*
+	cp -r dist/working/PyP6Xer-1.13.0/xerparser dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by xerparser and IFC4D
+	# TODO: remove this dependency. It's only used to show a progress bar.
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/9f/7b/76c4e5ef1a1b528fcaada4133f972e77d33c252831676cf414119ca6093d/tqdm-4.50.0.tar.gz
+	cd dist/working && tar -xzvf tqdm*
+	cp -r dist/working/tqdm-4.50.0/tqdm dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFCCityJSON
+	mkdir dist/working
+	cd dist/working && python -m venv env
+	cd dist/working && mkdir site-packages
+	cd dist/working && . env/bin/activate && pip install cjio --target=./site-packages
+	cd dist/working/site-packages/ && rm -r *dist-info*
+	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Required by IFCClash
 	mkdir dist/working
 	cd dist/working && wget $(HPPFCL_URL)
@@ -345,7 +395,7 @@ endif
 	cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch
 	rm -rf dist/working

-	# Required by ids
+	# Required by ids - uh, not any more, but I'm trying it out in the drawing module
 	mkdir dist/working
 	cd dist/working && wget $(LXML_URL)
 	cd dist/working && cp *.whl lxml.zip && unzip lxml.zip
@@ -429,6 +479,47 @@ endif
 	cd dist/working/olca-ipc-0.0.10/ && cp -r olca ../../blenderbim/libs/site/packages/
 	rm -rf dist/working

+	# Provides Brickschema fucntionality
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/ca/37/8309da9a72407d2f5eb5489c197ac3cfe96ee3ccba1902d2a0ecc7843f92/brickschema-0.5.1.tar.gz
+	cd dist/working && tar -xzvf brickschema*
+	# This is an evil hack because we don't want to bundle flask
+	echo "" > dist/working/brickschema-0.5.1/brickschema/web.py
+	cd dist/working/brickschema-0.5.1/ && cp -r brickschema ../../blenderbim/libs/site/packages/
+	# For now lets bundle the latest nightly schema
+	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd dist/working && cp Brick.ttl ../../blenderbim/bim/schema/Brick.ttl
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/c7/22/37bb938be8e5c20d443b0c9ba0a243573b671b01739efb0a19f81bc5b470/pyshacl-0.17.2.tar.gz
+	cd dist/working && tar -xzvf pyshacl*
+	cd dist/working/pyshacl-0.17.2/ && cp -r pyshacl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/d2/a7/be8244688bfcee37c23733ab4fe8e6afa6d4403bd2674a3ae7bd2cecc77b/rdflib-6.0.2.tar.gz
+	cd dist/working && tar -xzvf rdflib*
+	cd dist/working/rdflib-6.0.2/ && cp -r rdflib ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/7d/c7/208aece36279e4f1236e437119358786e39530ecc1719d4e1afeddba5288/owlrl-6.0.2.tar.gz
+	cd dist/working && tar -xzvf owlrl*
+	cd dist/working/owlrl-6.0.2/ && cp -r owlrl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	# This is a bit of a dodgy one, it should be provided by setuptools which Blender doesn't ship.
+	mkdir dist/working
+	cd dist/working && wget https://blenderbim.org/builds/pkg_resources.tar.gz
+	cd dist/working && tar -xzvf pkg_resources*
+	cd dist/working/ && cp -r pkg_resources ../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	cd dist/blenderbim && sed -i "s/999999/$(VERSION)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim
@@ -445,11 +536,19 @@ test-core:

 .PHONY: test-bim
 test-bim:
+ifndef MODULE
 	pytest test/bim
+else
+	pytest test/bim -m "$(MODULE)" ./ --maxfail=1
+endif

 .PHONY: test-tool
 test-tool:
+ifndef MODULE
 	pytest test/tool
+else
+	pytest test/tool/test_$(MODULE).py
+endif

 .PHONY: qa
 qa:
@@ -464,7 +563,7 @@ coverage:

 .PHONY: license
 license:
-	copyright-header --license GPL3 --copyright-holder "Dion Moult <dion@thinkmoult.com>" --copyright-year "2021" --copyright-software "BlenderBIM Add-on" --copyright-software-description "OpenBIM Blender Add-on" -a ./ -o ./
+	copyright-header --license GPL3 --copyright-holder "Dion Moult <dion@thinkmoult.com>" --copyright-year "2022" --copyright-software "BlenderBIM Add-on" --copyright-software-description "OpenBIM Blender Add-on" -a ./ -o ./

 .PHONY: clean
 clean:
@@ -1,127 +1,5 @@
-# Blender BIM IFC
+# BlenderBIM Add-on

-_Under heavy development!_
+An add-on to Blender to allow BIM functionality.

-Let's use Blender to create BIM models, because why not?
-
-## Features
-
- - IFC4 is a first-class citizen. IFC4 has been an ISO standard since 2013, with
-   the latest published in 2018. It contains many more features than IFC2X3,
-   published back in 2005.
- - Available for Windows, Mac, and Linux!
- - Use open-source Blender 2.8 to do digital modeling! Used by NASA, Hollywood,
-   and Ubisoft, Blender allows real-time modeling in rendered view, animations,
-   file linking, proxy objects, Blender Cloud collaboration, lighting analysis,
-   CFD, energy modeling, and a huge ecosystem of add-ons with a thriving
-   community. No licensing, and with a strong Python API to integrate into your
-   custom workflow.
- - Create complex spatial structures with multiple sites, buildings, facilities,
-   bridges, and building parts. Sites can be broken down into sub-sites and
-   multiple buildings per site. You can categorise different floors to different
-   buildings.
- - Classify any geometry as any IFC type. Just because it is a wall doesn't
-   mean you should be limited to modeling it in a certain way. Easily change
-   from one type to another, switch relationships and aggregations, reuse or
-   even remove geometry altogether, without damaging your geometry or breaking
-   your BIM model.
- - Use collections to create element compositions and decompositions with full
-   control over the classifications of their parts. Most BIM programs don't give
-   this flexibility. Create collection instances to efficiently duplicate
-   composite objects.
- - Allow BIM objects to instance a shared geometric representations. This allows
-   you to place the same shape in multiple objects without drastically
-   increasing your filesize.
- - Provide a custom value to any simple IFC attribute of an IFC product.
- - Create product types that regular IFC products can inherit attributes from.
- - Define your own property sets with control over exactly how the data in the
-   property sets are stored using property set template definitions which you
-   can download or create yourself. Property sets can apply to both types and
-   objects, and object property sets can selectively override type property
-   sets.
- - Applies array modifiers to create instances.
- - Basic quantity take-off support for costing.
- - Settings to toggle export of quantities or geometric representations.
-   Exporting IFC data without geometric representations is much faster and a
-   fraction of the filesize.
- - Maintain `GlobalId` between exports, so that you can manipulate the IFC
-   reliably in other software while making changes.
- - Not all objects need full solid geometry. Create representations as 2D or 3D
-   curves / wireframes for rapid and lightweight BIM development.
- - Create map conversions and coordinate reference system definitions to link
-   BIM to GIS.
- - Export basic materials with surface and diffuse colours for representation.
-   You can also link materials to an externally defined file, such as a `.blend`
-   Cycles material, V-Ray material, or even Radiance material for lighting
-   simulation.
- - Switch between different types of metric units when modeling.
- - Model multiple representations for different purposes for a single BIM
-   object or type, such as footprints, axis, reference, or clearance geometry.
-   You can export just the type of representation required for your usecase, or
-   export multiple for the user to choose from.
- - Record qualitative objectives such as design intentions, health and safety
-   strategies, or code compliance, performance solutions, and more, in the BIM
-   model and directly associate them to objects or types.
- - Classify objects and types to different classification systems such as
-   Uniclass, Omniclass, or your custom system.
- - Associate external document files such as plans, brochures, specifications,
-   warranties, or anything to objects and types.
- - Specify swept solid geometries, allowing you to round-trip geometry
-   manipulation with other BIM software which have more limited geometric tools,
-   like Revit.
- - Create material layer sets, for objects which have materials in predefined
-   layers with thicknesses.
- - Create material constituent sets, for objects which are made up of
-   arbitrarily mixed ingredients.
- - Specify nested and hosted element relationships.
- - Specify predefined door attributes as defined in the IFC4 specification.
- - Specify predefined window attributes as defined in the IFC4 specification.
- - Specify surface styles either defined as part of a material or assigned
-   directly to an object's representation.
- - Colour coding by IFC class to visually spot mistakes
-
-Some more experimental features:
-
- - Cut sections for documentation with OpenCascade
- - Export gbXML files that are linked to your IFC file to do energy analysis
- - QA module to generate Gherkin unit tests to validate your BIM models
- - HTML formatter to generate reports from QA results
- - COBie spreadsheet extraction to import into CAFM systems
-
-## Demo
-
-[See demo video](https://www.youtube.com/watch?v=iD3v3eu2AjY)
-
-It's only just started, so everything can and will change. But if you want to
-check it out:
-
- 1. Install [Blender](https://www.blender.org/) 64-bit version.
- 2. Download the latest packaged version of Blender BIM from
-    [here](https://blenderbim.org/builds/).
- 3. Launch Blender. Go to `Edit->Preferences->Add-ons->Install...`. Browse to
-    the downloaded `.zip` file from step 2.
- 4. Enable the checkbox next to the Import-Export IFC Blender plugin which will
-    show up.
- 5. All done! You will find an import and export IFC option in the `File` menu.
-
-By default, Blender BIM will export whatever you have selected. The objects you
-have selected _must_ belong in an `IfcProject` and spatially contained, such as
-witihn an `IfcBuilding`. It must also follow the naming convention. Please see
-the screenshot below for an example scene.
-
-A naming convention of `IfcClass/IfcName` is enforced. If you name your object
-`IfcWall/Foo`, it will turn into an `IfcWall` with the name attribute set to
-`Foo`. You can override object attributes using Blender's `Custom Properties`.
-Your objects must live in a top level `Collection` defined as a context class,
-usually something like `IfcProject/Foo`. You can then nest spatial structures
-underneath to create a hierarchy.
-
-## Pictures
-
-![UI](https://aws1.discourse-cdn.com/business6/uploads/buildingsmart1/original/1X/ce820c3ee22adcffae59b40f98ff23379f7e3547.png)
-
-![Blender screenshot](blender-screenshot.png)
-
-... this Blender files creates this IFC file ...
-
-![IfcOpenShell screenshot](ifcopenshell-screenshot.png)
+More information on the [BlenderBIM Add-on website](https://blenderbim.org).
@@ -18,7 +18,7 @@

 import bpy
 import importlib
-from . import handler, ui, prop, operator
+from . import handler, ui, prop, operator, helper

 modules = {
    "project": None,
@@ -27,6 +27,7 @@ modules = {
    "root": None,
    "unit": None,
    "model": None,
+    "cad": None,
    "georeference": None,
    "context": None,
    "drawing": None,
@@ -43,6 +44,7 @@ modules = {
    "sequence": None,
    "group": None,
    "system": None,
+    "brick": None,
    "structural": None,
    "boundary": None,
    "profile": None,
@@ -53,36 +55,50 @@ modules = {
    "pset": None,
    "qto": None,
    "classification": None,
+    "library": None,
    "constraint": None,
    "document": None,
    "pset_template": None,
    "clash": None,
    "lca": None,
    "csv": None,
+    "tester": None,
    "bimtester": None,
    "diff": None,
    "patch": None,
+    "gis": None,
    "covetool": None,
    "augin": None,
    "debug": None,
+    # Uncomment this line to enable loading of the demo module. Happy hacking!
+    # The name "demo" must correlate to a folder name in `bim/module/`.
+    # "demo": None,
 }

+
 for name in modules.keys():
    modules[name] = importlib.import_module(f"blenderbim.bim.module.{name}")

+
 classes = [
-    operator.OpenUri,
-    operator.SelectDataDir,
-    operator.SelectSchemaDir,
-    operator.SelectIfcFile,
-    operator.OpenUpstream,
-    operator.AddSectionPlane,
-    operator.RemoveSectionPlane,
-    operator.ReloadIfcFile,
    operator.AddIfcFile,
+    operator.BIM_OT_add_section_plane,
+    operator.BIM_OT_remove_section_plane,
+    operator.ConfigureVisibility,
+    operator.OpenUpstream,
+    operator.OpenUri,
+    operator.ReloadIfcFile,
    operator.RemoveIfcFile,
+    operator.SelectDataDir,
+    operator.SelectIfcFile,
+    operator.SelectSchemaDir,
+    operator.SelectURIAttribute,
+    operator.EditBlenderCollection,
    prop.StrProperty,
+    operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
+    prop.ObjProperty,
    prop.Attribute,
+    prop.ModuleVisibility,
    prop.BIMProperties,
    prop.IfcParameter,
    prop.PsetQto,
@@ -94,6 +110,22 @@ classes = [
    ui.BIM_UL_generic,
    ui.BIM_UL_topics,
    ui.BIM_ADDON_preferences,
+    # Scene panel groups
+    ui.BIM_PT_project_info,
+    ui.BIM_PT_project_setup,
+    ui.BIM_PT_collaboration,
+    ui.BIM_PT_geometry,
+    ui.BIM_PT_services,
+    ui.BIM_PT_structural,
+    ui.BIM_PT_4D5D,
+    ui.BIM_PT_quality_control,
+    ui.BIM_PT_integrations,
+    # Object panel groups
+    ui.BIM_PT_object_metadata,
+    ui.BIM_PT_geometry_object,
+    ui.BIM_PT_services_object,
+    ui.BIM_PT_utilities_object,
+    ui.BIM_PT_misc_object,
 ]

 for mod in modules.values():
@@ -102,7 +134,8 @@ for mod in modules.values():

 def on_register(scene):
    handler.setDefaultProperties(scene)
-    bpy.app.handlers.depsgraph_update_post.remove(on_register)
+    if not bpy.app.background:
+        bpy.app.handlers.depsgraph_update_post.remove(on_register)


 def register():
@@ -1,10 +1,44 @@
 <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
 <script src="jsgantt.js" type="text/javascript"></script>
+<style>
+.gtaskcellwkend,
+.gtaskcellcurrent,
+.gminorheadingwkend {
+  background-color: #e1e1e1;
+}
+
+.gitemhighlight td {
+  background-color: #ffdaaa;
+}
+
+.gtaskblue {
+  background: #4281A4;
+}
+
+.gtaskred {
+  background: #C1666B;
+}
+
+.gtaskgreen {
+  background: #48A9A6;
+}
+
+.gtaskyellow {
+  background: #D4B483;
+}
+
+.gmainleft {
+  overflow: visible;
+  flex: 0 1 auto;
+}
+
+</style>
+<a href="#print" id="print">Print Mode</a>
 <div style="position:relative" class="gantt" id="GanttChartDIV"></div>
 <script type="text/javascript">
 var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
 g.setOptions({
-    vCaptionType: 'Complete',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
+    vCaptionType: 'Caption',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
    vQuarterColWidth: 36,
    vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
    vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
@@ -14,7 +48,16 @@ g.setOptions({
    vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
    vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
    vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
-    vTotalHeight: 1000,
+    vShowRes: false, // Disable the resource column.
+    vShowComp: false, // Disable the completion column.
+    vShowDur: false, // Disable the duration column, because jsgantt doesn't calculate durations the way we want.
+    vAdditionalHeaders: {ifcduration: {title: 'Duration'}},
+    vUseToolTip: false, // Disable tooltips.
+    vTotalHeight: 900,
+});
+document.getElementById('print').addEventListener('click', function() {
+    g.setTotalHeight("");
+    g.Draw();
 });
 var json_data = `
 {{{json_data}}}
@@ -0,0 +1,13 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EPset_Annotation.ifc','2020-01-01T00:00:00',(),(),'EPset_Annotation','EPset_Annotation',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3));
+#2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_ENUMERATEDVALUE.,'IfcLabel',$,#4,$,$,$,.READWRITE.);
+#4=IFCPROPERTYENUMERATION('Symbol',(IFCLABEL('rectangle-tag'), IFCLABEL('door-tag')),$);
+ENDSEC;
+END-ISO-10303-21;
@@ -0,0 +1,24 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset_Drawing',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15));
+#2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#14=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#15=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;
@@ -19,15 +19,31 @@
 */

 * { stroke-linecap: round; stroke-linejoin: round; }
-*[id] { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; }
+text { fill: black; stroke: none; }
+.cut { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; fill-rule: evenodd; }
 .projection { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
-.hidden { stroke-dasharray: 3, 2; }
-.solid {}
-.leader { marker-end: url(#leader-marker); }
-.stair { marker-start: url(#stair-marker-start); marker-end: url(#stair-marker-end); }
-.break { fill: white; }
-.breakline { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; marker-mid: url(#breakline-marker); }
+.IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
+.PredefinedType-LINEWORK { stroke: black; stroke-width: 0.25; }
+.PredefinedType-BACKGROUND { stroke: black; stroke-width: 0.18; }
+.PredefinedType-GRID { marker-start: url(#grid-marker); marker-end: url(#grid-marker); }
+.PredefinedType-SECTION { stroke-dasharray: 12.5, 3, 3, 3; }
+.PredefinedType-SECTIONLEVEL { marker-start: url(#section-level-marker); stroke-dasharray: 12.5, 3, 3, 3; }
+.PredefinedType-PLANLEVEL { marker-end: url(#plan-level-marker); }
+.PredefinedType-DIMENSION { marker-start: url(#dimension-marker-start); marker-end: url(#dimension-marker-end); }
+.PredefinedType-ANGLE { marker-start: url(#angle-marker-start); marker-end: url(#angle-marker-end); }
+.PredefinedType-RADIUS { marker-end: url(#radius-marker-end); }
+.PredefinedType-DIAMETER { marker-start: url(#diameter-marker-start); marker-end: url(#diameter-marker-end); }
+.PredefinedType-HIDDENLINE { stroke-dasharray: 3, 2; }
+.PredefinedType-STAIRARROW { marker-start: url(#stair-marker-start); marker-end: url(#stair-marker-end); }
+.PredefinedType-BOUNDARY { fill: none; stroke: red; stroke-width: 1; stroke-dasharray: 12, 4, 3, 4, 3, 4; }
+.PredefinedType-BATTING { marker-start: url(#batting); stroke: none; }
+.PredefinedType-SEALANT { fill: url(#crosshatch1); stroke-width: 0.25; }
+.PredefinedType-FILLAREA { fill: white; stroke: none; }
+.PredefinedType-BREAKLINE { fill: none; stroke: black; stroke-width: 0.25; marker-mid: url(#breakline-marker); }
+.PredefinedType-TEXT { fill: black; stroke: none; }
+path.PredefinedType-TEXTLEADER { marker-end: url(#leader-marker); }
+text.PredefinedType-TEXTLEADER { fill: black; stroke: none; }
 .material-blank { fill: white; }
 .material-diagonal1 { fill: url(#diagonal1); }
 .material-diagonal2 { fill: url(#diagonal2); }
@@ -43,5 +59,9 @@
 .material-honeycomb { fill: url(#honeycomb); }
 .material-sand { fill: url(#sand); }
 .material-concrete { fill: url(#concrete); stroke-width: 0.5; }
-.material-boundary { fill: none; stroke: red; stroke-width: 1; stroke-dasharray: 12,4,3,4,3,4; }
 .IfcSpace { fill: none; stroke: none; }
+.PredefinedType-STUD { stroke: black; stroke-width: 1; }
+.PredefinedType-WOOD { fill: url(#wood); stroke: black; stroke-width: 0.5; }
+.PredefinedType-STEEL { fill: url(#steel); stroke: black; stroke-width: 0.5; }
+.PredefinedType-CONCRETE { fill: url(#concrete); stroke: black; stroke-width: 0.5; }
+.PredefinedType-PLASTERBOARD { fill: url(#sand); stroke: black; stroke-width: 0.25; }
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <marker id="batting" markerHeight="10" markerWidth="4" orient="auto" refX="0" refY="5" markerUnits="userSpaceOnUse">
+        <!-- Tip: https://svg-path-visualizer.netlify.app/ -->
+        <path style="fill: none; stroke:black; stroke-width:0.18" d="M 0 2 A 2 2 0 0 1 4 2 L 2 8 M 0 2 L 2 8 A 2 2 0 0 0 4 10 M 2 8 A 2 2 0 0 1 0 10" />
+    </marker>
    <marker id="eng-dimension-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
        <g>
            <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
@@ -12,6 +16,35 @@
            <path d="M 10 0 L 10 14" class="annotation" style="stroke-width:1;" />
        </g>
    </marker>
+    <marker id="radius-marker-end" markerHeight="14" markerWidth="11" orient="auto" refX="10" refY="7">
+        <g>
+            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
+        </g>
+    </marker>
+    <marker id="angle-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
+        <g>
+            <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
+            <path d="M 1 0 L 1 14" class="annotation" style="stroke-width:1;" />
+        </g>
+    </marker>
+    <marker id="angle-marker-end" markerHeight="14" markerWidth="11" orient="auto" refX="10" refY="7">
+        <g>
+            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
+            <path d="M 10 0 L 10 14" class="annotation" style="stroke-width:1;" />
+        </g>
+    </marker>
+    <marker id="diameter-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
+        <g>
+            <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
+            <path d="M 1 0 L 1 14" class="annotation" style="stroke-width:1;" />
+        </g>
+    </marker>
+    <marker id="diameter-marker-end" markerHeight="14" markerWidth="11" orient="auto" refX="10" refY="7">
+        <g>
+            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
+            <path d="M 10 0 L 10 14" class="annotation" style="stroke-width:1;" />
+        </g>
+    </marker>
    <marker id="dimension-marker-start" markerHeight="30" markerWidth="20" refX="10" refY="15" orient="auto">
        <g>
            <path d="M 0 15 L 20 15" class="annotation" style="stroke-width:1;" />
@@ -53,7 +86,7 @@
            <path d="M 0 1 L 90 1" class="annotation" style="stroke-width:1;" />
        </g>
    </marker>
-    <marker id="breakline-marker" markerHeight="20" markerWidth="15" refX="7.5" refY="10">
+    <marker id="breakline-marker" markerHeight="20" markerWidth="15" refX="7.5" refY="10" orient="auto">
        <g>
            <path d="M 0 10 L 5 20 L 7.5 10" class="annotation" style="stroke-width:1; fill: white;" />
            <path d="M 7.5 10 L 10 0 L 15 10" class="annotation" style="stroke-width:1; fill: white;" />
@@ -3,6 +3,10 @@
 <pattern id="demolish" width="1" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
    <line x1="0" y1="0" x2="0" y2="1" style="stroke:red; stroke-width:0.25" />
 </pattern>
+<pattern id="steel" width="3" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
+    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
+    <line x1="1" y1="0" x2="1" y2="1" style="stroke:black; stroke-width:0.25" />
+</pattern>
 <pattern id="diagonal1" width="1" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
 </pattern>
@@ -80,6 +84,9 @@
    <path d="M 1.25,2.165 L 2.5,4.33 L 5,4.33 L 6.25,2.165 L 5,0 L 2.5,0 L 1.25,2.165" style="stroke:black;stroke-width:0.25;stroke-linecap:round;fill:none" />
    <path d="M 6.25,2.165 L 7.5,2.165" style="stroke:black;stroke-width:0.25;stroke-linecap:round" />
 </pattern>
+<pattern id="wood" width="50" height="50" patternUnits="userSpaceOnUse">
+    <path style="fill:none; stroke: black; stroke-width:0.25;" d="M 49.649999,1.3460737 A 69.019995,69.019995 0 0 0 48.653938,0.34999949 M 49.649999,4.9389583 A 66.554994,66.554994 0 0 0 45.06105,0.34999949 M 49.649999,8.6983527 A 64.089999,64.089999 0 0 0 41.301656,0.34999949 M 49.649999,12.675003 A 61.624998,61.624998 0 0 0 37.325,0.34999949 M 49.649999,16.948067 A 59.159997,59.159997 0 0 0 33.05192,0.34999949 M 49.649999,21.652972 A 56.694997,56.694997 0 0 0 28.347017,0.34999949 M 49.649999,27.057906 A 54.229999,54.229999 0 0 0 22.942096,0.34999949 M 49.649999,33.866298 A 51.764998,51.764998 0 0 0 16.1337,0.34999949 M 49.649999,49.649989 A 49.299997,49.299997 0 0 0 0.34999949,0.34999949 M 47.185,49.649989 A 46.834999,46.834999 0 0 0 0.34999949,2.8149951 M 44.72,49.649989 A 44.369998,44.369998 0 0 0 0.34999949,5.2799906 M 42.254999,49.649989 A 41.904997,41.904997 0 0 0 0.34999949,7.7450123 M 39.790001,49.649989 A 39.439999,39.439999 0 0 0 0.34999949,10.210008 M 37.325,49.649989 A 36.974998,36.974998 0 0 0 0.34999949,12.675003 M 34.859999,49.649989 A 34.509998,34.509998 0 0 0 0.34999949,15.139998 M 32.395001,49.649989 A 32.044999,32.044999 0 0 0 0.34999949,17.604994 M 29.93,49.649989 A 29.579999,29.579999 0 0 0 0.34999949,20.069989 M 27.465,49.649989 A 27.114998,27.114998 0 0 0 0.34999949,22.535011 M 24.999997,49.649989 A 24.649999,24.649999 0 0 0 0.34999949,25.000007 M 22.534998,49.649989 A 22.184999,22.184999 0 0 0 0.34999949,27.465003 M 20.069998,49.649989 A 19.719999,19.719999 0 0 0 0.34999949,29.929999 M 17.604998,49.649989 A 17.254999,17.254999 0 0 0 0.34999949,32.394994 M 15.139998,49.649989 A 14.789999,14.789999 0 0 0 0.34999949,34.85999 M 12.674999,49.649989 A 12.325,12.325 0 0 0 0.34999949,37.325011 M 10.209999,49.649989 A 9.8599994,9.8599994 0 0 0 0.34999949,39.790007 M 7.7449994,49.649989 A 7.3949999,7.3949999 0 0 0 0.34999949,42.255002 M 5.2799992,49.649989 A 4.9299997,4.9299997 0 0 0 0.34999949,44.719998 M 2.8149995,49.649989 A 2.4649999,2.4649999 0 0 0 0.34999949,47.184993 M 0.34999949,49.649989 H 3.8010003 M 0.34999949,49.649989 H 3.8010003 M 0.34999949,49.649989 H 3.8010003" />
+</pattern>
 <pattern id="sand" width="50" height="50" patternUnits="userSpaceOnUse">
    <path style="fill: white;" d="M 0 0 50 0 50 50 0 50" />
    <path
@@ -5,6 +5,20 @@
    </g>
    <g id="door-tag">
        <circle cy="1.75" r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="1.75" x2="5" y2="1.75" style="stroke:black; stroke-width: 0.25;" />
+        <line x1="-5" y1="1.75" x2="5" y2="1.75" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+    <g id="elevation-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="elevation-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+    <g id="section-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="section-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
    </g>
 </svg>
@@ -173,7 +173,7 @@
         style="stroke-width:0.999999px"
         y="1036.1166"
         x="3030.9653"
-         id="tspan2527">{{revision}}</tspan></text>
+         id="tspan2527">{{Revision}}</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3918px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -183,7 +183,7 @@
         id="tspan2531"
         x="2804.7021"
         y="1036.1166"
-         style="stroke-width:0.999999px">{{number}}</tspan></text>
+         style="stroke-width:0.999999px">{{Identification}} - {{Name}}</tspan></text>
  </g>
  <g
     transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)"
@@ -169,7 +169,7 @@
       style="stroke-width:0.264583px"
       y="397.13919"
       x="554.94287"
-       id="tspan2527">{{revision}}</tspan></text>
+       id="tspan2527">{{Revision}}</tspan></text>
  <text
     xml:space="preserve"
     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -179,7 +179,7 @@
       id="tspan2531"
       x="495.07742"
       y="397.13919"
-       style="stroke-width:0.264583px">{{number}}</tspan></text>
+       style="stroke-width:0.264583px">{{Identification}} - {{Name}}</tspan></text>
  <g
     style="stroke-width:3.77953"
     id="g90669"
@@ -172,7 +172,7 @@
         id="tspan2527"
         x="544.94287"
         y="284.13919"
-         style="stroke-width:0.264583px">{{revision}}</tspan></text>
+         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
    <text
       id="text2533"
       y="284.13919"
@@ -182,7 +182,7 @@
         style="stroke-width:0.264583px"
         y="284.13919"
         x="485.07742"
-         id="tspan2531">{{number}}</tspan></text>
+         id="tspan2531">{{Identification}} - {{Name}}</tspan></text>
  </g>
  <g
     style="stroke-width:3.77953"
@@ -70,7 +70,7 @@
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055365px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.26458332px"
         y="103.10933"
         x="32.822662"
-         id="tspan857">{{no}}</tspan></text>
+         id="tspan857">{{Identification}}</tspan></text>
    <text
       xml:space="preserve"
       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.71626091px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458329px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -80,7 +80,7 @@
         id="tspan861"
         x="39.12896"
         y="100.19173"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325247px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:start;text-anchor:start;stroke-width:0.26458329px">{{name}}</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325247px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:start;text-anchor:start;stroke-width:0.26458329px">{{Name}}</tspan></text>
    <text
       id="text867"
       y="105.0553"
@@ -90,6 +90,6 @@
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325247px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:start;text-anchor:start;stroke-width:0.26458332px"
         y="105.0553"
         x="39.285267"
-         id="tspan865">{{scale}}</tspan></text>
+         id="tspan865">{{Scale}}</tspan></text>
  </g>
 </svg>
@@ -0,0 +1,214 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+presets = {
+    "Basic": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "Admin": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "cobie",
+        "resource",
+        "cost",
+        "sequence",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "constraint",
+        "document",
+        "pset_template",
+        "clash",
+        "lca",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "covetool",
+        "augin",
+        "debug",
+    ],
+    "BIM Coordination": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "georeference",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "owner",
+        "pset",
+        "qto",
+        "clash",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "debug",
+    ],
+    "Architecture": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Structural Engineering": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "MEP": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Quantity Surveying": ["project", "search", "attribute", "spatial", "void", "pset", "qto", "classification", "csv"],
+    "Model Enrichment": [
+        "project",
+        "search",
+        "root",
+        "attribute",
+        "spatial",
+        "pset",
+        "qto",
+        "pset_template",
+        "csv",
+        "patch",
+    ],
+    "3D Visualisation": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "4D Scheduling": ["project", "search", "attribute", "spatial", "resource", "cost", "sequence", "pset", "qto"],
+    "5D Cost Management": [
+        "project",
+        "search",
+        "attribute",
+        "spatial",
+        "resource",
+        "cost",
+        "sequence",
+        "pset",
+        "qto",
+        "lca",
+    ],
+    "Facility Management": ["project", "search", "attribute", "spatial", "cobie", "pset", "qto", "lca"],
+}
@@ -28,10 +28,12 @@ import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
 import blenderbim.tool as tool
+import blenderbim.core.geometry
 import blenderbim.core.aggregate
 import blenderbim.core.spatial
 import blenderbim.core.style
 from blenderbim.bim.ifc import IfcStore
+from mathutils import Vector


 class IfcExporter:
@@ -41,20 +43,22 @@ class IfcExporter:
    def export(self):
        self.file = IfcStore.get_file()
        self.set_header()
+        IfcStore.update_cache()
        if bpy.context.scene.BIMProjectProperties.is_authoring:
-            self.sync_object_placements_and_deletions()
+            self.sync_deletions()
+            self.sync_all_objects()
            self.sync_edited_objects()
-        extension = self.ifc_export_settings.output_file.split(".")[-1]
+        extension = self.ifc_export_settings.output_file.split(".")[-1].lower()
        if extension == "ifczip":
            with tempfile.TemporaryDirectory() as unzipped_path:
                filename, ext = os.path.splitext(os.path.basename(self.ifc_export_settings.output_file))
-                tmp_name = "{}.ifc".format(filename)
-                tmp_file = os.path.join(unzipped_path, tmp_name)
+                tmp_filename = f"{filename}.ifc"
+                tmp_file = os.path.join(unzipped_path, tmp_filename)
                self.file.write(tmp_file)
                with zipfile.ZipFile(
                    self.ifc_export_settings.output_file, mode="w", compression=zipfile.ZIP_DEFLATED, compresslevel=9
                ) as zf:
-                    zf.write(tmp_file)
+                    zf.write(tmp_file, arcname=tmp_filename)
        elif extension == "ifc":
            self.file.write(self.ifc_export_settings.output_file)
        elif extension == "ifcjson":
@@ -83,27 +87,40 @@ class IfcExporter:
            self.get_application_name(), self.get_application_version()
        )

-    def sync_object_placements_and_deletions(self):
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
-        to_delete = []
+    def sync_deletions(self):
+        results = []
+        for ifc_definition_id in IfcStore.deleted_ids:
+            try:
+                product = self.file.by_id(ifc_definition_id)
+                if hasattr(product, "GlobalId"):
+                    results.append(product.GlobalId)
+            except:
+                continue
+            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
+        IfcStore.deleted_ids.clear()
+        return results

-        for ifc_definition_id, obj in IfcStore.id_map.items():
+    def sync_all_objects(self):
+        results = []
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
+        for ifc_definition_id in list(IfcStore.id_map.keys()):
+            obj = IfcStore.id_map[ifc_definition_id]
            try:
                if isinstance(obj, bpy.types.Material):
                    continue
-                self.sync_object_placement(obj)
-                self.sync_object_container(ifc_definition_id, obj)
+                tool.Collector.sync(obj)
+                result = self.sync_object_placement(obj)
+                if result:
+                    results.append(result)
+                result = self.sync_object_material(obj)
+                if result:
+                    results.append(result)
            except ReferenceError:
                pass  # The object is likely deleted
-            if self.should_delete(obj):
-                to_delete.append(ifc_definition_id)
-
-        for ifc_definition_id in to_delete:
-            product = self.file.by_id(ifc_definition_id)
-            IfcStore.unlink_element(product)
-            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
+        return results

    def sync_edited_objects(self):
+        results = []
        for obj in IfcStore.edited_objs.copy():
            if not obj:
                continue
@@ -111,79 +128,49 @@ class IfcExporter:
                if isinstance(obj, bpy.types.Material):
                    blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
                else:
+                    element = tool.Ifc.get_entity(obj)
+                    if element:
+                        results.append(element)
                    bpy.ops.bim.update_representation(obj=obj.name)
            except ReferenceError:
                pass  # The object is likely deleted
        IfcStore.edited_objs.clear()
+        return results
+
+    def sync_object_material(self, obj):
+        if not obj.data or not isinstance(obj.data, bpy.types.Mesh):
+            return
+        if not self.has_changed_materials(obj):
+            return
+        bpy.ops.bim.update_representation(obj=obj.name)
+
+    def has_changed_materials(self, obj):
+        checksum = obj.data.BIMMeshProperties.material_checksum
+        return checksum != str([s.id() for s in tool.Geometry.get_styles(obj) if s])

    def sync_object_placement(self, obj):
+        if not tool.Ifc.is_moved(obj):
+            return
        blender_matrix = np.array(obj.matrix_world)
        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+        if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
+            bpy.ops.bim.update_representation(obj=obj.name)
+            return element
+        if element.is_a("IfcGridAxis"):
+            return self.sync_grid_axis_object_placement(obj, element)
        if not hasattr(element, "ObjectPlacement"):
            return
-        ifc_matrix = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-        ifc_matrix[0][3] *= self.unit_scale
-        ifc_matrix[1][3] *= self.unit_scale
-        ifc_matrix[2][3] *= self.unit_scale
+        blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+        return element

-        props = bpy.context.scene.BIMGeoreferenceProperties
-        if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "OBJECT_PLACEMENT":
-            ifc_matrix = ifcopenshell.util.geolocation.global2local(
-                ifc_matrix,
-                float(props.blender_eastings) * self.unit_scale,
-                float(props.blender_northings) * self.unit_scale,
-                float(props.blender_orthogonal_height) * self.unit_scale,
-                float(props.blender_x_axis_abscissa),
-                float(props.blender_x_axis_ordinate),
-            )
-        if not np.allclose(ifc_matrix, blender_matrix, atol=0.0001):
-            blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Surveyor, obj=obj)
-
-    def sync_object_container(self, guid, obj):
-        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-        element_collection = bpy.data.collections.get(obj.name)
-
-        if self.file.schema == "IFC2X3":
-            if element.is_a("IfcProject"):
-                return
-        elif element.is_a("IfcContext"):
-            return
-
-        if (
-            (element.is_a("IfcElement") and element_collection)
-            or element.is_a("IfcSpatialStructureElement")
-            or element.is_a("IfcGrid")
-        ):
-            try:
-                parent_collection = [c for c in bpy.data.collections if c.children.get(element_collection.name)][0]
-            except:
-                return  # Out of the spatial tree
-        else:
-            parent_collection = obj.users_collection[0]
-
-        parent_obj = bpy.data.objects.get(parent_collection.name)
-        if not parent_obj or not parent_obj.BIMObjectProperties.ifc_definition_id:
-            return
-        parent = self.file.by_id(parent_obj.BIMObjectProperties.ifc_definition_id)
-
-        if parent.is_a("IfcSpatialStructureElement") and not element.is_a("IfcSpatialStructureElement"):
-            if parent != ifcopenshell.util.element.get_container(element):
-                blenderbim.core.spatial.assign_container(
-                    tool.Ifc, tool.Collector, tool.Container, structure_obj=parent_obj, element_obj=obj
-                )
-        elif parent != ifcopenshell.util.element.get_aggregate(element):
-            blenderbim.core.aggregate.assign_object(
-                tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=parent_obj, related_obj=obj
-            )
-
-    def should_delete(self, obj):
-        try:
-            # This will throw an exception if the Blender object no longer exists
-            foo = obj.name
-            foo
-            return False
-        except:
-            return True
+    def sync_grid_axis_object_placement(self, obj, element):
+        grid = (element.PartOfU or element.PartOfV or element.PartOfW)[0]
+        grid_obj = tool.Ifc.get_object(grid)
+        if grid_obj:
+            self.sync_object_placement(grid_obj)
+            if grid_obj.matrix_world != obj.matrix_world:
+                bpy.ops.bim.update_representation(obj=obj.name)
+        tool.Geometry.record_object_position(obj)

    def get_application_name(self):
        return "BlenderBIM"
@@ -26,9 +26,7 @@ from blenderbim.bim.module.drawing.prop import RasterStyleProperty
 from bpy.app.handlers import persistent
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
-from ifcopenshell.api.attribute.data import Data as AttributeData
 from ifcopenshell.api.material.data import Data as MaterialData
-from ifcopenshell.api.style.data import Data as StyleData
 from ifcopenshell.api.type.data import Data as TypeData


@@ -50,9 +48,7 @@ def mode_callback(obj, data):
        ):
            continue
        if obj.data.BIMMeshProperties.ifc_definition_id:
-            representation = IfcStore.get_file().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
-            if representation.RepresentationType in ["Tessellation", "Brep", "Annotation2D"]:
-                IfcStore.edited_objs.add(obj)
+            IfcStore.edited_objs.add(obj)
        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
            IfcStore.edited_objs.add(obj)

@@ -70,11 +66,10 @@ def name_callback(obj, data):
    if isinstance(obj, bpy.types.Material):
        if obj.BIMObjectProperties.ifc_definition_id:
            IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).Name = obj.name
-            AttributeData.load(IfcStore.get_file(), obj.BIMObjectProperties.ifc_definition_id)
            MaterialData.load_materials()
        if obj.BIMMaterialProperties.ifc_style_id:
            IfcStore.get_file().by_id(obj.BIMMaterialProperties.ifc_style_id).Name = obj.name
-            StyleData.load(IfcStore.get_file(), obj.BIMMaterialProperties.ifc_style_id)
+        refresh_ui_data()
        return

    if not obj.BIMObjectProperties.ifc_definition_id or "/" not in obj.name:
@@ -98,7 +93,7 @@ def name_callback(obj, data):
    if element.is_a("IfcTypeProduct"):
        TypeData.purge()
    element.Name = "/".join(obj.name.split("/")[1:])
-    AttributeData.load(IfcStore.get_file(), obj.BIMObjectProperties.ifc_definition_id)
+    refresh_ui_data()


 def color_callback(obj, data):
@@ -162,12 +157,12 @@ def loadIfcStore(scene):
    if not IfcStore.get_file():
        return
    IfcStore.get_schema()
-    IfcStore.reload_linked_elements()
+    IfcStore.relink_all_objects()


@persistent
 def undo_pre(scene):
-    IfcStore.update_undo_redo_stack_objects()
+    IfcStore.track_undo_redo_stack_object_map()


@persistent
@@ -176,13 +171,13 @@ def undo_post(scene):
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
        IfcStore.undo()
        purge_module_data()
-    IfcStore.update_undo_redo_stack_objects()
-    IfcStore.reload_linked_elements(objects=[bpy.data.objects.get(o) for o in IfcStore.undo_redo_stack_objects])
+    IfcStore.track_undo_redo_stack_selected_objects()
+    IfcStore.reload_undo_redo_stack_objects()


@persistent
 def redo_pre(scene):
-    IfcStore.update_undo_redo_stack_objects()
+    IfcStore.track_undo_redo_stack_object_map()


@persistent
@@ -191,8 +186,8 @@ def redo_post(scene):
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
        IfcStore.redo()
        purge_module_data()
-    IfcStore.update_undo_redo_stack_objects()
-    IfcStore.reload_linked_elements(objects=[bpy.data.objects.get(o) for o in IfcStore.undo_redo_stack_objects])
+    IfcStore.track_undo_redo_stack_selected_objects()
+    IfcStore.reload_undo_redo_stack_objects()


@persistent
@@ -202,6 +197,7 @@ def ensureIfcExported(scene):


 def get_application(ifc):
+    # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
    version = get_application_version()
    for element in ifc.by_type("IfcApplication"):
        if element.ApplicationIdentifier == "BlenderBIM" and element.Version == version:
@@ -209,7 +205,7 @@ def get_application(ifc):
    return ifcopenshell.api.run(
        "owner.add_application",
        ifc,
-        version=get_application_version(),
+        version=version,
        application_full_name="BlenderBIM Add-on",
        application_identifier="BlenderBIM",
    )
@@ -237,6 +233,7 @@ def setDefaultProperties(scene):
    )
    ifcopenshell.api.owner.settings.get_user = lambda ifc: core_owner.get_user(tool.Owner)
    ifcopenshell.api.owner.settings.get_application = get_application
+    # TODO: Move to drawing module
    if len(bpy.context.scene.DocProperties.drawing_styles) == 0:
        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
        drawing_style.name = "Technical"
@@ -290,7 +287,7 @@ def setDefaultProperties(scene):
                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
-                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: True,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: False,
                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
@@ -19,6 +19,7 @@
 import bpy
 import json
 import math
+import zipfile
 import ifcopenshell
 import ifcopenshell.util.attribute
 from mathutils import geometry
@@ -37,16 +38,22 @@ def draw_attribute(attribute, layout, copy_operator=None):
    if not value_name:
        layout.label(text=attribute.name)
        return
-    layout.prop(
-        attribute,
-        value_name,
-        text=attribute.name,
-    )
+    if value_name == "enum_value":
+        prop_with_search(layout, attribute, "enum_value", text=attribute.name)
+    else:
+        layout.prop(
+            attribute,
+            value_name,
+            text=attribute.name,
+        )
    if attribute.is_optional:
        layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
    if copy_operator:
        op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
-        op.data = json.dumps({"name": attribute.name, "value": attribute.get_value(), "is_null": attribute.is_null})
+        op.name = attribute.name
+    if attribute.is_uri:
+        op = layout.operator("bim.select_uri_attribute", text="", icon="FILE_FOLDER")
+        op.data_path = attribute.path_from_id("string_value")


 def import_attributes(ifc_class, props, data, callback=None):
@@ -77,6 +84,8 @@ def import_attribute(attribute, props, data, callback=None):
        props.remove(len(props) - 1)
    elif data_type == "string":
        new.string_value = "" if new.is_null else data[attribute.name()]
+        if attribute.type_of_attribute().declared_type().name() == "IfcURIReference":
+            new.is_uri = True
    elif data_type == "boolean":
        new.bool_value = False if new.is_null else data[attribute.name()]
    elif data_type == "integer":
@@ -97,3 +106,78 @@ def export_attributes(props, callback=None):
            continue  # Our job is done
        attributes[prop.name] = prop.get_value()
    return attributes
+
+
+def prop_with_search(layout, data, prop_name, **kwargs):
+    # kwargs are layout.prop arguments (text, icon, etc.)
+    row = layout.row(align=True)
+    # Magick courtesy of https://blender.stackexchange.com/a/203443/86891
+    row.context_pointer_set(name="data", data=data)
+    row.prop(data, prop_name, **kwargs)
+    op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
+    op.prop_name = prop_name
+
+
+def get_enum_items(data, prop_name, context):
+    # Retrieve items from a dynamic EnumProperty, which is otherwise not supported
+    # Or throws an error in the console when the items callback returns an empty list
+    # See https://blender.stackexchange.com/q/215781/86891
+    prop = data.__annotations__[prop_name]
+    items = prop.keywords.get("items")
+    if items is None:
+        return
+    if not isinstance(items, (list, tuple)):
+        # items are retrieved through a callback, not a static list :
+        items = items(data, context)
+    return items
+
+
+# hack to close popup
+# https://blender.stackexchange.com/a/202576/130742
+def close_operator_panel(event):
+    x, y = event.mouse_x, event.mouse_y
+    bpy.context.window.cursor_warp(10, 10)
+    move_back = lambda: bpy.context.window.cursor_warp(x, y)
+    bpy.app.timers.register(move_back, first_interval=0.01)
+
+
+class IfcHeaderExtractor:
+    def __init__(self, filepath: str):
+        self.filepath = filepath
+
+    def extract(self):
+        extension = self.filepath.split(".")[-1]
+        if extension.lower() == "ifc":
+            with open(self.filepath) as ifc_file:
+                return self.extract_ifc_spf(ifc_file)
+        elif extension.lower() == "ifczip":
+            return self.extract_ifc_zip()
+
+    def extract_ifc_spf(self, ifc_file):
+        # https://www.steptools.com/stds/step/IS_final_p21e3.html#clause-8
+        data = {}
+        max_lines_to_parse = 50
+        for _ in range(max_lines_to_parse):
+            line = next(ifc_file)
+            if isinstance(line, bytes):
+                line = line.decode("utf-8")
+            if line.startswith("FILE_DESCRIPTION"):
+                for i, part in enumerate(line.split("'")):
+                    if i == 1:
+                        data["description"] = part
+                    elif i == 3:
+                        data["implementation_level"] = part
+            elif line.startswith("FILE_NAME"):
+                for i, part in enumerate(line.split("'")):
+                    if i == 1:
+                        data["name"] = part
+                    elif i == 3:
+                        data["time_stamp"] = part
+            elif line.startswith("FILE_SCHEMA"):
+                data["schema_name"] = line.split("'")[1]
+                break
+        return data
+
+    def extract_ifc_zip(self):
+        archive = zipfile.ZipFile(self.filepath, "r")
+        return self.extract_ifc_spf(archive.open(archive.filelist[0]))
@@ -1,5 +1,5 @@
 # BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+# Copyright (C) 2020, 2021, 2022 Dion Moult <dion@thinkmoult.com>
 #
 # This file is part of BlenderBIM Add-on.
 #
@@ -16,8 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

+import os
 import bpy
 import uuid
+import hashlib
 import zipfile
 import tempfile
 import ifcopenshell
@@ -29,8 +31,11 @@ class IfcStore:
    path = ""
    file = None
    schema = None
+    cache = None
+    cache_path = None
    id_map = {}
    guid_map = {}
+    deleted_ids = set()
    edited_objs = set()
    pset_template_path = ""
    pset_template_file = None
@@ -38,28 +43,39 @@ class IfcStore:
    library_file = None
    element_listeners = set()
    undo_redo_stack_objects = set()
+    undo_redo_stack_object_names = {}
    current_transaction = ""
    last_transaction = ""
    history = []
    future = []
+    schema_identifiers = ["IFC4", "IFC2X3"]

    @staticmethod
    def purge():
        IfcStore.path = ""
        IfcStore.file = None
        IfcStore.schema = None
+        IfcStore.cache = None
+        IfcStore.cache_path = None
        IfcStore.id_map = {}
        IfcStore.guid_map = {}
+        IfcStore.deleted_ids = set()
        IfcStore.edited_objs = set()
        IfcStore.pset_template_path = ""
        IfcStore.pset_template_file = None
        IfcStore.library_path = ""
        IfcStore.library_file = None
+        IfcStore.last_transaction = ""
+        IfcStore.history = []
+        IfcStore.future = []
+        IfcStore.schema_identifiers = ["IFC4", "IFC2X3"]

    @staticmethod
    def get_file():
        if IfcStore.file is None:
            IfcStore.path = bpy.context.scene.BIMProperties.ifc_file
+            if not os.path.isabs(IfcStore.path):
+                IfcStore.path = os.path.abspath(os.path.join(bpy.path.abspath("//"), IfcStore.path))
            if IfcStore.path:
                try:
                    IfcStore.load_file(IfcStore.path)
@@ -67,6 +83,31 @@ class IfcStore:
                    pass
        return IfcStore.file

+    @staticmethod
+    def get_cache():
+        if IfcStore.cache is None and IfcStore.path:
+            ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+            ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+            IfcStore.cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+            cache_settings = ifcopenshell.geom.settings()
+            cache_settings.set(cache_settings.STRICT_TOLERANCE, True)
+            try:
+                IfcStore.cache = ifcopenshell.geom.serializers.hdf5(IfcStore.cache_path, cache_settings)
+            except:
+                return
+        return IfcStore.cache
+
+    @staticmethod
+    def update_cache():
+        if not IfcStore.cache:
+            return
+        ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+        new_cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+        IfcStore.cache = None
+        os.replace(IfcStore.cache_path, new_cache_path)
+        IfcStore.get_cache()
+
    @staticmethod
    def load_file(path):
        extension = path.split(".")[-1]
@@ -85,7 +126,9 @@ class IfcStore:
    @staticmethod
    def get_schema():
        if IfcStore.file is None:
-            return
+            IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(
+                bpy.context.scene.BIMProjectProperties.export_schema
+            )
        elif IfcStore.schema is None:
            IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(IfcStore.file.schema)
        return IfcStore.schema
@@ -108,14 +151,32 @@ class IfcStore:
        IfcStore.element_listeners.add(callback)

    @staticmethod
-    def update_undo_redo_stack_objects():
+    def track_undo_redo_stack_object_map():
+        """Keeps track of currently mapped object names, typically during undo and redo
+
+        When any Blender object is stored outside a Blender PointerProperty, such as
+        in a regular Python list, there is the likely probability that the object
+        will be invalidated when undo or redo occurs. Object invalidation seems to
+        occur whenever an object is affected during an operation.
+
+        For example, if an operator deletes a modifier on o1, then o1 will be invalidated.
+        """
+        for key, value in IfcStore.id_map.items():
+            try:
+                IfcStore.undo_redo_stack_object_names[key] = value.name
+            except:
+                continue
+
+    @staticmethod
+    def track_undo_redo_stack_selected_objects():
        """Keeps track of selected object names, typically during undo and redo

        When any Blender object is stored outside a Blender PointerProperty, such as
        in a regular Python list, there is the likely probability that the object
        will be invalidated when undo or redo occurs. Object invalidation seems to
-        only occur for selected objects either pre/post undo/redo event, including
-        selected objects for consecutive undo/redos, and all children.
+        occur for selected objects either pre/post undo/redo event, including
+        selected objects for consecutive undo/redos, and all children. This is
+        important because selected objects are often deleted from the scene.

        So if I first select o1, then o2, then o3, then press undo, o3 will be
        invalidated. If instead I press undo twice, o3 and o2 will be invalidated.
@@ -130,14 +191,23 @@ class IfcStore:
        IfcStore.undo_redo_stack_objects |= objects

    @staticmethod
-    def reload_linked_elements(objects=None):
+    def reload_undo_redo_stack_objects():
+        """Reloads any invalidated objects after undo or redo
+
+        After an undo or redo operation, objects may have been invalidated in
+        our id_map and guid_map. Invalidated objects are typically those that
+        have been manipulated or deleted. This checks the cache of mapped and
+        selected objects prior to the operation and ensures that if the object
+        is invalidated, they are reloaded based on the object name that was
+        tracked prior to the undo / redo.
+        """
        file = IfcStore.get_file()
        if not file:
            return
-        if objects is None:
-            objects = bpy.data.objects

-        for obj in objects:
+        # First, reload objects that were selected or active
+        for name in IfcStore.undo_redo_stack_objects:
+            obj = bpy.data.objects.get(name)
            if not obj:
                continue
            if not obj.BIMObjectProperties.ifc_definition_id:
@@ -148,6 +218,62 @@ class IfcStore:
                data["guid"] = element.GlobalId
            IfcStore.commit_link_element(data)

+        # Scan for any straggling invalidated objects which were indirectly affected and reload them too.
+        for key, value in IfcStore.id_map.items():
+            try:
+                value.name
+            except:
+                obj = bpy.data.objects.get(IfcStore.undo_redo_stack_object_names[key])
+                if not obj or not obj.BIMObjectProperties.ifc_definition_id:
+                    continue
+                element = file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+                data = {"id": element.id(), "obj": obj.name}
+                if hasattr(element, "GlobalId"):
+                    data["guid"] = element.GlobalId
+                IfcStore.commit_link_element(data)
+
+
+    @staticmethod
+    def relink_all_objects():
+        if not IfcStore.get_file():
+            return
+        for obj in bpy.data.objects:
+            IfcStore.relink_object(obj)
+        for obj in bpy.data.materials:
+            IfcStore.relink_object(obj)
+
+    @staticmethod
+    def relink_object(obj):
+        if not obj:
+            return
+        if obj.BIMObjectProperties.ifc_definition_id:
+            element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+            data = {"id": element.id(), "obj": obj.name}
+            if hasattr(element, "GlobalId"):
+                data["guid"] = element.GlobalId
+            IfcStore.commit_link_element(data)
+        if hasattr(obj, "BIMMaterialProperties") and obj.BIMMaterialProperties.ifc_style_id:
+            element = IfcStore.get_file().by_id(obj.BIMMaterialProperties.ifc_style_id)
+            data = {"id": element.id(), "obj": obj.name}
+            IfcStore.commit_link_element(data)
+
+    @staticmethod
+    def delete_element(element):
+        IfcStore.deleted_ids.add(element.id())
+        if IfcStore.history:
+            data = {"id": element.id()}
+            IfcStore.history[-1]["operations"].append(
+                {"rollback": IfcStore.rollback_delete_element, "commit": IfcStore.commit_delete_element, "data": data}
+            )
+
+    @staticmethod
+    def rollback_delete_element(data):
+        IfcStore.deleted_ids.remove(data["id"])
+
+    @staticmethod
+    def commit_delete_element(data):
+        IfcStore.deleted_ids.add(data["id"])
+
    @staticmethod
    def link_element(element, obj):
        IfcStore.id_map[element.id()] = obj
@@ -184,6 +310,8 @@ class IfcStore:
    @staticmethod
    def commit_link_element(data):
        obj = bpy.data.objects.get(data["obj"])
+        if not obj:
+            obj = bpy.data.materials.get(data["obj"])
        IfcStore.id_map[data["id"]] = obj
        if "guid" in data:
            IfcStore.guid_map[data["guid"]] = obj
@@ -224,7 +352,9 @@ class IfcStore:
        except:
            pass

-        if obj:
+        if element and element.is_a("IfcSurfaceStyle"):
+            obj.BIMMaterialProperties.ifc_style_id = 0
+        elif obj:
            obj.BIMObjectProperties.ifc_definition_id = 0

    @staticmethod
@@ -232,7 +362,6 @@ class IfcStore:
        is_top_level_operator = not bool(IfcStore.current_transaction)

        if is_top_level_operator:
-            active_object = context.active_object
            IfcStore.begin_transaction(operator)
            IfcStore.get_file().begin_transaction()
            # This empty transaction ensures that each operator has at least one transaction
@@ -248,17 +377,14 @@ class IfcStore:
                operator, rollback=lambda d: IfcStore.get_file().undo(), commit=lambda d: IfcStore.get_file().redo()
            )
            IfcStore.end_transaction(operator)
-            try:
-                active_object.name
-                context.view_layer.objects.active = active_object
-            except:
-                pass
+            blenderbim.bim.handler.refresh_ui_data()

        return result

    @staticmethod
    def begin_transaction(operator):
        IfcStore.undo_redo_stack_objects = set()
+        IfcStore.undo_redo_stack_object_names = {}
        IfcStore.current_transaction = str(uuid.uuid4())
        operator.transaction_key = IfcStore.current_transaction

@@ -20,11 +20,14 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.AssignObject,
-    operator.UnassignObject,
-    operator.EnableEditingAggregate,
-    operator.DisableEditingAggregate,
-    operator.AddAggregate,
+    operator.BIM_OT_assign_object,
+    operator.BIM_OT_unassign_object,
+    operator.BIM_OT_enable_editing_aggregate,
+    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_add_aggregate,
+    operator.BIM_OT_select_parts,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_add_part_to_object,
    prop.BIMObjectAggregateProperties,
    ui.BIM_PT_aggregate,
 )
@@ -32,24 +32,50 @@ class AggregateData:
    @classmethod
    def load(cls):
        cls.data = {
-            "has_aggregate": cls.has_aggregate(),
-            "label": cls.get_label(),
+            "has_relating_object": cls.has_relating_object(),
+            "relating_object_label": cls.get_relating_object_label(),
            "relating_object_id": cls.get_relating_object_id(),
+            "has_related_objects": cls.has_related_objects(),
+            "related_objects_amount": cls.get_related_objects_amount(),
+            "ifc_class": cls.ifc_class(),
        }
        cls.is_loaded = True

    @classmethod
-    def has_aggregate(cls):
+    def get_relating_object(cls):
        return ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(bpy.context.active_object))

    @classmethod
-    def get_label(cls):
-        aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(bpy.context.active_object))
+    def has_relating_object(cls) -> bool:
+        return cls.get_relating_object() is not None
+
+    @classmethod
+    def get_relating_object_label(cls) -> str:
+        aggregate = cls.get_relating_object()
        if aggregate:
            return f"{aggregate.is_a()}/{aggregate.Name or ''}"

    @classmethod
-    def get_relating_object_id(cls):
-        aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(bpy.context.active_object))
+    def get_relating_object_id(cls) -> int:
+        aggregate = cls.get_relating_object()
        if aggregate:
            return aggregate.id()
+
+    @classmethod
+    def get_related_objects(cls):
+        return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))
+
+    @classmethod
+    def get_related_objects_amount(cls):
+        parts = cls.get_related_objects()
+        return len(parts) if parts else 0
+
+    @classmethod
+    def has_related_objects(cls) -> bool:
+        return bool(cls.get_related_objects())
+
+    @classmethod
+    def ifc_class(cls) -> str:
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if element:
+            return element.is_a()
@@ -17,8 +17,11 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
+import ifcopenshell
+import ifcopenshell.util.element
 import blenderbim.tool as tool
 import blenderbim.core.aggregate as core
+import blenderbim.core.spatial
 import blenderbim.bim.handler
 from blenderbim.bim.ifc import IfcStore

@@ -30,7 +33,9 @@ class Operator:
        return {"FINISHED"}


-class AssignObject(bpy.types.Operator, Operator):
+class BIM_OT_assign_object(bpy.types.Operator, Operator):
+    """Create aggregation relationship between two ifc elements"""
+
    bl_idname = "bim.assign_object"
    bl_label = "Assign Object"
    bl_options = {"REGISTER", "UNDO"}
@@ -47,7 +52,9 @@ class AssignObject(bpy.types.Operator, Operator):
        )


-class UnassignObject(bpy.types.Operator, Operator):
+class BIM_OT_unassign_object(bpy.types.Operator, Operator):
+    """Remove aggregation relationship between two ifc elements"""
+
    bl_idname = "bim.unassign_object"
    bl_label = "Unassign Object"
    bl_options = {"REGISTER", "UNDO"}
@@ -63,7 +70,9 @@ class UnassignObject(bpy.types.Operator, Operator):
        )


-class EnableEditingAggregate(bpy.types.Operator, Operator):
+class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
+    """Enable editing aggregation relationship"""
+
    bl_idname = "bim.enable_editing_aggregate"
    bl_label = "Enable Editing Aggregate"
    bl_options = {"REGISTER", "UNDO"}
@@ -72,7 +81,9 @@ class EnableEditingAggregate(bpy.types.Operator, Operator):
        core.enable_editing_aggregate(tool.Aggregate, obj=context.active_object)


-class DisableEditingAggregate(bpy.types.Operator, Operator):
+class BIM_OT_disable_editing_aggregate(bpy.types.Operator, Operator):
+    """Disable editing aggregation relationship"""
+
    bl_idname = "bim.disable_editing_aggregate"
    bl_label = "Disable Editing Aggregate"
    bl_options = {"REGISTER", "UNDO"}
@@ -81,7 +92,9 @@ class DisableEditingAggregate(bpy.types.Operator, Operator):
        core.disable_editing_aggregate(tool.Aggregate, obj=context.active_object)


-class AddAggregate(bpy.types.Operator):
+class BIM_OT_add_aggregate(bpy.types.Operator):
+    """Add aggregate to IFC element"""
+
    bl_idname = "bim.add_aggregate"
    bl_label = "Add Aggregate"
    bl_options = {"REGISTER", "UNDO"}
@@ -92,10 +105,99 @@ class AddAggregate(bpy.types.Operator):

    def _execute(self, context):
        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
+        element = tool.Ifc.get_entity(obj)
+        if not element:
+            return {"FINISHED"}
+
+        aggregate = self.create_aggregate(context)
+        tool.Collector.sync(obj)
+        current_aggregate = ifcopenshell.util.element.get_aggregate(element)
+        current_container = ifcopenshell.util.element.get_container(element)
+        if current_aggregate:
+            core.assign_object(
+                tool.Ifc,
+                tool.Aggregate,
+                tool.Collector,
+                relating_obj=tool.Ifc.get_object(current_aggregate),
+                related_obj=aggregate,
+            )
+        elif current_container:
+            blenderbim.core.spatial.assign_container(
+                tool.Ifc,
+                tool.Collector,
+                tool.Spatial,
+                structure_obj=tool.Ifc.get_object(current_container),
+                element_obj=aggregate,
+            )
+        core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
+        return {"FINISHED"}
+
+    def create_aggregate(self, context):
        aggregate_collection = bpy.data.collections.new("IfcElementAssembly/Assembly")
        context.scene.collection.children.link(aggregate_collection)
        aggregate = bpy.data.objects.new("Assembly", None)
        aggregate_collection.objects.link(aggregate)
        bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class="IfcElementAssembly")
-        core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
+        return aggregate
+
+
+class BIM_OT_select_parts(bpy.types.Operator):
+    """Select Parts"""
+
+    bl_idname = "bim.select_parts"
+    bl_label = "Select Parts"
+    bl_options = {"REGISTER", "UNDO"}
+    obj: bpy.props.StringProperty()
+
+    def execute(self, context):
+        self.file = IfcStore.get_file()
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        parts = ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(obj))
+        parts_objs = set(tool.Ifc.get_object(part) for part in parts)
+        selectable_parts_objs = set(context.selectable_objects).intersection(parts_objs)
+        for selectable_part_obj in selectable_parts_objs:
+            selectable_part_obj.select_set(True)
        return {"FINISHED"}
+
+
+class BIM_OT_select_aggregate(bpy.types.Operator):
+    """Select Aggregate"""
+
+    bl_idname = "bim.select_aggregate"
+    bl_label = "Select Aggregate"
+    bl_options = {"REGISTER", "UNDO"}
+    obj: bpy.props.StringProperty()
+
+    def execute(self, context):
+        self.file = IfcStore.get_file()
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(obj))
+        aggregate_obj = tool.Ifc.get_object(aggregate)
+        if aggregate_obj in context.selectable_objects:
+            aggregate_obj.select_set(True)
+        return {"FINISHED"}
+
+
+class BIM_OT_add_part_to_object(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_part_to_object"
+    bl_label = "Add Part to Object"
+    bl_options = {"REGISTER", "UNDO"}
+    part_class: bpy.props.StringProperty(name="Class", options={"HIDDEN"})
+    part_name: bpy.props.StringProperty(name="Name")
+    obj: bpy.props.StringProperty(options={"HIDDEN"})
+
+    def invoke(self, context, event):
+        self.part_name = "My " + self.part_class.lstrip("Ifc")
+        return context.window_manager.invoke_props_dialog(self)
+
+    def _execute(self, context):
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        core.add_part_to_object(
+            tool.Ifc,
+            tool.Aggregate,
+            tool.Collector,
+            tool.Blender,
+            obj=obj,
+            part_class=self.part_class,
+            part_name=self.part_name,
+        )
@@ -32,6 +32,17 @@ from bpy.props import (
 )


+def update_relating_object(self, context):
+    def message(self, context):
+        self.layout.label(text="Please select a valid Ifc Element")
+
+    if self.relating_object is None:
+        return
+    if not self.relating_object.BIMObjectProperties.ifc_definition_id:
+        context.window_manager.popup_menu(message, title="Invalid Element Selected", icon="INFO")
+        self.relating_object = None
+
+
 class BIMObjectAggregateProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing")
-    relating_object: PointerProperty(name="Aggregate", type=bpy.types.Object)
+    relating_object: PointerProperty(name="Aggregate", type=bpy.types.Object, update=update_relating_object)
@@ -28,6 +28,7 @@ class BIM_PT_aggregate(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -43,13 +44,14 @@ class BIM_PT_aggregate(Panel):
        return True

    def draw(self, context):
+        layout = self.layout
        if not AggregateData.is_loaded:
            AggregateData.load()

        props = context.active_object.BIMObjectAggregateProperties

        if props.is_editing:
-            row = self.layout.row(align=True)
+            row = layout.row(align=True)
            row.prop(props, "relating_object", text="")
            if props.relating_object:
                op = row.operator("bim.assign_object", icon="CHECKMARK", text="")
@@ -57,15 +59,37 @@ class BIM_PT_aggregate(Panel):
                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
            row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="")
        else:
-            row = self.layout.row(align=True)
-            if AggregateData.data["has_aggregate"]:
-                row.label(text=AggregateData.data["label"])
+            row = layout.row(align=True)
+            if AggregateData.data["has_relating_object"]:
+                row.label(text=AggregateData.data["relating_object_label"], icon="TRIA_UP")
+                op = row.operator("bim.select_aggregate", icon="RESTRICT_SELECT_OFF", text="")
+                op.obj = context.active_object.name
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                row.operator("bim.add_aggregate", icon="ADD", text="")
                op = row.operator("bim.unassign_object", icon="X", text="")
                op.relating_object = AggregateData.data["relating_object_id"]
                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
            else:
-                row.label(text="No Aggregate Found")
+                row.label(text="No Aggregate", icon="TRIA_UP")
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                row.operator("bim.add_aggregate", icon="ADD", text="")
+
+        row = layout.row(align=True)
+        parts = AggregateData.data["related_objects_amount"]
+        row.label(text=f"{parts or 'No'} Part{'s' if parts > 1 else ''}", icon="TRIA_DOWN")
+        if AggregateData.data["has_related_objects"]:
+            op = row.operator("bim.select_parts", icon="RESTRICT_SELECT_OFF", text="")
+            op.obj = context.active_object.name
+
+        ifc_class = AggregateData.data["ifc_class"]
+        part_class = ""
+        if ifc_class == "IfcBuilding":
+            part_class = "IfcBuildingStorey"
+        elif ifc_class == "IfcSite":
+            part_class = "IfcBuilding"
+        elif ifc_class == "IfcProject":
+            part_class = "IfcSite"
+        if part_class != "":
+            op = layout.operator("bim.add_part_to_object", text="Add " + part_class.lstrip("Ifc"))
+            op.part_class = part_class
+            op.obj = context.active_object.name
@@ -24,6 +24,7 @@ classes = (
    operator.DisableEditingAttributes,
    operator.EditAttributes,
    operator.GenerateGlobalId,
+    operator.CopyAttributeToSelection,
    prop.BIMAttributeProperties,
    ui.BIM_PT_object_attributes,
    ui.BIM_PT_material_attributes,
@@ -0,0 +1,74 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import ifcopenshell
+import blenderbim.tool as tool
+
+
+def refresh():
+    AttributesData.is_loaded = False
+    MaterialAttributesData.is_loaded = False
+
+
+class AttributesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {"attributes": cls.attributes()}
+        cls.is_loaded = True
+
+    @classmethod
+    def attributes(cls):
+        results = []
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        data = element.get_info()
+        if hasattr(element, "GlobalId"):
+            excluded_keys = ["id", "type"]
+        else:
+            excluded_keys = ["type"]
+        for key, value in data.items():
+            if value is None or isinstance(value, ifcopenshell.entity_instance) or key in excluded_keys:
+                continue
+            if key == "id":
+                key = "STEP ID"
+            results.append({"name": key, "value": str(value)})
+        return results
+
+
+class MaterialAttributesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {"attributes": cls.attributes()}
+        cls.is_loaded = True
+
+    @classmethod
+    def attributes(cls):
+        results = []
+        element = tool.Ifc.get_entity(bpy.context.active_object.active_material)
+        data = element.get_info()
+        for key, value in data.items():
+            if value is None or isinstance(value, ifcopenshell.entity_instance) or key in ["id", "type"]:
+                continue
+            results.append({"name": key, "value": str(value)})
+        return results
@@ -20,10 +20,21 @@ import bpy
 import json
 import ifcopenshell
 import ifcopenshell.api
+import blenderbim.bim.helper
+import blenderbim.bim.handler
+import blenderbim.tool as tool
+import blenderbim.core.attribute as core
 from blenderbim.bim.ifc import IfcStore
 from ifcopenshell.api.attribute.data import Data


+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
 class EnableEditingAttributes(bpy.types.Operator):
    bl_idname = "bim.enable_editing_attributes"
    bl_label = "Enable Editing Attributes"
@@ -40,22 +51,9 @@ class EnableEditingAttributes(bpy.types.Operator):
        oprops = obj.BIMObjectProperties
        props = obj.BIMAttributeProperties
        props.attributes.clear()
-        for attribute in Data.products[oprops.ifc_definition_id]:
-            new = props.attributes.add()
-            if attribute["type"] == "entity" or (attribute["type"] == "list" and attribute["list_type"] == "entity"):
-                continue
-            new.name = attribute["name"]
-            new.is_null = attribute["is_null"]
-            if attribute["type"] == "string" or attribute["type"] == "list":
-                new.string_value = attribute["value"] or ""
-            elif attribute["type"] == "integer":
-                new.int_value = attribute["value"] or 0
-            elif attribute["type"] == "float":
-                new.float_value = attribute["value"] or 0.0
-            elif attribute["type"] == "enum":
-                new.enum_items = json.dumps(attribute["enum_items"])
-                if attribute["value"]:
-                    new.enum_value = attribute["value"]
+        if oprops.ifc_definition_id not in Data.products:
+            Data.load(IfcStore.get_file(), oprops.ifc_definition_id)
+        blenderbim.bim.helper.import_attributes2(tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes)
        props.is_editing_attributes = True
        return {"FINISHED"}

@@ -77,16 +75,13 @@ class DisableEditingAttributes(bpy.types.Operator):
        return {"FINISHED"}


-class EditAttributes(bpy.types.Operator):
+class EditAttributes(bpy.types.Operator, Operator):
    bl_idname = "bim.edit_attributes"
    bl_label = "Edit Attributes"
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()
    obj_type: bpy.props.StringProperty()

-    def execute(self, context):
-        return IfcStore.execute_ifc_operator(self, context)
-
    def _execute(self, context):
        self.file = IfcStore.get_file()
        if self.obj_type == "Object":
@@ -139,3 +134,14 @@ class GenerateGlobalId(bpy.types.Operator):
        global_id.data_type = "string"
        global_id.string_value = ifcopenshell.guid.new()
        return {"FINISHED"}
+
+
+class CopyAttributeToSelection(bpy.types.Operator, Operator):
+    bl_idname = "bim.copy_attribute_to_selection"
+    bl_label = "Copy Attribute To Selection"
+    name: bpy.props.StringProperty()
+
+    def _execute(self, context):
+        value = context.active_object.BIMAttributeProperties.attributes.get(self.name).get_value()
+        for obj in context.selected_objects:
+            core.copy_attribute_to_selection(tool.Ifc, name=self.name, value=value, obj=obj)
@@ -16,17 +16,16 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

+import blenderbim.bim.helper
 from bpy.types import Panel
 from blenderbim.bim.ifc import IfcStore
-from ifcopenshell.api.attribute.data import Data
+from blenderbim.bim.module.attribute.data import AttributesData, MaterialAttributesData


-def draw_ui(context, layout, obj_type):
+def draw_ui(context, layout, obj_type, attributes):
    obj = context.active_object if obj_type == "Object" else context.active_object.active_material
    oprops = obj.BIMObjectProperties
    props = obj.BIMAttributeProperties
-    if oprops.ifc_definition_id not in Data.products:
-        Data.load(IfcStore.get_file(), oprops.ifc_definition_id)

    if props.is_editing_attributes:
        row = layout.row(align=True)
@@ -37,46 +36,17 @@ def draw_ui(context, layout, obj_type):
        op.obj_type = obj_type
        op.obj = obj.name

-        for attribute in Data.products[oprops.ifc_definition_id]:
-            if attribute["type"] == "entity":
-                continue
-            row = layout.row(align=True)
-            blender_attribute = props.attributes.get(attribute["name"])
-            if attribute["type"] == "string" or attribute["type"] == "list":
-                row.prop(blender_attribute, "string_value", text=attribute["name"])
-            elif attribute["type"] == "integer":
-                row.prop(blender_attribute, "int_value", text=attribute["name"])
-            elif attribute["type"] == "float":
-                row.prop(blender_attribute, "float_value", text=attribute["name"])
-            elif attribute["type"] == "enum":
-                row.prop(blender_attribute, "enum_value", text=attribute["name"])
-
-            if attribute["name"] == "GlobalId":
-                row.operator("bim.generate_global_id", icon="FILE_REFRESH", text="")
-            if attribute["is_optional"]:
-                row.prop(
-                    blender_attribute,
-                    "is_null",
-                    icon="RADIOBUT_OFF" if blender_attribute.is_null else "RADIOBUT_ON",
-                    text="",
-                )
+        blenderbim.bim.helper.draw_attributes(props.attributes, layout, copy_operator="bim.copy_attribute_to_selection")
    else:
        row = layout.row()
        op = row.operator("bim.enable_editing_attributes", icon="GREASEPENCIL", text="Edit")
        op.obj_type = obj_type
        op.obj = obj.name

-        if "GlobalId" not in [a["name"] for a in Data.products[oprops.ifc_definition_id]]:
-            row = layout.row(align=True)
-            row.label(text="STEP ID")
-            row.label(text=str(oprops.ifc_definition_id))
-
-        for attribute in Data.products[oprops.ifc_definition_id]:
-            if attribute["value"] is None or attribute["type"] == "entity":
-                continue
+        for attribute in attributes:
            row = layout.row(align=True)
            row.label(text=attribute["name"])
-            row.label(text=str(attribute["value"]))
+            row.label(text=attribute["value"])

    # TODO: reimplement, see #1222
    # if "IfcSite/" in context.active_object.name or "IfcBuilding/" in context.active_object.name:
@@ -89,6 +59,7 @@ class BIM_PT_object_attributes(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -99,7 +70,9 @@ class BIM_PT_object_attributes(Panel):
        return bool(context.active_object.BIMObjectProperties.ifc_definition_id)

    def draw(self, context):
-        draw_ui(context, self.layout, "Object")
+        if not AttributesData.is_loaded:
+            AttributesData.load()
+        draw_ui(context, self.layout, "Object", AttributesData.data["attributes"])


 class BIM_PT_material_attributes(Panel):
@@ -119,4 +92,6 @@ class BIM_PT_material_attributes(Panel):
            return False

    def draw(self, context):
-        draw_ui(context, self.layout, "Material")
+        if not MaterialAttributesData.is_loaded:
+            MaterialAttributesData.load()
+        draw_ui(context, self.layout, "Material", MaterialAttributesData.data["attributes"])
@@ -26,6 +26,7 @@ class BIM_PT_augin(bpy.types.Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_integrations"

    def draw(self, context):
        layout = self.layout
@@ -768,6 +768,8 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        props = context.scene.BCFProperties
        blender_topic = props.active_topic
+        if blender_topic is None:
+            return False
        topic = bcfxml.topics[blender_topic.name]
        return topic.viewpoints

@@ -842,6 +844,8 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                obj.data.angle = 2 * atan(
                    (0.5 * cam_height) / (0.5 * cam_width / tan(radians(camera.field_of_view) / 2))
                )
+        else:
+            return

        z_axis = Vector(
            (-camera.camera_direction.x, -camera.camera_direction.y, -camera.camera_direction.z)
@@ -878,7 +882,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        # Operators with context overrides are used because they are
        # significantly faster than looping through all objects

-        exception_global_ids = [v.ifc_guid for v in viewpoint.components.visibility.exceptions]
+        exception_global_ids = {v.ifc_guid for v in viewpoint.components.visibility.exceptions}

        if viewpoint.components.visibility.default_visibility:
            old = context.area.type
@@ -95,7 +95,7 @@ def getBcfViewpoints(self, context, force_update=False):
        props = context.scene.BCFProperties
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        topic = props.active_topic
-        viewpoints = bcfxml.get_viewpoints(topic.name)
+        viewpoints = bcfxml.get_viewpoints(topic.name) if topic else {}
        bcfviewpoints_enum.extend([(v, f"Viewpoint {i+1}", "") for i, v in enumerate(viewpoints.keys())])
    return bcfviewpoints_enum

@@ -29,6 +29,7 @@ class BIM_PT_bcf(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -19,7 +19,7 @@
 import os
 from pathlib import Path
 from blenderbim.bim.prop import StrProperty
-from blenderbim.bim.module.root.prop import getIfcClasses
+from blenderbim.bim.module.root.prop import get_ifc_classes
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -33,14 +33,11 @@ from bpy.props import (
 )

 scenarios_enum = []
-classes_enum = []


 def purge():
    global scenarios_enum
-    global classes_enum
    scenarios_enum = []
-    classes_enum = []


 def getScenarios(self, context):
@@ -68,7 +65,7 @@ class BimTesterProperties(PropertyGroup):
    feature: StringProperty(default="", name="Feature / IDS", update=refreshScenarios)
    steps: StringProperty(default="", name="Custom Steps")
    ifc_file: StringProperty(default="", name="IFC File")
-    audit_ifc_class: EnumProperty(items=getIfcClasses, name="Audit Class")
+    audit_ifc_class: EnumProperty(items=get_ifc_classes, name="Audit Class")
    qa_reject_element_reason: StringProperty(name="Element Rejection Reason")
    scenario: EnumProperty(items=getScenarios, name="Scenario")
    should_load_from_memory: BoolProperty(default=False, name="Load from Memory")
@@ -27,6 +27,7 @@ class BIM_PT_qa(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_quality_control"

    def draw(self, context):
        self.layout.use_property_split = True
@@ -17,14 +17,28 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-from . import ui
+from . import ui, operator, prop

-classes = (ui.BIM_PT_boundary,)
+classes = (
+    operator.LoadProjectSpaceBoundaries,
+    operator.LoadSpaceBoundaries,
+    operator.LoadBoundary,
+    operator.SelectProjectBoundaries,
+    operator.ColourByRelatedBuildingElement,
+    operator.EnableEditingBoundary,
+    operator.DisableEditingBoundary,
+    operator.EditBoundaryAttributes,
+    operator.UpdateBoundaryGeometry,
+    ui.BIM_PT_Boundary,
+    ui.BIM_PT_SpaceBoundaries,
+    ui.BIM_PT_SceneBoundaries,
+    prop.BIMBoundaryProperties,
+)


 def register():
-    pass
+    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)


 def unregister():
-    pass
+    del bpy.types.Object.bim_boundary_properties
@@ -0,0 +1,290 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021, 2022 Cyril Waechter <cyril@biminsight.ch>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import logging
+import ifcopenshell.api
+import blenderbim.tool as tool
+from blenderbim.bim.ifc import IfcStore
+from ifcopenshell.api.boundary.data import Data
+import blenderbim.bim.import_ifc as import_ifc
+
+
+def get_boundaries_collection(blender_space):
+    space_collection = bpy.data.collections.get(blender_space.name, blender_space.users_collection[0])
+    collection_name = f"Boundaries/{blender_space.BIMObjectProperties.ifc_definition_id}"
+    boundaries_collection = space_collection.children.get(collection_name)
+    if not boundaries_collection:
+        boundaries_collection = bpy.data.collections.new(collection_name)
+        space_collection.children.link(boundaries_collection)
+    return boundaries_collection
+
+
+class Loader:
+    def __init__(self):
+        self.ifc_file = None
+        self.logger = None
+        self.ifc_importer = None
+        self.settings = None
+        self.load_settings()
+        self.load_importer()
+
+    def create_mesh(self, boundary):
+        # ConnectionGeometry is optional in IFC schema for some reasons.
+        if not boundary.ConnectionGeometry:
+            return None
+        surface = boundary.ConnectionGeometry.SurfaceOnRelatingElement
+        # workaround for unvalid geometry provided by Revit. See https://github.com/IfcOpenShell/IfcOpenShell/issues/635#issuecomment-770366838
+        if surface.is_a("IfcCurveBoundedPlane") and not getattr(surface, "InnerBoundaries", None):
+            surface.InnerBoundaries = ()
+        shape = ifcopenshell.geom.create_shape(self.settings, surface)
+        mesh = self.ifc_importer.create_mesh(None, shape)
+        self.ifc_importer.link_mesh(shape, mesh)
+        return mesh
+
+    def load_settings(self):
+        self.settings = ifcopenshell.geom.settings()
+        self.settings.set(self.settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
+        self.settings.set(self.settings.USE_BREP_DATA, False)
+
+    def load_importer(self):
+        self.ifc_file = tool.Ifc.get()
+        self.logger = logging.getLogger("ImportIFC")
+        ifc_import_settings = import_ifc.IfcImportSettings.factory(bpy.context, IfcStore.path, self.logger)
+        self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
+        self.ifc_importer.file = self.ifc_file
+
+    def load_boundary(self, boundary_id, blender_space):
+        boundary = self.ifc_file.by_id(boundary_id)
+        obj = tool.Ifc.get_object(boundary)
+        if obj:
+            return obj
+        mesh = self.create_mesh(boundary)
+        obj = bpy.data.objects.new(f"{boundary.is_a()}/{boundary.Name}", mesh)
+        obj.matrix_world = blender_space.matrix_world
+        boundaries_collection = get_boundaries_collection(blender_space)
+        boundaries_collection.objects.link(obj)
+        tool.Ifc.link(boundary, obj)
+        return obj
+
+
+class LoadProjectSpaceBoundaries(bpy.types.Operator):
+    bl_idname = "bim.load_project_space_boundaries"
+    bl_label = "Load all project space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        loader = Loader()
+        if not Data.is_loaded:
+            Data.load(tool.Ifc.get())
+        for space_id, boundaries_id in Data.spaces.items():
+            blender_space = tool.Ifc.get_object(tool.Ifc.get().by_id(space_id))
+            for boundary_id in boundaries_id:
+                loader.load_boundary(boundary_id, blender_space)
+        return {"FINISHED"}
+
+
+class LoadBoundary(bpy.types.Operator):
+    bl_idname = "bim.load_boundary"
+    bl_label = "Load boundary"
+    bl_options = {"REGISTER", "UNDO"}
+    boundary_id: bpy.props.IntProperty()
+
+    def execute(self, context):
+        loader = Loader()
+        blender_space = context.active_object
+        for obj in context.visible_objects:
+            obj.select_set(False)
+        obj = loader.load_boundary(self.boundary_id, blender_space)
+        obj.select_set(True)
+        bpy.context.view_layer.objects.active = obj
+        return {"FINISHED"}
+
+
+class LoadSpaceBoundaries(bpy.types.Operator):
+    bl_idname = "bim.load_space_boundaries"
+    bl_label = "Load selected space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        blender_space = context.active_object
+        oprops = context.active_object.BIMObjectProperties
+        loader = Loader()
+        if not Data.is_loaded:
+            Data.load(tool.Ifc.get())
+        for boundary_id in Data.spaces.get(oprops.ifc_definition_id, []):
+            loader.load_boundary(boundary_id, blender_space)
+        return {"FINISHED"}
+
+
+class SelectProjectBoundaries(bpy.types.Operator):
+    bl_idname = "bim.select_project_space_boundaries"
+    bl_label = "Select all project space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        for obj in context.visible_objects:
+            obj.select_set(False)
+        ifc_file = tool.Ifc.get()
+        for boundary_id in Data.boundaries:
+            boundary = ifc_file.by_id(boundary_id)
+            obj = tool.Ifc.get_object(boundary)
+            if obj:
+                obj.select_set(True)
+        return {"FINISHED"}
+
+
+def get_colour(ifc_boundary):
+    """Return a color depending on IfcClass given"""
+    product_colors = {
+        "IfcWall": (0.7, 0.3, 0, 1),
+        "IfcWindow": (0, 0.7, 1, 1),
+        "IfcSlab": (0.7, 0.7, 0.5, 1),
+        "IfcRoof": (0, 0.3, 0, 1),
+        "IfcDoor": (1, 1, 1, 1),
+    }
+    if ifc_boundary.PhysicalOrVirtualBoundary == "VIRTUAL":
+        return (1, 0, 1, 1)
+
+    element = ifc_boundary.RelatedBuildingElement
+    if not element:
+        return (1, 0, 0, 1)
+    for product, colour in product_colors.items():
+        if element.is_a(product):
+            return colour
+    return (0, 0, 0, 1)
+
+
+class ColourByRelatedBuildingElement(bpy.types.Operator):
+    bl_idname = "bim.colour_by_related_building_element"
+    bl_label = "Apply colour based on related building elements"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        IfcStore.begin_transaction(self)
+        self.store_state(context)
+        result = self._execute(context)
+        IfcStore.add_transaction_operation(self)
+        IfcStore.end_transaction(self)
+        return result
+
+    def _execute(self, context):
+        self.file = tool.Ifc.get()
+        for obj in context.visible_objects:
+            if not obj.BIMObjectProperties.ifc_definition_id:
+                continue
+            element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            if not element.is_a("IfcRelSpaceBoundary"):
+                continue
+            obj.color = get_colour(element)
+        areas = [a for a in context.screen.areas if a.type == "VIEW_3D"]
+        if areas:
+            areas[0].spaces[0].shading.color_type = "OBJECT"
+        return {"FINISHED"}
+
+    def store_state(self, context):
+        areas = [a for a in context.screen.areas if a.type == "VIEW_3D"]
+        if areas:
+            self.transaction_data = {"area": areas[0], "color_type": areas[0].spaces[0].shading.color_type}
+
+    def rollback(self, data):
+        if data:
+            data["area"].spaces[0].shading.color_type = data["color_type"]
+
+    def commit(self, data):
+        if data:
+            data["area"].spaces[0].shading.color_type = "OBJECT"
+
+
+EDITABLE_ATTRIBUTES = {
+    "RelatingSpace": "relating_space",
+    "RelatedBuildingElement": "related_building_element",
+    "ParentBoundary": "parent_boundary",
+    "CorrespondingBoundary": "corresponding_boundary",
+}
+
+
+class EnableEditingBoundary(bpy.types.Operator):
+    bl_idname = "bim.enable_editing_boundary"
+    bl_label = "Edit boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        bprops.is_editing = True
+        boundary = tool.Ifc.get_entity(context.active_object)
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            entity = getattr(boundary, ifc_attribute, None)
+            if not entity:
+                continue
+            obj = tool.Ifc.get_object(entity)
+            if entity and obj:
+                setattr(bprops, blender_property, obj)
+        return {"FINISHED"}
+
+
+class DisableEditingBoundary(bpy.types.Operator):
+    bl_idname = "bim.disable_editing_boundary"
+    bl_label = "Disable editing boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        bprops.is_editing = False
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            setattr(bprops, blender_property, None)
+        return {"FINISHED"}
+
+
+class EditBoundaryAttributes(bpy.types.Operator):
+    bl_idname = "bim.edit_boundary_attributes"
+    bl_label = "Disable editing boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        boundary = tool.Ifc.get_entity(context.active_object)
+        attributes = dict()
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            obj = getattr(bprops, blender_property, None)
+            entity = tool.Ifc.get_entity(obj)
+            attributes[blender_property] = entity
+        ifcopenshell.api.run("boundary.edit_attributes", tool.Ifc.get(), entity=boundary, **attributes)
+        bpy.ops.bim.disable_editing_boundary()
+        return {"FINISHED"}
+
+
+class UpdateBoundaryGeometry(bpy.types.Operator):
+    bl_idname = "bim.update_boundary_geometry"
+    bl_label = "Update boundary geometry"
+    bl_description = """
+    Update boundary connection geometry from mesh.
+    Mesh must lie on a single plane. It should look like a face or a face with holes.
+    """
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        settings = tool.Boundary.get_assign_connection_geometry_settings(context.active_object)
+        ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
+        return {"FINISHED"}
@@ -0,0 +1,60 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+from bpy.types import PropertyGroup
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+import blenderbim.tool as tool
+
+
+def space_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcSpace") or entity.is_a("IfcExternalSpatialElement")
+    return False
+
+
+def boundary_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcRelSpaceBoundary")
+    return False
+
+
+def element_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcElement")
+    return False
+
+
+class BIMBoundaryProperties(PropertyGroup):
+    is_editing: BoolProperty(name="Is Editing")
+    relating_space: PointerProperty(name="RelatingSpace", type=bpy.types.Object, poll=space_filter)
+    related_building_element: PointerProperty(name="RelatedBuildingElement", type=bpy.types.Object, poll=element_filter)
+    parent_boundary: PointerProperty(name="ParentBoundary", type=bpy.types.Object, poll=boundary_filter)
+    corresponding_boundary: PointerProperty(name="CorrespondingBoundary", type=bpy.types.Object, poll=boundary_filter)
@@ -20,16 +20,37 @@ import bpy
 import blenderbim.bim.helper
 from bpy.types import Panel, UIList
 from blenderbim.bim.ifc import IfcStore
+import blenderbim.tool as tool
 from ifcopenshell.api.boundary.data import Data


-class BIM_PT_boundary(Panel):
+class BIM_PT_SceneBoundaries(Panel):
    bl_label = "IFC Space Boundaries"
-    bl_idname = "BIM_PT_boundary"
+    bl_id_name = "BIM_PT_scene_boundaries"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_geometry"
+
+    @classmethod
+    def poll(cls, context):
+        return IfcStore.get_file()
+
+    def draw(self, context):
+        row = self.layout.row(align=True)
+        row.operator("bim.load_project_space_boundaries")
+        row.operator("bim.select_project_space_boundaries", text="", icon="RESTRICT_SELECT_OFF")
+        row.operator("bim.colour_by_related_building_element", text="", icon="BRUSH_DATA")
+
+
+class BIM_PT_Boundary(Panel):
+    bl_label = "IFC Space Boundary"
+    bl_idname = "BIM_PT_Boundary"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
    def poll(cls, context):
@@ -40,15 +61,97 @@ class BIM_PT_boundary(Panel):
            return False
        if not IfcStore.get_element(props.ifc_definition_id):
            return False
-        if IfcStore.get_file().by_id(props.ifc_definition_id).is_a() not in ["IfcSpace", "IfcExternalSpatialElement"]:
-            return False
-        return True
+        entity = IfcStore.get_file().by_id(props.ifc_definition_id)
+        return entity.is_a("IfcRelSpaceBoundary")

    def draw(self, context):
-        self.oprops = context.active_object.BIMObjectProperties
-        if not Data.is_loaded:
-            Data.load(IfcStore.get_file())
-        for boundary_id in Data.spaces.get(self.oprops.ifc_definition_id, []):
-            boundary = Data.boundaries[boundary_id]
+        props = context.active_object.BIMObjectProperties
+        ifc_file = tool.Ifc.get()
+        element = ifc_file.by_id(props.ifc_definition_id)
+        boundary = ifc_file.by_id(props.ifc_definition_id)
+        self.bprops = context.active_object.bim_boundary_properties
+        if self.bprops.is_editing:
+            row = self.layout.row(align=True)
+            row.operator("bim.edit_boundary_attributes", icon="CHECKMARK", text="Save Attributes")
+            row.operator("bim.disable_editing_boundary", icon="CANCEL", text="")
+            self.draw_relation_editor(boundary, "RelatingSpace", "relating_space")
+            self.draw_relation_editor(boundary, "RelatedBuildingElement", "related_building_element")
+            self.draw_relation_editor(boundary, "ParentBoundary", "parent_boundary")
+            self.draw_relation_editor(boundary, "CorrespondingBoundary", "corresponding_boundary")
+        else:
            row = self.layout.row()
-            row.label(text=f"{boundary_id}", icon="GHOST_ENABLED")
+            row.operator("bim.enable_editing_boundary", icon="GREASEPENCIL", text="Edit")
+            self.draw_relation_data(boundary, "RelatingSpace")
+            self.draw_relation_data(boundary, "RelatedBuildingElement")
+            self.draw_relation_data(boundary, "ParentBoundary")
+            self.draw_relation_data(boundary, "CorrespondingBoundary")
+            if hasattr(boundary, "InnerBoundaries"):
+                for i, inner_boundary in enumerate(getattr(boundary, "InnerBoundaries", ())):
+                    row = self.layout.row(align=True)
+                    row.label(text="InnerBoundaries")
+                    row.label(text=f"[{i}]")
+                    row.label(text=f"{inner_boundary.is_a()}/{inner_boundary.Name}")
+        row = self.layout.row()
+        row.operator("bim.update_boundary_geometry")
+
+    def draw_relation_data(self, boundary, ifc_attribute: str):
+        row = self.layout.row(align=True)
+        if hasattr(boundary, ifc_attribute):
+            row.label(text=ifc_attribute)
+            entity = getattr(boundary, ifc_attribute)
+            if entity:
+                row.label(text=f"{entity.is_a()}/{entity.Name}")
+                op = row.operator("bim.select_global_id", text="", icon="TRACKER")
+                op.global_id = entity.GlobalId
+            else:
+                row.label(text="")
+
+    def draw_relation_editor(self, boundary, ifc_attribute: str, blender_property: str):
+        if hasattr(boundary, ifc_attribute):
+            row = self.layout.row(align=True)
+            row.prop(self.bprops, blender_property)
+
+
+class BIM_PT_SpaceBoundaries(Panel):
+    bl_label = "IFC Space Boundaries"
+    bl_idname = "BIM_PT_SpaceBoundaries"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "object"
+    bl_parent_id = "BIM_PT_geometry_object"
+
+    @classmethod
+    def poll(cls, context):
+        if not context.active_object:
+            return False
+        props = context.active_object.BIMObjectProperties
+        if not props.ifc_definition_id:
+            return False
+        if not IfcStore.get_element(props.ifc_definition_id):
+            return False
+        valid_classes = ("IfcSpace", "IfcExternalSpatialElement")
+        entity = IfcStore.get_file().by_id(props.ifc_definition_id)
+        for ifc_class in valid_classes:
+            if entity.is_a(ifc_class):
+                return True
+        return False
+
+    def draw(self, context):
+        self.props = context.active_object.BIMObjectProperties
+        self.ifc_file = tool.Ifc.get()
+        row = self.layout.row()
+        row.operator("bim.load_space_boundaries")
+        if not Data.is_loaded:
+            Data.load(self.ifc_file)
+        for boundary_id in Data.spaces.get(self.props.ifc_definition_id, []):
+            boundary_data = Data.boundaries[boundary_id]
+            building_element = self.ifc_file.by_id(boundary_data["RelatedBuildingElement"])
+            row = self.layout.row()
+            if building_element:
+                bld_el_description = f"{building_element.is_a()}/{building_element.Name}"
+            else:
+                bld_el_description = None
+            row.label(text=f"{boundary_id} > {bld_el_description}", icon="GHOST_ENABLED")
+            op = row.operator("bim.load_boundary", text="", icon="RESTRICT_SELECT_OFF")
+            op.boundary_id = boundary_id
@@ -0,0 +1,49 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+from . import ui, prop, operator
+
+classes = (
+    operator.AddBrick,
+    operator.AddBrickFeed,
+    operator.AssignBrickReference,
+    operator.CloseBrickProject,
+    operator.ConvertBrickProject,
+    operator.ConvertIfcToBrick,
+    operator.LoadBrickProject,
+    operator.NewBrickFile,
+    operator.RefreshBrickViewer,
+    operator.RemoveBrick,
+    operator.RewindBrickClass,
+    operator.ViewBrickClass,
+    operator.ViewBrickItem,
+    prop.Brick,
+    prop.BIMBrickProperties,
+    ui.BIM_PT_brickschema,
+    ui.BIM_PT_ifc_brickschema_references,
+    ui.BIM_UL_bricks,
+)
+
+
+def register():
+    bpy.types.Scene.BIMBrickProperties = bpy.props.PointerProperty(type=prop.BIMBrickProperties)
+
+
+def unregister():
+    del bpy.types.Scene.BIMBrickProperties
@@ -0,0 +1,180 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import blenderbim.tool as tool
+from blenderbim.tool.brick import BrickStore
+
+try:
+    from rdflib import URIRef, BNode
+except:
+    # See #1860
+    print("Warning: brickschema not available.")
+
+
+def refresh():
+    BrickschemaData.is_loaded = False
+    BrickschemaReferencesData.is_loaded = False
+
+
+class BrickschemaData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {
+            "is_loaded": cls.get_is_loaded(),
+            "attributes": cls.attributes(),
+            "namespaces": cls.namespaces(),
+            "brick_equipment_classes": cls.brick_equipment_classes(),
+        }
+
+    @classmethod
+    def get_is_loaded(cls):
+        return BrickStore.graph is not None
+
+    @classmethod
+    def attributes(cls):
+        if BrickStore.graph is None:
+            return []
+        props = bpy.context.scene.BIMBrickProperties
+        try:
+            brick = props.bricks[props.active_brick_index]
+        except:
+            return []
+        results = []
+        uri = brick.uri
+        query = BrickStore.graph.query(
+            """
+            PREFIX brick: <https://brickschema.org/schema/Brick#>
+            PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+            PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            SELECT DISTINCT ?name ?value ?sp ?sv WHERE {
+               <{uri}> ?name ?value .
+               OPTIONAL {
+               { ?name rdfs:range brick:TimeseriesReference . }
+                UNION
+               { ?name a brick:EntityProperty . }
+                ?value ?sp ?sv }
+            }
+        """.replace(
+                "{uri}", uri
+            )
+        )
+
+        for row in query:
+            name = row.get("name").toPython().split("#")[-1]
+            value = row.get("value")
+            results.append(
+                {
+                    "name": name,
+                    "value": value.toPython().split("#")[-1],
+                    "is_uri": isinstance(value, URIRef),
+                    "value_uri": value.toPython(),
+                    "is_globalid": name == "globalID",
+                }
+            )
+            if isinstance(row.get("value"), BNode):
+                for s, p, o in BrickStore.graph.triples((value, None, None)):
+                    results.append(
+                        {
+                            "name": name + ":" + p.toPython().split("#")[-1],
+                            "value": o.toPython().split("#")[-1],
+                            "is_uri": isinstance(o, URIRef),
+                            "value_uri": o.toPython(),
+                            "is_globalid": p.toPython().split("#")[-1] == "globalID",
+                        }
+                    )
+        return results
+
+    @classmethod
+    def namespaces(cls):
+        if BrickStore.graph is None:
+            return []
+        results = []
+        for alias, uri in BrickStore.graph.namespaces():
+            results.append((uri, f"{alias}: {uri}", ""))
+        return results
+
+    @classmethod
+    def brick_equipment_classes(cls):
+        if BrickStore.graph is None:
+            return []
+        results = []
+        query = BrickStore.graph.query(
+            """
+            PREFIX brick: <https://brickschema.org/schema/Brick#>
+            PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+            SELECT ?class WHERE {
+                ?class rdfs:subClassOf* brick:Equipment .
+            }
+        """
+        )
+        for uri in sorted([x[0].toPython() for x in query]):
+            results.append((uri, uri.split("#")[-1], ""))
+        return results
+
+
+class BrickschemaReferencesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {"is_loaded": cls.get_is_loaded(), "libraries": cls.libraries(), "references": cls.references()}
+
+    @classmethod
+    def get_is_loaded(cls):
+        return BrickStore.graph is not None
+
+    @classmethod
+    def libraries(cls):
+        results = []
+        ifc = tool.Ifc.get()
+        if not ifc:
+            return results
+        for library in ifc.by_type("IfcLibraryInformation"):
+            if tool.Ifc.get_schema() == "IFC2X3":
+                results.append((str(library.id()), library.Name or "Unnamed", ""))
+            elif ".ttl" in library.Location:
+                results.append((str(library.id()), library.Name or "Unnamed", ""))
+        return results
+
+    @classmethod
+    def references(cls):
+        results = []
+        for rel in getattr(tool.Ifc.get_entity(bpy.context.active_object), "HasAssociations", []):
+            if rel.is_a("IfcRelAssociatesLibrary"):
+                reference = rel.RelatingLibrary
+                if tool.Ifc.get_schema() == "IFC2X3" and "#" not in reference.ItemReference:
+                    continue
+                if tool.Ifc.get_schema() != "IFC2X3" and "#" not in reference.Identification:
+                    continue
+                results.append(
+                    {
+                        "id": reference.id(),
+                        "identification": reference.ItemReference
+                        if tool.Ifc.get_schema() == "IFC2X3"
+                        else reference.Identification,
+                        "name": reference.Name or "Unnamed",
+                    }
+                )
+        return results
@@ -0,0 +1,191 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import ifcopenshell.api
+import blenderbim.tool as tool
+import blenderbim.core.brick as core
+import blenderbim.bim.handler
+from blenderbim.bim.ifc import IfcStore
+
+
+class Operator:
+    def execute(self, context):
+        self._execute(context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class LoadBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.load_brick_project"
+    bl_label = "Load Brickschema Project"
+    bl_options = {"REGISTER", "UNDO"}
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
+
+    def _execute(self, context):
+        core.load_brick_project(tool.Brick, filepath=self.filepath)
+
+    def invoke(self, context, event):
+        context.window_manager.fileselect_add(self)
+        return {"RUNNING_MODAL"}
+
+
+class ViewBrickClass(bpy.types.Operator, Operator):
+    bl_idname = "bim.view_brick_class"
+    bl_label = "View Brick Class"
+    bl_options = {"REGISTER", "UNDO"}
+    brick_class: bpy.props.StringProperty(name="Brick Class")
+
+    def _execute(self, context):
+        core.view_brick_class(tool.Brick, brick_class=self.brick_class)
+
+
+class ViewBrickItem(bpy.types.Operator, Operator):
+    bl_idname = "bim.view_brick_item"
+    bl_label = "View Brick Item"
+    bl_options = {"REGISTER", "UNDO"}
+    item: bpy.props.StringProperty(name="Brick Item")
+
+    def _execute(self, context):
+        core.view_brick_item(tool.Brick, item=self.item)
+
+
+class RewindBrickClass(bpy.types.Operator, Operator):
+    bl_idname = "bim.rewind_brick_class"
+    bl_label = "Rewind Brick Class"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.rewind_brick_class(tool.Brick)
+
+
+class CloseBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.close_brick_project"
+    bl_label = "Close Brick Project"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.close_brick_project(tool.Brick)
+
+
+class ConvertBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.convert_brick_project"
+    bl_label = "Convert Brick Project"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.convert_brick_project(tool.Ifc, tool.Brick)
+
+
+class AssignBrickReference(bpy.types.Operator, Operator):
+    bl_idname = "bim.assign_brick_reference"
+    bl_label = "Assign Brick Reference"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        core.assign_brick_reference(
+            tool.Ifc,
+            tool.Brick,
+            element=tool.Ifc.get_entity(context.active_object),
+            library=tool.Ifc.get().by_id(int(props.libraries)),
+            brick_uri=props.bricks[props.active_brick_index].uri,
+        )
+
+
+class AddBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick"
+    bl_label = "Add Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        library = None
+        if props.libraries:
+            library = tool.Ifc.get().by_id(int(props.libraries))
+        core.add_brick(
+            tool.Ifc,
+            tool.Brick,
+            element=tool.Ifc.get_entity(context.active_object) if context.selected_objects else None,
+            namespace=props.namespace,
+            brick_class=props.brick_equipment_class,
+            library=library,
+        )
+
+
+class AddBrickFeed(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick_feed"
+    bl_label = "Add Brick Feed"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        source = tool.Ifc.get_entity([o for o in context.selected_objects if o != context.active_object][0])
+        destination = tool.Ifc.get_entity(context.active_object)
+        core.add_brick_feed(
+            tool.Ifc,
+            tool.Brick,
+            source=source,
+            destination=destination,
+        )
+
+
+class ConvertIfcToBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.convert_ifc_to_brick"
+    bl_label = "Convert IFC To Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        library = None
+        if props.libraries:
+            library = tool.Ifc.get().by_id(int(props.libraries))
+        core.convert_ifc_to_brick(tool.Brick, namespace=props.namespace, library=library)
+
+
+class NewBrickFile(bpy.types.Operator, Operator):
+    bl_idname = "bim.new_brick_file"
+    bl_label = "New Brick File"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.new_brick_file(tool.Brick)
+
+
+class RefreshBrickViewer(bpy.types.Operator, Operator):
+    bl_idname = "bim.refresh_brick_viewer"
+    bl_label = "Refresh Brick Viewer"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.refresh_brick_viewer(tool.Brick)
+
+
+class RemoveBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.remove_brick"
+    bl_label = "Remove Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        core.remove_brick(
+            tool.Ifc,
+            tool.Brick,
+            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
+            brick_uri=props.bricks[props.active_brick_index].uri,
+        )
@@ -0,0 +1,71 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
+from blenderbim.bim.prop import StrProperty, Attribute
+from bpy.types import PropertyGroup
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+
+
+def update_active_brick_index(self, context):
+    BrickschemaData.is_loaded = False
+
+
+def get_libraries(self, context):
+    if not BrickschemaReferencesData.is_loaded:
+        BrickschemaReferencesData.load()
+    return BrickschemaReferencesData.data["libraries"]
+
+
+def get_namespaces(self, context):
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["namespaces"]
+
+
+def get_brick_equipment_classes(self, context):
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["brick_equipment_classes"]
+
+
+class Brick(PropertyGroup):
+    name: StringProperty(name="Name")
+    label: StringProperty(name="Label")
+    uri: StringProperty(name="URI")
+    total_items: IntProperty(name="Total Items")
+
+
+class BIMBrickProperties(PropertyGroup):
+    active_brick_class: StringProperty(name="Active Brick Class")
+    brick_breadcrumbs: CollectionProperty(name="Brick Breadcrumbs", type=StrProperty)
+    bricks: CollectionProperty(name="Bricks", type=Brick)
+    active_brick_index: IntProperty(name="Active Brick Index", update=update_active_brick_index)
+    libraries: EnumProperty(name="Libraries", items=get_libraries)
+    namespace: EnumProperty(name="Namespace", items=get_namespaces)
+    brick_equipment_class: EnumProperty(name="Brick Equipment Class", items=get_brick_equipment_classes)
@@ -0,0 +1,134 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import blenderbim.tool as tool
+from bpy.types import Panel, UIList
+from blenderbim.bim.helper import prop_with_search
+from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
+
+
+class BIM_PT_brickschema(Panel):
+    bl_label = "Brickschema Project"
+    bl_idname = "BIM_PT_brickschema"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+
+    def draw(self, context):
+        if not BrickschemaData.is_loaded:
+            BrickschemaData.load()
+        self.props = context.scene.BIMBrickProperties
+
+        if not BrickschemaData.data["is_loaded"]:
+            row = self.layout.row(align=True)
+            row.operator("bim.new_brick_file", text="Create Project")
+            row.operator("bim.load_brick_project", text="Load Project")
+            return
+
+        row = self.layout.row(align=True)
+        if len(self.props.brick_breadcrumbs):
+            row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
+        row.label(text=self.props.active_brick_class)
+        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
+        row.operator("bim.close_brick_project", text="", icon="CANCEL")
+
+        row = self.layout.row(align=True)
+        prop_with_search(row, self.props, "namespace", text="")
+        prop_with_search(row, self.props, "brick_equipment_class", text="")
+        row.prop(self.props, "brick_equipment_class", text="")
+        row.operator("bim.add_brick", text="", icon="ADD")
+
+        row = self.layout.row(align=True)
+        row.alignment = "RIGHT"
+        row.operator("bim.add_brick_feed", text="", icon="PLUGIN")
+        row.operator("bim.remove_brick", text="", icon="X")
+
+        self.layout.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
+
+        for attribute in BrickschemaData.data["attributes"]:
+            row = self.layout.row(align=True)
+            row.label(text=attribute["name"])
+            row.label(text=attribute["value"])
+            if attribute["is_uri"]:
+                op = row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT")
+                op.item = attribute["value_uri"]
+            if attribute["is_globalid"]:
+                op = row.operator("bim.select_global_id", icon="RESTRICT_SELECT_OFF", text="")
+                op.global_id = attribute["value"]
+
+
+class BIM_PT_ifc_brickschema_references(Panel):
+    bl_label = "IFC Brickschema References"
+    bl_idname = "BIM_PT_ifc_brickschema_references"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_brickschema"
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+
+    def draw(self, context):
+        if not BrickschemaReferencesData.is_loaded:
+            BrickschemaReferencesData.load()
+        self.props = context.scene.BIMBrickProperties
+
+        if not BrickschemaReferencesData.data["is_loaded"]:
+            row = self.layout.row()
+            row.label(text="No Brickschema Project Loaded")
+            return
+
+        if not BrickschemaReferencesData.data["libraries"]:
+            row = self.layout.row(align=True)
+            row.label(text="No IFC Libraries")
+            row.operator("bim.convert_brick_project", text="", icon="ADD")
+            return
+
+        row = self.layout.row(align=True)
+        prop_with_search(row, self.props, "libraries")
+        row.operator("bim.convert_brick_project", text="", icon="ADD")
+
+        row = self.layout.row(align=True)
+        row.operator("bim.assign_brick_reference", icon="ADD")
+        row.operator("bim.convert_ifc_to_brick", icon="IMPORT")
+
+        if not BrickschemaReferencesData.data["references"]:
+            row = self.layout.row()
+            row.label(text="No References")
+
+        for reference in BrickschemaReferencesData.data["references"]:
+            row = self.layout.row(align=True)
+            row.label(text=reference["identification"], icon="ASSET_MANAGER")
+            row.label(text=reference["name"])
+            row.operator("bim.unassign_library_reference", text="", icon="X").reference = reference["id"]
+            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
+
+
+class BIM_UL_bricks(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            if item.total_items:
+                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
+                op.brick_class = item.name
+            row.label(text=item.label if item.label else item.name)
+            if item.total_items:
+                row.label(text=str(item.total_items))
@@ -0,0 +1,39 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+from . import operator, workspace
+
+classes = (
+    operator.CadArcFrom2Points,
+    operator.CadArcFrom3Points,
+    operator.CadFillet,
+    operator.CadMitre,
+    operator.CadTrimExtend,
+    workspace.CadHotkey,
+)
+
+
+def register():
+    if not bpy.app.background:
+        bpy.utils.register_tool(workspace.CadTool, after={"builtin.transform"}, separator=True, group=True)
+
+
+def unregister():
+    if not bpy.app.background:
+        bpy.utils.unregister_tool(workspace.CadTool)
@@ -0,0 +1,345 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import bpy
+import math
+import bmesh
+import mathutils
+import bpy_extras
+import blenderbim.tool as tool
+
+messages = {
+    "SHARED_VERTEX": "Shared Vertex, no intersection possible",
+    "PARALLEL_EDGES": "Edges Parallel, no intersection possible",
+    "NON_PLANAR_EDGES": "Non Planar Edges, no clean intersection point",
+}
+
+
+class CadTrimExtend(bpy.types.Operator):
+    bl_idname = "bim.cad_trim_extend"
+    bl_label = "CAD Trim / Extend"
+
+    @classmethod
+    def poll(cls, context):
+        obj = context.active_object
+        return bool(obj) and obj.type == "MESH"
+
+    def cancel_message(self, msg):
+        print(msg)
+        self.report({"WARNING"}, msg)
+        return {"CANCELLED"}
+
+    def execute(self, context):
+        # final attempt to enter unfragmented bm/mesh
+        # ghastly, but what can I do? it works with these
+        # fails without.
+        bpy.ops.object.mode_set(mode="OBJECT")
+        bpy.ops.object.mode_set(mode="EDIT")
+
+        obj = context.active_object
+        me = obj.data
+
+        bm = bmesh.from_edit_mesh(me)
+        bm.verts.ensure_lookup_table()
+        bm.edges.ensure_lookup_table()
+
+        edges = [e for e in bm.edges if e.select and not e.hide]
+
+        if len(edges) == 2:
+            message = tool.Cad.do_vtx_if_appropriate(bm, edges, mode="T")
+            if isinstance(message, set):
+                msg = messages.get(message.pop())
+                return self.cancel_message(msg)
+            bm = message
+        else:
+            return self.cancel_message("select two edges!")
+
+        bm.verts.index_update()
+        bm.edges.index_update()
+        bmesh.update_edit_mesh(me, loop_triangles=True)
+
+        return {"FINISHED"}
+
+
+class CadMitre(bpy.types.Operator):
+    bl_idname = "bim.cad_mitre"
+    bl_label = "CAD Mitre"
+
+    @classmethod
+    def poll(cls, context):
+        obj = context.active_object
+        return bool(obj) and obj.type == "MESH"
+
+    def cancel_message(self, msg):
+        print(msg)
+        self.report({"WARNING"}, msg)
+        return {"CANCELLED"}
+
+    def execute(self, context):
+        # final attempt to enter unfragmented bm/mesh
+        # ghastly, but what can I do? it works with these
+        # fails without.
+        bpy.ops.object.mode_set(mode="OBJECT")
+        bpy.ops.object.mode_set(mode="EDIT")
+
+        obj = context.active_object
+        me = obj.data
+
+        bm = bmesh.from_edit_mesh(me)
+        bm.verts.ensure_lookup_table()
+        bm.edges.ensure_lookup_table()
+
+        edges = [e for e in bm.edges if e.select and not e.hide]
+
+        if len(edges) == 2:
+            message = tool.Cad.do_vtx_if_appropriate(bm, edges, mode="V")
+            if isinstance(message, set):
+                msg = messages.get(message.pop())
+                return self.cancel_message(msg)
+            bm = message
+        else:
+            return self.cancel_message("select two edges!")
+
+        bm.verts.index_update()
+        bm.edges.index_update()
+        bmesh.update_edit_mesh(me, loop_triangles=True)
+
+        return {"FINISHED"}
+
+
+class CadFillet(bpy.types.Operator):
+    bl_idname = "bim.cad_fillet"
+    bl_label = "CAD Fillet"
+    bl_options = {"REGISTER", "UNDO"}
+    resolution: bpy.props.IntProperty(name="Arc Resolution", min=0, default=1)
+    radius: bpy.props.FloatProperty(name="Radius", default=0.1)
+
+    @classmethod
+    def poll(cls, context):
+        obj = context.active_object
+        return obj and obj.type == "MESH" and context.mode == "EDIT_MESH"
+
+    def draw(self, context):
+        layout = self.layout
+        for prop in self.__class__.__annotations__.keys():
+            layout.prop(self, prop)
+
+    def execute(self, context):
+        bpy.ops.object.mode_set(mode="OBJECT")
+        bpy.ops.object.mode_set(mode="EDIT")
+
+        obj = bpy.context.active_object
+        cursor = obj.matrix_world.inverted() @ bpy.context.scene.cursor.location
+        mesh = obj.data
+        bm = bmesh.from_edit_mesh(mesh)
+        selected_edges = [e for e in bm.edges if e.select]
+        if len(selected_edges) != 2:
+            return {"CANCELLED"}
+
+        # Assume the user has selected two edges sharing a vert, but merge verts
+        # just in case the vertex is coincident but not shared.
+        all_verts = list(set(selected_edges[0].verts) | set(selected_edges[1].verts))
+        bmesh.ops.remove_doubles(bm, verts=all_verts, dist=1e-4)
+
+        # Subdivide one of the edges to give us an extra vert to play with
+        # without damaging any faces that already exist.
+        cut = bmesh.ops.bisect_edges(bm, edges=[selected_edges[1]], cuts=1)
+        bm.edges.index_update()
+        bmesh.update_edit_mesh(mesh)
+
+        is_wire = selected_edges[0].is_wire
+
+        # Recover the original intention of the selected edges after our bisect operation
+        cut_edges = cut["geom_split"][1:]
+        selected_edges = [e for e in bm.edges if e.select and e not in cut_edges]
+        if set(selected_edges[0].verts) & set(cut_edges[0].verts):
+            selected_edges.append(cut_edges[0])
+        elif set(selected_edges[0].verts) & set(cut_edges[1].verts):
+            selected_edges.append(cut_edges[1])
+
+        # Calculate the distance to slide each edge to make space for the fillet arc
+        shared_vert = list(set(selected_edges[0].verts) & set(selected_edges[1].verts))[0]
+        v1 = selected_edges[0].other_vert(shared_vert)
+        v2 = selected_edges[1].other_vert(shared_vert)
+        dir1 = (v1.co - shared_vert.co).normalized()
+        dir2 = (v2.co - shared_vert.co).normalized()
+        edge_angle = dir1.angle(dir2)
+        slide_distance = self.radius / math.tan(edge_angle / 2)
+
+        angle = math.pi - edge_angle
+        fillet_v1 = shared_vert.co + (dir1 * slide_distance)
+        fillet_v2 = shared_vert.co + (dir2 * slide_distance)
+
+        normal = mathutils.geometry.normal([v1.co, shared_vert.co, v2.co])
+
+        center = mathutils.geometry.intersect_line_line(
+            fillet_v1, fillet_v1 + normal.cross(dir1), fillet_v2, fillet_v2 + normal.cross(dir2)
+        )[0]
+
+        v = bm.verts.new(fillet_v1)
+        steps = self.resolution * 4 if self.resolution else 1
+        spin = bmesh.ops.spin(bm, geom=[v], axis=normal, cent=center, steps=steps, angle=angle)
+
+        bmesh.ops.pointmerge(bm, verts=[shared_vert, v], merge_co=v.co)
+        bmesh.ops.pointmerge(bm, verts=[v2, spin["geom_last"][0]], merge_co=spin["geom_last"][0].co)
+
+        # If faces are involved, then the chamfer edge protects existing faces from the newly created fillet.
+        # If no faces are involved, we delete the chamfer edge.
+        if is_wire:
+            chamfer_edge = [e for e in bm.edges if shared_vert in e.verts and v2 in e.verts][0]
+            bm.edges.remove(chamfer_edge)
+
+        bmesh.update_edit_mesh(mesh)
+        mesh.update()
+        bm.free()
+        return {"FINISHED"}
+
+
+class CadArcFrom2Points(bpy.types.Operator):
+    bl_idname = "bim.cad_arc_from_2_points"
+    bl_label = "CAD Arc from 2 Points"
+    bl_options = {"REGISTER", "UNDO"}
+    resolution: bpy.props.IntProperty(name="Arc Resolution", min=1, default=1)
+    should_flip: bpy.props.BoolProperty(name="Flip", description="Flip arc", default=False)
+
+    def draw(self, context):
+        layout = self.layout
+        for prop in self.__class__.__annotations__.keys():
+            layout.prop(self, prop)
+
+    def execute(self, context):
+        bpy.ops.object.mode_set(mode="OBJECT")
+        bpy.ops.object.mode_set(mode="EDIT")
+
+        if bpy.context.mode != "EDIT_MESH":
+            return {"CANCELLED"}
+        obj = bpy.context.active_object
+        region = bpy.context.region
+        region_3d = bpy.context.area.spaces.active.region_3d
+        cursor = bpy.context.scene.cursor.location
+        center = bpy_extras.view3d_utils.location_3d_to_region_2d(region, region_3d, cursor)
+        if not center:
+            return {"CANCELLED"}
+        mesh = obj.data
+        mw = obj.matrix_world
+        bm = bmesh.from_edit_mesh(mesh)
+        selected_verts = [v for v in bm.verts if v.select]
+        if len(selected_verts) != 2:
+            return {"CANCELLED"}
+        v1 = bpy_extras.view3d_utils.location_3d_to_region_2d(region, region_3d, mw @ selected_verts[0].co)
+        v2 = bpy_extras.view3d_utils.location_3d_to_region_2d(region, region_3d, mw @ selected_verts[1].co)
+        l1 = v1 - center
+        l2 = v2 - center
+        angle = l1.angle_signed(l2)
+
+        if self.should_flip:
+            if angle > 0:
+                angle = -((math.pi * 2) - angle)
+            else:
+                angle = (math.pi * 2) + angle
+
+        v = selected_verts[0]
+        bm.verts.remove(selected_verts[1])
+        axis = region_3d.view_rotation @ mathutils.Vector((0, 0, 1))
+        bmesh.ops.spin(
+            bm,
+            geom=[v],
+            axis=mw.inverted().to_quaternion() @ axis,
+            cent=mw.inverted() @ cursor,
+            steps=self.resolution * 4,
+            angle=-angle,
+        )
+        bmesh.update_edit_mesh(mesh)
+        mesh.update()
+        return {"FINISHED"}
+
+
+class CadArcFrom3Points(bpy.types.Operator):
+    bl_idname = "bim.cad_arc_from_3_points"
+    bl_label = "CAD Arc from 3 Points"
+    bl_options = {"REGISTER", "UNDO"}
+    resolution: bpy.props.IntProperty(name="Arc Resolution", min=1, default=1)
+    only_recalculate_center: bpy.props.BoolProperty(name="Only Recalculate Center", default=False)
+
+    @classmethod
+    def poll(cls, context):
+        obj = context.active_object
+        return obj and obj.type == "MESH" and context.mode == "EDIT_MESH"
+
+    def draw(self, context):
+        layout = self.layout
+        for prop in self.__class__.__annotations__.keys():
+            layout.prop(self, prop)
+
+    def execute(self, context):
+        bpy.ops.object.mode_set(mode="OBJECT")
+        bpy.ops.object.mode_set(mode="EDIT")
+
+        if bpy.context.mode != "EDIT_MESH":
+            return {"CANCELLED"}
+
+        obj = bpy.context.edit_object
+        mesh = obj.data
+        bm = bmesh.from_edit_mesh(mesh)
+
+        selected_verts = [v for v in bm.verts if v.select]
+        if len(selected_verts) != 3:
+            return {"CANCELLED"}
+        pts = [v.co for v in selected_verts]
+        center = tool.Cad.get_center_of_arc(pts, obj)
+        if not center:
+            return {"CANCELLED"}
+
+        bpy.context.scene.cursor.location = center
+        if self.only_recalculate_center:
+            return {"FINISHED"}
+
+        center = obj.matrix_world.inverted() @ center
+
+        def get_distance_to_other_points(vert):
+            other_verts = [v for v in selected_verts if v != vert]
+            total_vector = mathutils.Vector((0, 0, 0))
+            for other_vert in other_verts:
+                total_vector += other_vert.co - vert.co
+            return total_vector.length
+
+        # For three selected points that represent a start, end, and point on an
+        # arc, the start and end verts can be identified by being furthest away
+        # from the other 2 points.
+        arc_end_verts = sorted(selected_verts, key=get_distance_to_other_points)[-2:]
+        normal = mathutils.geometry.normal(pts)
+
+        dir1 = (arc_end_verts[0].co - center).normalized()
+        dir2 = (arc_end_verts[1].co - center).normalized()
+
+        # Let's get the matrix that represents the coordinate system of the arc.
+        # This matrix allows us to get 2D vectors for calculating the signed arc angle.
+        z = normal
+        x = (arc_end_verts[0].co - center).normalized()
+        y = z.cross(x)
+        arc_matrix = mathutils.Matrix([x, y, z]).transposed().to_4x4()
+
+        dir1 = ((arc_matrix.inverted() @ arc_end_verts[0].co) - (arc_matrix.inverted() @ center)).normalized()
+        dir2 = ((arc_matrix.inverted() @ arc_end_verts[1].co) - (arc_matrix.inverted() @ center)).normalized()
+        angle = dir1.xy.angle_signed(dir2.xy)
+
+        v = arc_end_verts[0]
+        bmesh.ops.spin(bm, geom=[v], axis=normal, cent=center, steps=self.resolution * 4, angle=-angle)
+        bmesh.update_edit_mesh(mesh)
+        mesh.update()
+        return {"FINISHED"}
@@ -0,0 +1,93 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import bpy
+import blenderbim.bim.module.type.prop as type_prop
+from bpy.types import WorkSpaceTool
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.model.data import AuthoringData
+
+
+class CadTool(WorkSpaceTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "EDIT_MESH"
+
+    bl_idname = "bim.cad_tool"
+    bl_label = "CAD Tool"
+    bl_description = "Gives you CAD authoring related superpowers"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cad")
+    bl_widget = None
+    # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
+    bl_keymap = (
+        ("bim.cad_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
+        ("bim.cad_hotkey", {"type": "T", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_T")]}),
+        ("bim.cad_fillet", {"type": "F", "value": "PRESS", "shift": True}, {"properties": []}),
+        # Enable Mesh Tools add-on to get this amazing tool
+        ("mesh.offset_edges", {"type": "O", "value": "PRESS", "shift": True}, {"properties": []}),
+        ("bim.cad_arc_from_2_points", {"type": "C", "value": "PRESS", "shift": True}, {"properties": []}),
+        ("bim.cad_arc_from_3_points", {"type": "V", "value": "PRESS", "shift": True}, {"properties": []}),
+    )
+
+    def draw_settings(context, layout, tool):
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="Extend", icon="EVENT_E")
+
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="Mitre", icon="EVENT_T")
+
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="Fillet", icon="EVENT_F")
+
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="Offset", icon="EVENT_O")
+
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="2-Point Arc", icon="EVENT_C")
+
+        row = layout.row(align=True)
+        row.label(text="", icon="EVENT_SHIFT")
+        row.label(text="3-Point Arc", icon="EVENT_V")
+
+
+class CadHotkey(bpy.types.Operator):
+    bl_idname = "bim.cad_hotkey"
+    bl_label = "CAD Hotkey"
+    bl_options = {"REGISTER", "UNDO"}
+    hotkey: bpy.props.StringProperty()
+
+    def execute(self, context):
+        self.props = context.scene.BIMModelProperties
+        self.has_ifc_class = True
+        try:
+            self.has_ifc_class = bool(self.props.ifc_class)
+        except:
+            pass
+        getattr(self, f"hotkey_{self.hotkey}")()
+        return {"FINISHED"}
+
+    def hotkey_S_E(self):
+        bpy.ops.bim.cad_trim_extend()
+
+    def hotkey_S_T(self):
+        bpy.ops.bim.cad_mitre()
@@ -34,9 +34,6 @@ classes = (
    operator.SmartClashGroup,
    operator.SelectSmartGroup,
    operator.LoadSmartGroupsForActiveClashSet,
-    operator.SetBlenderClashSetA,
-    operator.SetBlenderClashSetB,
-    operator.ExecuteBlenderClash,
    prop.ClashSource,
    prop.ClashSet,
    prop.SmartClashGroup,
@@ -411,82 +411,3 @@ class SelectSmartGroup(bpy.types.Operator):
                    obj.select_set(True)

        return {"FINISHED"}
-
-
-class BlenderClasher:
-    def process_clash_set(self, context):
-        import collision
-
-        a_cm = collision.CollisionManager()
-        b_cm = collision.CollisionManager()
-        self.add_to_cm(a_cm, context.scene.BIMClashProperties.blender_clash_set_a, context)
-        self.add_to_cm(b_cm, context.scene.BIMClashProperties.blender_clash_set_b, context)
-        results = a_cm.in_collision_other(b_cm, return_data=True)
-        if not results[0]:
-            print("No clashes")
-            return
-        for contact in results[1]:
-            if contact.raw.penetration_depth < 0.01:
-                continue
-            print("-----")
-            print(contact.names)
-            print(contact.raw.normal)
-            print(contact.raw.pos)
-
-    def add_to_cm(self, cm, object_names, context):
-        import ifcclash
-
-        for object_name in object_names:
-            name = object_name.name
-            obj = bpy.data.objects[name]
-            triangulated_mesh = self.triangulate_mesh(obj, context)
-            mesh = ifcclash.Mesh()
-            mesh.vertices = np.array([tuple(obj.matrix_world @ v.co) for v in triangulated_mesh.vertices])
-            mesh.faces = np.array([tuple(p.vertices) for p in triangulated_mesh.polygons])
-            cm.add_object(name, mesh)
-
-    def triangulate_mesh(self, obj, context):
-        mesh = obj.evaluated_get(context.evaluated_depsgraph_get()).to_mesh()
-        bm = bmesh.new()
-        bm.from_mesh(mesh)
-        bmesh.ops.triangulate(bm, faces=bm.faces)
-        bm.to_mesh(mesh)
-        bm.free()
-        del bm
-        return mesh
-
-
-class SetBlenderClashSetA(bpy.types.Operator):
-    bl_idname = "bim.set_blender_clash_set_a"
-    bl_label = "Set Blender Clash Set A"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        context.scene.BIMClashProperties.blender_clash_set_a.clear()
-        for obj in context.selected_objects:
-            new = context.scene.BIMClashProperties.blender_clash_set_a.add()
-            new.name = obj.name
-        return {"FINISHED"}
-
-
-class SetBlenderClashSetB(bpy.types.Operator):
-    bl_idname = "bim.set_blender_clash_set_b"
-    bl_label = "Set Blender Clash Set B"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        context.scene.BIMClashProperties.blender_clash_set_b.clear()
-        for obj in context.selected_objects:
-            new = context.scene.BIMClashProperties.blender_clash_set_b.add()
-            new.name = obj.name
-        return {"FINISHED"}
-
-
-class ExecuteBlenderClash(bpy.types.Operator):
-    bl_idname = "bim.execute_blender_clash"
-    bl_label = "Execute Blender Clash"
-
-    def execute(self, context):
-        blender_clasher = BlenderClasher()
-        blender_clasher.process_clash_set(context)
-        return {"FINISHED"}
@@ -27,6 +27,7 @@ class BIM_PT_ifcclash(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_quality_control"

    def draw(self, context):
        layout = self.layout
@@ -34,17 +35,6 @@ class BIM_PT_ifcclash(Panel):
        scene = context.scene
        props = scene.BIMClashProperties

-        layout.label(text="Blender Clash:")
-
-        row = layout.row(align=True)
-        row.operator("bim.set_blender_clash_set_a")
-        row.operator("bim.set_blender_clash_set_b")
-
-        row = layout.row(align=True)
-        row.operator("bim.execute_blender_clash")
-
-        layout.label(text="IFC Clash:")
-
        row = layout.row(align=True)
        row.operator("bim.add_clash_set")
        row.operator("bim.import_clash_sets", text="", icon="IMPORT")
@@ -29,6 +29,7 @@ class BIM_PT_classifications(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_project_setup"

    @classmethod
    def poll(cls, context):
@@ -86,6 +87,7 @@ class BIM_PT_classification_references(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -27,6 +27,7 @@ class BIM_PT_cobie(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -29,6 +29,7 @@ class BIM_PT_constraints(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_project_setup"

    @classmethod
    def poll(cls, context):
@@ -73,6 +74,7 @@ class BIM_PT_object_constraints(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
+    bl_parent_id = "BIM_PT_misc_object"

    @classmethod
    def poll(cls, context):
@@ -29,6 +29,7 @@ class BIM_PT_context(bpy.types.Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_geometry"

    @classmethod
    def poll(cls, context):
@@ -63,8 +64,8 @@ class BIM_PT_context(bpy.types.Panel):
                row.operator("bim.remove_context", icon="X", text="").context = ifc_context["id"]

            row = box.row(align=True)
-            row.prop(props, "subcontexts", text="")
-            row.prop(props, "target_views", text="")
+            blenderbim.bim.helper.prop_with_search(row, props, "subcontexts", text="")
+            blenderbim.bim.helper.prop_with_search(row, props, "target_views", text="")
            op = row.operator("bim.add_context", icon="ADD", text="")
            op.context_type = ifc_context["context_type"]
            op.context_identifier = props.subcontexts
@@ -31,6 +31,7 @@ class BIM_PT_cost_schedules(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_4D5D"

    @classmethod
    def poll(cls, context):
@@ -26,6 +26,7 @@ class BIM_PT_covetool(bpy.types.Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_integrations"

    def draw(self, context):
        layout = self.layout
@@ -170,6 +170,8 @@ class ImportIfcCsv(bpy.types.Operator):
        else:
            ifc_csv.delimiter = props.csv_delimiter
        ifc_csv.Import(ifc_file)
+        if not props.should_load_from_memory:
+            ifc_file.write(props.csv_ifc_file)
        purge_module_data()
        return {"FINISHED"}

@@ -32,7 +32,7 @@ from bpy.props import (


 class CsvProperties(PropertyGroup):
-    csv_ifc_file: StringProperty(default="", name="CSV IFC File")
+    csv_ifc_file: StringProperty(default="", name="IFC File")
    ifc_selector: StringProperty(default="", name="IFC Selector")
    csv_attributes: CollectionProperty(name="CSV Attributes", type=StrProperty)
    csv_delimiter: EnumProperty(
@@ -27,6 +27,7 @@ class BIM_PT_ifccsv(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -20,17 +20,21 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.PrintIfcFile,
-    operator.PurgeIfcLinks,
-    operator.PrintObjectPlacement,
-    operator.ValidateIfcFile,
-    operator.ProfileImportIFC,
    operator.CreateAllShapes,
    operator.CreateShapeFromStepId,
-    operator.SelectHighPolygonMeshes,
-    operator.InspectFromStepId,
    operator.InspectFromObject,
+    operator.InspectFromStepId,
+    operator.ParseExpress,
+    operator.PrintIfcFile,
+    operator.PrintObjectPlacement,
+    operator.ProfileImportIFC,
+    operator.PurgeHdf5Cache,
+    operator.PurgeIfcLinks,
    operator.RewindInspector,
+    operator.SelectExpressFile,
+    operator.SelectHighPolygonMeshes,
+    operator.SelectHighestPolygonMeshes,
+    operator.ValidateIfcFile,
    prop.BIMDebugProperties,
    ui.BIM_PT_debug,
 )
@@ -16,20 +16,25 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

+import os
 import bpy
 import time
 import logging
 import ifcopenshell
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
+import blenderbim.tool as tool
+import blenderbim.core.debug as core
 import blenderbim.bim.handler
 import blenderbim.bim.import_ifc as import_ifc
+import blenderbim.tool as tool
 from blenderbim.bim.ifc import IfcStore


 class PrintIfcFile(bpy.types.Operator):
    bl_idname = "bim.print_ifc_file"
    bl_label = "Print IFC File"
+    bl_description = "Prints the file contents in the system console.\nAccess it with Window > Toggle System Console"

    @classmethod
    def poll(cls, context):
@@ -43,6 +48,7 @@ class PrintIfcFile(bpy.types.Operator):
 class PurgeIfcLinks(bpy.types.Operator):
    bl_idname = "bim.purge_ifc_links"
    bl_label = "Purge IFC Links"
+    bl_description = "Purge all definitions and references from the file.\nWarning : Cannot be undone."

    def execute(self, context):
        for obj in bpy.data.objects:
@@ -96,7 +102,8 @@ class ProfileImportIFC(bpy.types.Operator):

 class CreateAllShapes(bpy.types.Operator):
    bl_idname = "bim.create_all_shapes"
-    bl_label = "Create All Shapes"
+    bl_label = "Test All Shapes"
+    bl_description = "Look for errors in all the shapes contained in the file"

    @classmethod
    def poll(cls, context):
@@ -105,6 +112,7 @@ class CreateAllShapes(bpy.types.Operator):
    def execute(self, context):
        self.file = IfcStore.get_file()
        elements = self.file.by_type("IfcElement") + self.file.by_type("IfcSpace")
+
        total = len(elements)
        settings = ifcopenshell.geom.settings()
        failures = []
@@ -126,7 +134,7 @@ class CreateAllShapes(bpy.types.Operator):
            except:
                failures.append(element)
                print("***** FAILURE *****")
-        print("Failures:")
+        print(f"Failures: {len(failures)}")
        for failure in failures:
            print(failure)
        return {"FINISHED"}
@@ -135,6 +143,7 @@ class CreateAllShapes(bpy.types.Operator):
 class CreateShapeFromStepId(bpy.types.Operator):
    bl_idname = "bim.create_shape_from_step_id"
    bl_label = "Create Shape From STEP ID"
+    bl_description = "Recreate a mesh object from a STEP ID"
    bl_options = {"REGISTER", "UNDO"}
    should_include_curves: bpy.props.BoolProperty()

@@ -154,9 +163,12 @@ class CreateShapeFromStepId(bpy.types.Operator):
        if self.should_include_curves:
            settings.set(settings.INCLUDE_CURVES, True)
        shape = ifcopenshell.geom.create_shape(settings, element)
-        ifc_importer = import_ifc.IfcImporter(self.ifc_import_settings)
-        ifc_importer.file = self.file
-        mesh = ifc_importer.create_mesh(element, shape)
+        if shape:
+            ifc_importer = import_ifc.IfcImporter(self.ifc_import_settings)
+            ifc_importer.file = self.file
+            mesh = ifc_importer.create_mesh(element, shape)
+        else:
+            mesh = None
        obj = bpy.data.objects.new("Debug", mesh)
        context.scene.collection.objects.link(obj)
        return {"FINISHED"}
@@ -165,20 +177,37 @@ class CreateShapeFromStepId(bpy.types.Operator):
 class SelectHighPolygonMeshes(bpy.types.Operator):
    bl_idname = "bim.select_high_polygon_meshes"
    bl_label = "Select High Polygon Meshes"
+    bl_description = "Select objects containing more polygons than the specified number"
    bl_options = {"REGISTER", "UNDO"}
+    threshold: bpy.props.IntProperty()

    def execute(self, context):
-        [
-            o.select_set(True)
-            for o in context.view_layer.objects
-            if o.type == "MESH" and len(o.data.polygons) > context.scene.BIMDebugProperties.number_of_polygons
-        ]
+        for obj in context.view_layer.objects:
+            if obj.type == "MESH" and len(obj.data.polygons) > self.threshold:
+                obj.select_set(True)
+        return {"FINISHED"}
+
+
+class SelectHighestPolygonMeshes(bpy.types.Operator):
+    bl_idname = "bim.select_highest_polygon_meshes"
+    bl_label = "Select Highest Polygon Meshes"
+    bl_description = "Select objects with a number of polygons superior to the specified percentile"
+    bl_options = {"REGISTER", "UNDO"}
+    percentile: bpy.props.IntProperty()
+
+    def execute(self, context):
+        objects = [obj for obj in context.view_layer.objects if obj.type == "MESH"]
+        if objects:
+            percentile = len(max(objects, key=lambda o: len(o.data.polygons)).data.polygons) * self.percentile / 100
+            print(f"Selected all Meshes with more than {int(percentile)} polygons")
+            [obj.select_set(True) for obj in objects if len(obj.data.polygons) > percentile]
        return {"FINISHED"}


 class RewindInspector(bpy.types.Operator):
    bl_idname = "bim.rewind_inspector"
    bl_label = "Rewind Inspector"
+    bl_description = "Rewind the Inspector to the previously inspected element"

    def execute(self, context):
        props = context.scene.BIMDebugProperties
@@ -195,6 +224,7 @@ class RewindInspector(bpy.types.Operator):
 class InspectFromStepId(bpy.types.Operator):
    bl_idname = "bim.inspect_from_step_id"
    bl_label = "Inspect From STEP ID"
+    bl_description = "Inspect the attributes and references by looking up the specified STEP ID"
    step_id: bpy.props.IntProperty()

    @classmethod
@@ -245,12 +275,21 @@ class InspectFromStepId(bpy.types.Operator):
 class InspectFromObject(bpy.types.Operator):
    bl_idname = "bim.inspect_from_object"
    bl_label = "Inspect From Object"
+    bl_description = "Inspect the Active Object's attributes and references"
+
+    @classmethod
+    def poll(cls, context):
+        if not context.active_object:
+            if bpy.app.version >= (3, 0, 0):
+                cls.poll_message_set("No Active Object")
+        elif not context.active_object.BIMObjectProperties.ifc_definition_id:
+            if bpy.app.version >= (3, 0, 0):
+                cls.poll_message_set("Active Object doesn't have an IFC definition")
+        else:
+            return True

    def execute(self, context):
-        ifc_definition_id = context.active_object.BIMObjectProperties.ifc_definition_id
-        if not ifc_definition_id:
-            return {"FINISHED"}
-        bpy.ops.bim.inspect_from_step_id(step_id=ifc_definition_id)
+        bpy.ops.bim.inspect_from_step_id(step_id=context.active_object.BIMObjectProperties.ifc_definition_id)
        return {"FINISHED"}


@@ -262,3 +301,40 @@ class PrintObjectPlacement(bpy.types.Operator):
    def execute(self, context):
        print(ifcopenshell.util.placement.get_local_placement(IfcStore.get_file().by_id(self.step_id)))
        return {"FINISHED"}
+
+
+class ParseExpress(bpy.types.Operator):
+    bl_idname = "bim.parse_express"
+    bl_label = "Parse Express"
+
+    def execute(self, context):
+        core.parse_express(tool.Debug, context.scene.BIMDebugProperties.express_file)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class SelectExpressFile(bpy.types.Operator):
+    bl_idname = "bim.select_express_file"
+    bl_label = "Select Express File"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Select an IFC EXPRESS definition"
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filter_glob: bpy.props.StringProperty(default="*.exp", options={"HIDDEN"})
+
+    def execute(self, context):
+        if os.path.exists(self.filepath) and "exp" in os.path.splitext(self.filepath)[1]:
+            context.scene.BIMDebugProperties.express_file = self.filepath
+        return {"FINISHED"}
+
+    def invoke(self, context, event):
+        context.window_manager.fileselect_add(self)
+        return {"RUNNING_MODAL"}
+
+
+class PurgeHdf5Cache(bpy.types.Operator):
+    bl_idname = "bim.purge_hdf5_cache"
+    bl_label = "Purge HDF5 Cache"
+
+    def execute(self, context):
+        core.purge_hdf5_cache(tool.Debug)
+        return {"FINISHED"}
@@ -33,8 +33,10 @@ from bpy.props import (
 class BIMDebugProperties(PropertyGroup):
    step_id: IntProperty(name="STEP ID")
    number_of_polygons: IntProperty(name="Number of Polygons", min=0)
-    active_step_id: IntProperty(name="STEP ID")
+    percentile_of_polygons: IntProperty(name="Percentile of Polygons", min=0, max=100, default=90, subtype="PERCENTAGE")
+    active_step_id: IntProperty(name="STEP ID", default=1, soft_min=1)
    step_id_breadcrumb: CollectionProperty(name="STEP ID Breadcrumb", type=StrProperty)
    attributes: CollectionProperty(name="Attributes", type=Attribute)
    inverse_attributes: CollectionProperty(name="Inverse Attributes", type=Attribute)
    inverse_references: CollectionProperty(name="Inverse References", type=Attribute)
+    express_file: StringProperty(name="Express File")
@@ -27,6 +27,7 @@ class BIM_PT_debug(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
+    bl_parent_id = "BIM_PT_quality_control"

    def draw(self, context):
        layout = self.layout
@@ -38,9 +39,17 @@ class BIM_PT_debug(Panel):
        row.operator("bim.validate_ifc_file", icon="CHECKMARK", text="")
        row.operator("bim.select_ifc_file", icon="FILE_FOLDER", text="")

+        row = self.layout.row(align=True)
+        row.prop(props, "express_file", text="")
+        row.operator("bim.parse_express", icon="IMPORT", text="")
+        row.operator("bim.select_express_file", icon="FILE_FOLDER", text="")
+
        row = layout.row()
        row.operator("bim.print_ifc_file")

+        row = layout.row()
+        row.operator("bim.purge_hdf5_cache")
+
        row = layout.row()
        row.operator("bim.purge_ifc_links")

@@ -56,8 +65,13 @@ class BIM_PT_debug(Panel):
        row.prop(props, "step_id", text="")

        row = layout.split(factor=0.7, align=True)
-        row.operator("bim.select_high_polygon_meshes")
+        row.operator("bim.select_high_polygon_meshes").threshold = context.scene.BIMDebugProperties.number_of_polygons
        row.prop(props, "number_of_polygons", text="")
+        row = layout.split(factor=0.7, align=True)
+        row.operator(
+            "bim.select_highest_polygon_meshes"
+        ).percentile = context.scene.BIMDebugProperties.percentile_of_polygons
+        row.prop(props, "percentile_of_polygons", text="")

        layout.label(text="Inspector:")

@@ -0,0 +1,58 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+# ############################################################################ #
+
+# Hey there! Welcome to the BlenderBIM Add-on code. Please feel free to reach
+# out if you have any questions or need further guidance. Happy hacking!
+
+# ############################################################################ #
+
+# Every module has a __init__.py file to load all of its classes. Every
+# operation, property, and interface needs to be registered with the Blender
+# system when the add-on loads. This is where it happens.
+
+import bpy
+from . import ui, prop, operator
+
+# You'll need to provide a list of every one of your classes here. If you forget
+# to specify your class, it won't load and you won't be able to use that
+# operator, property, or interface.
+classes = (
+    operator.DemonstrateHelloWorld,
+    operator.DemonstrateRenameProject,
+    prop.BIMDemoProperties,
+    ui.BIM_PT_demo,
+)
+
+
+# When the add-on loads, this register function is called. This allows you to
+# perform additional tasks during startup. If you need to store custom
+# properties, this is where you tell Blender where they are going to be stored.
+# You might see more advanced registrations happening in other modules.
+def register():
+    # Properties are usually stored on bpy.types.Scene when they are something
+    # that affects everything in the project, or bpy.types.Object when they
+    # affect a single BIM element.
+    bpy.types.Scene.BIMDemoProperties = bpy.props.PointerProperty(type=prop.BIMDemoProperties)
+
+
+# When someone disables the add-on, we need to unload everything we loaded. This
+# does the reverse of the register function.
+def unregister():
+    del bpy.types.Scene.BIMDemoProperties
@@ -0,0 +1,78 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+# ############################################################################ #
+
+# Hey there! Welcome to the BlenderBIM Add-on code. Please feel free to reach
+# out if you have any questions or need further guidance. Happy hacking!
+
+# ############################################################################ #
+
+# Every module has a data.py file to load data for its interface panels to
+# display. When a panel needs to show information that doesn't come from a
+# Blender property, it gets that data from one of these classes. This separation
+# of "fetching data" and "displaying data" is a common concept that makes UI
+# code much simpler, more efficient, and less error-prone to refresh data.
+
+import blenderbim.tool as tool
+
+
+# All data must have a refresh function. The refresh function simply sets all
+# data class to be not yet loaded. So the next time the interface is drawn to
+# the user, it will force the data to be reloaded.
+def refresh():
+    # When you define your own data classes, just add to this list!
+    DemoData.is_loaded = False
+
+
+# This is a sample data class. It correlates to a single interface panel. Panels
+# should not share data classes. This makes it easy to write your interface
+# without having your code mixed in with other parts of the interface. As a
+# convention, the class is named the same name as the panel.
+class DemoData:
+    # All data classes must have two variables. One to store all the data it has
+    # loaded and another to store the load state.
+    data = {}
+    is_loaded = False
+
+    # Every data class must have a load function. This lets us load data in a
+    # predictable manner.
+    @classmethod
+    def load(cls):
+        # The load function always has two responsibilities: populate the data,
+        # and set is_loaded to true.
+        cls.data = {
+            "has_project": cls.has_project(),
+            "project_name": cls.project_name(),
+        }
+        cls.is_loaded = True
+
+    @classmethod
+    def has_project(cls):
+        # Here, we check whether or not there is an active IFC project in our
+        # Blender session.
+        return bool(tool.Ifc.get())
+
+    @classmethod
+    def project_name(cls):
+        # Imagine how messy our UI code would be if all of this was mixed in
+        # with our layout code. Here, it's isolated and testable, and the UX
+        # becomes easier to maintain and change.
+        ifc = tool.Ifc.get()
+        if ifc:
+            return ifc.by_type("IfcProject")[0].Name or "Unnamed"
@@ -0,0 +1,79 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+# ############################################################################ #
+
+# Hey there! Welcome to the BlenderBIM Add-on code. Please feel free to reach
+# out if you have any questions or need further guidance. Happy hacking!
+
+# ############################################################################ #
+
+# Every module has an operator.py file to define all of the buttons that a user
+# can click on from the Blender interface. Blender calls these buttons
+# "Operators", since they correlate to a single user operation.
+
+import bpy
+import blenderbim.tool as tool
+import blenderbim.core.demo as core
+import blenderbim.bim.handler
+
+
+# Each button correlates to a class like the one below. In this case, we're
+# creating a new button that will execute a hello world feature.
+class DemonstrateHelloWorld(bpy.types.Operator, tool.Ifc.Operator):
+    # Every operator has a unique ID. If you enable Python tooltips and hover
+    # over any button in the interface, you will see each button will run a
+    # function that uses this ID. For example, hovering over this button will
+    # show that the code it executes is "bpy.ops.bim.demonstrate_hello_world()"
+    bl_idname = "bim.demonstrate_hello_world"
+
+    # In the interface, this button will have the text "Print Hello World".
+    bl_label = "Print Hello World"
+
+    # This code means that the user can undo or redo after pressing the button.
+    bl_options = {"REGISTER", "UNDO"}
+
+    # When hovering over the button, this helpful description will be shown.
+    bl_description = "Prints the text 'Hello World'"
+
+    # When the button is pressed, this _execute() function will run.
+    def _execute(self, context):
+        # Every operator should do one thing only: execute a core function. In
+        # order to execute a core function, the operator's responsibility is to
+        # pass in all of the inputs the core needs to do its job.
+
+        # A core function simply tells tools what to do, so a core function will
+        # always need at least one tool as an input.
+        core.demonstrate_hello_world(tool.Demo)
+
+
+# This class, just like the one above, will correlate to another button in the
+# interface. It has a different ID and a different label.
+class DemonstrateRenameProject(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.demonstrate_rename_project"
+    bl_label = "Rename IFC Project"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Renames your IFC project name and prints the name"
+
+    def _execute(self, context):
+        # This core function requires three inputs: two tools, and a name
+        # string. In this case, the name is taken from some custom Blender
+        # properties. Generally, the inputs to the core function will come from
+        # properties (such as an input field) or data from the scene (like the
+        # actively selected object).
+        core.demonstrate_rename_project(tool.Ifc, tool.Demo, name=bpy.context.scene.BIMDemoProperties.name)
@@ -0,0 +1,61 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+# ############################################################################ #
+
+# Hey there! Welcome to the BlenderBIM Add-on code. Please feel free to reach
+# out if you have any questions or need further guidance. Happy hacking!
+
+# ############################################################################ #
+
+# Every module has a prop.py file to define Blender properties. Any time you
+# want an interface widget like an input field, dropdown, checkbox, or number
+# slider, you need a Blender property to store that widget's data. If you want
+# to store data that will affect the Blender interface, you also need a
+# property. Properties are stored in the .blend file, so when your user closes
+# their Blender session, and reopens it, things are how they left it.
+
+import bpy
+from bpy.types import PropertyGroup
+
+# Properties have many different data types. We won't use all of them in this
+# demo module, but this is a list for your reference.
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+
+
+# All properties must belong in a property group. Usually, you'd have a group
+# named after your module.
+class BIMDemoProperties(PropertyGroup):
+    # This first property is a string. This means that in the interface, it will
+    # represent a text input field. We can give it a name and a default value.
+    # The name will be the label shown next to the input field in the interface.
+    name: StringProperty(name="Name", default="New Project Name")
+    # Not all properties need to be shown using their equivalent input widget.
+    # In this case, we can store a message string, but we will never show it as
+    # an input text field in the ui.py.
+    message: StringProperty(name="Message")
+    show_hints: BoolProperty(name="Show Hints", default=False)
--- a/Show More
+++ b/Show More