Fix #4196 . Settings are now saved when you save Spreadsheet export JSON files. Also a new setting to generate an SVG alongside the spreadsheet (intended to be used as a schedule placed on a sheet).

Minor fix
Fix #4197 . URLs in SVG schedules are now clickable.
2026-08-21 04:32:23 +00:00 · 2024-01-13 15:03:51 +11:00 · 2024-01-13 00:00:58 +11:00 · 2024-01-12 23:44:45 +11:00 · 2024-01-12 19:48:32 +11:00 · 2024-01-12 18:14:49 +11:00
977 changed files with 1203630 additions and 35900 deletions
@@ -0,0 +1,57 @@
+name: ci-bcf-pypi
+
+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: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-bcf-pypi.yml'
+  workflow_dispatch:
+
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    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
+    steps:
+      - uses: actions/checkout@v2 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+        with:
+          python-version: '3.10' # 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: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
+      - name: Compile
+        run: |
+          pip install build
+          cd src/bcf &&
+          make dist
+      - name: Publish a Python distribution to PyPI
+        uses: ortega2247/pypi-upload-action@master
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          packages_dir: src/bcf/dist
@@ -1,37 +0,0 @@
-name: ci-bcf
-
-on:
-  push:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell' &&
-      contains(github.event.head_commit.message, '[bcf release]')
-    steps:
-      - run: echo ok go
-  upload:
-    needs: activate
-    name: Upload BCF package to Pypi
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-      - name: Build package
-        run: |
-          cd src/bcf
-          pip install build
-          python -m build
-      - name: Test
-        run: |
-          cd src/bcf
-          make test
-      - name: Publish package
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-          packages_dir: src/bcf/dist
@@ -39,7 +39,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310]
+        pyver: [py39, py310, py311]
        config:
          - {
            name: "Windows Build",
@@ -62,7 +62,7 @@ jobs:
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.10'
+          python-version: '3.11'
      - run: echo ${{ env.DATE }}
      - name: Get current date
        id: date
@@ -1,10 +1,7 @@
 name: ci-ifcopenshell-conda-daily

 on:
-  push:
-      paths:
-        - .github/workflows/ci-ifcopenshell-conda-daily.yml
-        - conda/**
+  workflow_dispatch:
  schedule:
  #         ┌───────────── minute (0 - 59)
  #         │  ┌───────────── hour (0 - 23)
@@ -15,17 +12,8 @@ on:
  - cron: "49 23 * * *" # 11min before utc midnight every day

 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
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
    runs-on: ${{ matrix.platform.distver }}
    defaults:
      run:
@@ -34,18 +22,23 @@ jobs:
      fail-fast: false
      matrix:
        pyver: [
-          { name: py310, distver: '3.10'},
-          { name: py311, distver: '3.11'}
+          { name: py311, distver: '3.11'},
+          { name: py312, distver: '3.12'}
        ]
        platform: [
          { name: Windows, distver: windows-2022, upload: 'true' },
          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
          { name: macOS, distver: macos-12, upload: 'true' }
        ]
+        variant: [
+          'novtk',
+#          'all'
+        ]
    steps:
      - uses: actions/checkout@v3
        with:
          submodules: recursive
+
      - name: Download MacOSX SDK
        if: ${{ matrix.platform.name == 'macOS' }}
        run: |
@@ -53,21 +46,22 @@ jobs:
          tar xf MacOSX10.13.sdk.tar.xz && \
          sudo mv -v MacOSX10.13.sdk /opt/ && \
          ls /opt/
-      - uses: seanmiddleditch/gha-setup-ninja@master
-      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
+
+      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
        with:
-          channels: conda-forge
-          channel-priority: strict
-          environment-file: conda/environment.yml
-          extra-specs: |
-            python=${{ matrix.pyver.distver }}
+          environment-name: build-env
+          cache-environment: true
+          condarc: |
+            channels:
+              - conda-forge
+            channel_priority: strict
+          create-args: >-
+            python=3.11
+            anaconda-client
+            boa
+
      - 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
-        working-directory: ./conda
-      - name: build & test ifcopenshell
-        if: ${{ matrix.platform.upload == 'false' }}
-        run: |
-          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
+          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
        working-directory: ./conda
@@ -12,7 +12,7 @@ on:
  push:
    paths:
      - '.github/workflows/ci-ifctester-pypi.yml'
-
+  workflow_dispatch:

 env:
  major: 0
@@ -1,98 +0,0 @@
-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
-        with:
-          key: ${GITHUB_WORKFLOW}
-
-      - name: Build ifcopenshell
-        run: |
-          sudo /usr/sbin/update-ccache-symlinks
-          mkdir build && cd build
-          PATH="/usr/lib/ccache:$PATH" cmake \
-               -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;4x3_add1" \
-               -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 xsdata numpy lxml
-          sudo /usr/bin/python -m pip install src/bcf --no-deps
-          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
-          sudo /usr/bin/python -m pip install tabulate
-          sudo /usr/bin/python -m pip install python-dateutil
-
-      - 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
@@ -31,12 +31,25 @@ jobs:
      - run: echo ok go

  build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    needs: activate
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
            submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
+          pip install src/bcf --no-deps
+          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
+
      - name: Install C++ dependencies
        run: |
          sudo apt update
@@ -49,7 +62,6 @@ jobs:
          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 \
@@ -62,6 +74,9 @@ jobs:

      - name: Build ifcopenshell
        run: |
+          echo $Python3_ROOT_DIR
+          echo ${{ env.pythonLocation }}
+          
          mkdir build && cd build
          cmake \
               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -71,9 +86,9 @@ jobs:
               -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 \
+               -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
+               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
+               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
               -DCOLLADA_SUPPORT=Off \
               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DGLTF_SUPPORT=On \
@@ -102,23 +117,11 @@ jobs:
          grep 0$ statuses
          grep 0$ statuses | wc -l

-      - name: Install Python dependencies
-        run: |
-          sudo /usr/bin/python -m pip install -U pip
-          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
-          sudo /usr/bin/python -m pip install src/bcf --no-deps
-          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
-          sudo /usr/bin/python -m pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
-          sudo /usr/bin/python -m pip install tabulate
-          sudo /usr/bin/python -m pip install python-dateutil

-      - name: Test
+      - name: Test ifcopenshell-python
        run: |
          cd test
-          sudo /usr/bin/python tests.py
+          python tests.py
          cd ../src/ifcopenshell-python
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test
+          make test-safe
@@ -96,5 +96,10 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 # apple
 .DS_Store

+# clangd config
+.clangd
+# clangd cache
+.cache
+
 # Brickschema
-src/blenderbim/blenderbim/bim/schema/Brick.ttl
+src/blenderbim/blenderbim/bim/schema/Brick.ttl
@@ -1,8 +1,9 @@

 IfcOpenShell 
 ============
+
 <p align="center">
-  <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/79010126/9e540403-c79f-446a-88c6-7c1ebc6ba864">
+<img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
 </p>

 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
@@ -54,7 +55,6 @@ Those marked with an asterisk are part of IfcOpenShell.
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
 | ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   |
 | ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   |
-| ifccobie                  | Extract IFC data for COBie handover requirements                      | LGPL-3.0-or-later   |
 | ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* |
 | ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   |
 | ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   |
@@ -13,68 +13,77 @@ def request_repo_info(url: str):
    return resp


+def get_choco_package_info() -> str:
+    resp = request_repo_info(URL_CHOCO_PACKAGE)
+    html_txt = str(resp.read())
+    return html_txt
+
+
+def get_latest_blender_version() -> list:
+    html_txt = get_choco_package_info()
+    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
+
+
+URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
+URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
+URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"(?:set|SET)\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
+
+
 if sys.argv[1] == "--do_choco_release?":
    now = datetime.datetime.now()
    blenderbim_date = (now - datetime.timedelta(days=1)).strftime("%y%m%d")
-    url = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
-    resp = request_repo_info(url)
+    resp = request_repo_info(URL_IFCOS_RELEASES)
    text = str(resp.read())
    if blenderbim_date in text:
        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="")
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        print(latest_blender_version[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj_pat")
+        quit(1)


 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="")
+    html_txt = get_choco_package_info()
+    blender_version_min_maj = re.findall(RE_BLENDER_VERSION_MIN_MAJ, html_txt)
+    if blender_version_min_maj:
+        print(blender_version_min_maj[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj")
+        quit(1)


 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)
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
        html_txt = str(resp.read())
-        found = re.findall(re_blender_python_version_maj_min, html_txt)
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
        if found:
            print(found[0], end="")
+        else:
+            print("[ERROR] could not determine blender_python_version_maj_min")
+            quit(1)


 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)
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
        html_txt = str(resp.read())
-        found = re.findall(re_blender_python_version_maj_min, html_txt)
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
        if found:
            print(f"py{found[0].replace('.', '')}", end="")
+        else:
+            print("[ERROR] could not determine pyver")
+            quit(1)

@@ -0,0 +1,43 @@
+################################################################################
+#                                                                              #
+# This file is part of IfcOpenShell.                                           #
+#                                                                              #
+# IfcOpenShell is free software: you can redistribute it and/or modify         #
+# it under the terms of the Lesser GNU General Public License as published by  #
+# the Free Software Foundation, either version 3.0 of the License, or          #
+# (at your option) any later version.                                          #
+#                                                                              #
+# IfcOpenShell 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                 #
+# Lesser GNU General Public License for more details.                          #
+#                                                                              #
+# You should have received a copy of the Lesser GNU General Public License     #
+# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
+#                                                                              #
+################################################################################
+
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+    message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif()
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+
+foreach(file ${files})
+    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+
+    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        exec_program(
+            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+            OUTPUT_VARIABLE rm_out
+            RETURN_VALUE rm_retval
+        )
+
+        if(NOT "${rm_retval}" STREQUAL 0)
+            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+        endif()
+    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+    endif()
+endforeach()
@@ -1,8 +0,0 @@
-compile:
-	conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.5
-
-debug:
-	conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4
-
-env:
-	conda env update --f environment.yml --prune
@@ -4,6 +4,7 @@ set MY_PY_VER=%PY_VER:.=%
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"

 cmake -G "Ninja" ^
+ -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
 -D CMAKE_BUILD_TYPE:STRING=Release ^
 -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -13,6 +13,7 @@ if [ `uname` == Darwin ]; then
 fi

 cmake -G Ninja \
+ -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
  ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -1,2 +1,6 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
+  - /opt/MacOSX10.13.sdk       # [osx]
+
+variant:
+  - novtk
+  - all
@@ -1,13 +0,0 @@
-name: conda-build
-channels:
-  - conda-forge
-dependencies:
-  - conda-build
-  - conda-verify
-  - anaconda-client
-  - ninja
-  - doxygen
-  - ripgrep
-  - pip
-  - pip:
-      - lief==0.13
@@ -1,6 +1,10 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
+{% set build = 1 %}

+# Higher number -> Always prioritize "novtk" variant over "all" variant
+{% set build = build + 200 %}   # [variant == "novtk"]
+{% set build = build + 100 %}   # [variant == "all"]

 package:
  name: {{ name }}
@@ -10,8 +14,9 @@ source:
  path: ..

 build:
+  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
  binary_relocation: false [osx]
-  number: 1
+  number: {{ build }}

 requirements:
  build:
@@ -19,12 +24,12 @@ requirements:
    - {{ compiler('cxx') }}
    - ninja >=1.10.2
    - cmake
-    - swig >=4.0.2
+    - swig 4.1.1

  host:
    - python
    - boost-cpp
-    - occt ==7.7.0
+    - occt 7.7.2 *{{ variant }}*
    - libxml2
    - cgal-cpp
    - hdf5
@@ -36,11 +41,11 @@ requirements:

  run:
    - python
-    - boost-cpp
-    - occt ==7.7.0
+    - occt 7.7.2 *{{ variant }}*
+    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
    - libxml2
-    - cgal-cpp
-    - hdf5
    - mpfr
    - gmp  # [unix]
    - mpir  # [win]
@@ -52,12 +57,12 @@ test:
    - ifcopenshell

 about:
-  home: http://ifcopenshell.org
+  home: https://ifcopenshell.org
  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/
+  doc_url: https://ifcopenshell.org/
  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
@@ -76,7 +76,7 @@ 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.13", "3.8.13", "3.9.11", "3.10.3", "3.11.0"]
+PYTHON_VERSIONS = ["3.6.14", "3.7.13", "3.8.13", "3.9.11", "3.10.3", "3.11.7", "3.12.1"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.5.3"
@@ -892,8 +892,9 @@ if "IfcOpenShell-Python" in targets:
            module_dir = os.path.dirname(run([python_executable, "-c", "import inspect, ifcopenshell; print(inspect.getfile(ifcopenshell))"]))

            if platform.system() != "Darwin":
-                # TODO: This symbol name depends on the Python version?
-                run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)
+                if BUILD_CFG == "Release":
+                    # TODO: This symbol name depends on the Python version?
+                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)

            return module_dir

@@ -1,3 +1,9 @@
+VERSION:=`date '+%y%m%d'`
+SED:=sed -i
+ifeq ($(UNAME_S),Darwin)
+SED:=sed -i '' -e
+endif
+
 .PHONY: ci
 ci:
 	tox
@@ -12,6 +18,13 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd

+.PHONY: dist
+dist:
+	rm -rf dist
+	$(SED) "s/999999/$(VERSION)/" pyproject.toml
+	python -m build
+	$(SED) "s/$(VERSION)/999999/" pyproject.toml
+
 # .PHONY
 # api:
-#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
+#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
@@ -1,84 +1,5 @@
 # bcf

-A simple Python implementation of BCF.
-Manipulation of BCF-XML is available via `bcfxml.py` and manipulation of BCF-API
-is available via `bcfapi.py`.
-
-It tries to support BCF-XML version 2.1 and 3.0, and BCF-API 3.0.
-
-## bcfxml
-
-The `bcfxml.load` function lets you read a BCF-XML file.
-It takes care of using the right version based on the "bcf.version" file contained in the BCF package.
-
-The BCF files are extracted and parsed on-demand, and edits are stored in memory until you call the `save` method.
-
-```python
-from bcf.bcfxml import load
-
-# Load a project
-with load("/path/to/file.bcf") as bcfxml:
-    project = bcfxml.project
-    print(project.name)
-
-    # To edit a project, just modify the object directly
-    bcfxml.project.name = "New name"
-
-    # Get a dictionary of topics
-    topics = bcfxml.topics
-
-    for topic_guid, topic_handler in bcfxml.topics.items():
-        topic = topic_handler.topic
-        print("Topic guid is", topic.guid)
-        print("Topic title is", topic.title)
-
-        # Fetch extra data about a topic
-        header = topic_handler.header
-        comments = topic_handler.comments
-        viewpoints = topic_handler.viewpoints
-
-        for comment in comments:
-            print(comment.guid)
-            print(comment.comment)
-            print(comment.author)
-
-    # Get a particular topic
-    topic = bcfxml.get_topic(guid)
-
-    # Modify a topic
-    topic.title = "New title"
-
-    bcfxml.save()
-```
-
-## bcfapi
-
-The `bcfapi` module lets you interact with the BCF-API standard.
-
-```python
-from bcf.v3.bcfapi import FoundationClient, BcfClient
-
-foundation_client = FoundationClient("YOUR_CLIENT_ID", "YOUR_CLIENT_SECRET", "OPENCDE_BASEURL")
-auth_methods = foundation_client.get_auth_methods()
-
-# Our library currently only implements the authorization_code flow
-if "authorization_code" in auth_methods:
-    foundation_client.login()
-
-bcf_client = BcfClient(foundation_client)
-
-versions = foundation_client.get_versions()
-for version in versions:
-if "3.0" in versions:
-    if version["api_id"] == "bcf" and version["version_id"] == "3.0":
-        bcf_client.set_version(version)
-
-data = bcf_client.get_projects()
-print(data)
-project_id = data[0]["project_id"]
-print(project_id)
-data = bcf_client.get_project(project_id)
-print(data)
-data = bcf_client.get_extensions(project_id)
-print(data)
-```
+A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
+available via `bcfxml.py` and manipulation of BCF-API is available via
+`bcfapi.py`.
@@ -17,7 +17,7 @@ dependencies = [
    "numpy",
    "ifcopenshell",
 ]
-version = "0.0.1"
+version = "0.0.999999"
 classifiers = [
    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
    "Operating System :: OS Independent",
@@ -76,7 +76,7 @@ deps =
    black
    isort
    pylint
-commands = 
+commands =
    black {posargs:.}
    isort {posargs:.}
    pylint {posargs:.} --output-format=colorized
@@ -138,4 +138,4 @@ max-attributes = 10

 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120
@@ -36,115 +36,163 @@ endif
 endif

 VERSION:=`date '+%y%m%d'`
+LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
 PYVERSION:=py310
+PYPI_IMP:=cp

 ifeq ($(PYVERSION), py39)
 PYLIBDIR:=python3.9
 PYNUMBER:=39
+PYPI_VERSION:=3.9
 endif
 ifeq ($(PYVERSION), py310)
 PYLIBDIR:=python3.10
 PYNUMBER:=310
+PYPI_VERSION:=3.10
+endif
+ifeq ($(PYVERSION), py311)
+PYLIBDIR:=python3.11
+PYNUMBER:=311
+PYPI_VERSION:=3.11
 endif

 ifeq ($(PLATFORM), linux)
+PYPI_PLATFORM:=--platform manylinux_2_17_x86_64
+LXML_ARCH:=manylinux_2_28_x86_64
+SHAPELY_ARCH:=manylinux_2_17_x86_64.manylinux2014_x86_64
+PILLOW_ARCH:=manylinux_2_28_x86_64
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py39h40a70d0_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py39hdfdd6bb_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py39h359ec1e_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py39hb1babde_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py39h7c9e3ff_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
-LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/2d/f2/8ec281d357e8bb7d08dc8d727f0e4c8ef3dae7d3fa75c69c8e452bb82d50/shapely-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/01/61/3ff85fb4bb596ce3d223c8fcf93c8df5c12bc8899dfb4fb3cb1c5b20dd5f/Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py310h995690b_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py310hf02b7e0_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py310hd002f03_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py310hcfe0b05_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py310hc4a4660_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.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
-SHAPELY_URL:=https://files.pythonhosted.org/packages/a8/a5/403728b5614b28083f6424dfdefec5fcf58068495fb03bb08532671c642f/shapely-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/f6/51/320986ebd6d46a0e95c2240468ced73153b691ce07617078bcdf30c609ec/Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl
+endif
+ifeq ($(PYVERSION), py311)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py311h04f086a_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py311h995a085_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py311h59ea3da_3.tar.bz2
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/linux-64/octomap-1.9.8-h924138e_0.tar.bz2
 BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/linux-64/boost-cpp-1.78.0-h6582d0a_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2
 endif

 ifeq ($(PLATFORM), macos)
+PYPI_PLATFORM:=--platform macosx_10_9_x86_64
+SHAPELY_ARCH:=macosx_10_9_x86_64
+PILLOW_ARCH:=macosx_10_10_x86_64
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py39hd85b194_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py39hc4d6e28_0.conda
+LXML_ARCH:=macosx_11_0_x86_64
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py39h26350b9_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py39h3323527_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py39h953a6b8_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
-LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/36/a4/7e542a209f862f967d7cb8e939eff155f4294a27d17e16441fb8bdd51a2c/shapely-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/88/7a/ddfe28b485b623361457d4783007c1f9ba83a87f93e7fec32f64793efb6c/Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py310h1db6f5f_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py310h43da829_0.conda
+LXML_ARCH:=macosx_11_0_x86_64
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py310ha216469_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py310h33a8c9b_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py310h3e792ce_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
-LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/1f/2a/dc3353c2431cf53e8d04bb8fba27e584410ca3435c9c85f76d71bf0c0e80/shapely-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/d8/60/b13c00d403f34110e96c1b5c0afa73ce461efe3fe960c3a7e3e7fe190d82/Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl
+endif
+ifeq ($(PYVERSION), py311)
+LXML_ARCH:=macosx_11_0_universal2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py311hebdd1a2_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py311h62e90b6_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py311h349b758_4.tar.bz2
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-64/octomap-1.9.8-hb8565cd_0.tar.bz2
 BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-64/boost-cpp-1.78.0-hf5ba120_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2
 endif

 ifeq ($(PLATFORM), macosm1)
+PYPI_PLATFORM:=--platform macosx_11_0_arm64
+LXML_ARCH:=macosx_11_0_universal2
+SHAPELY_ARCH:=macosx_11_0_arm64
+PILLOW_ARCH:=macosx_11_0_arm64
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py39hc34188a_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py39h13cfc01_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py39h82b2ff2_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py39h3a9e884_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h99de9ae_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h9eb174b_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/ea/aa/45fbd031edf3149cb767d8b9f9db45d5faf0324d743c6b8fb0298cc022d0/shapely-2.0.1-cp39-cp39-macosx_11_0_arm64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py310h46fc4cd_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py310ha2643af_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py310hdb6c3eb_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py310h96e9823_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h629746b_4.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/ec/41/d59208743e737184e1b403e95a937aebb022b8459e99efbcd5208fc8be46/shapely-2.0.1-cp310-cp310-macosx_11_0_arm64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/0c/5f/117b653cad585f3aedfe0de996c292e67d4b020ed77f652e5a6c8c24f908/Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl
+endif
+ifeq ($(PYVERSION), py311)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py311hc0c29b9_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py311h24fa84d_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py311h5c64717_4.tar.bz2
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-arm64/assimp-5.0.1-h0f81e16_7.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-arm64/octomap-1.9.8-hffc8910_0.tar.bz2
 BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-arm64/boost-cpp-1.78.0-h9ed8d21_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-arm64/zlib-1.2.11-h90dfc92_1014.tar.bz2
 endif

 ifeq ($(PLATFORM), win)
+PYPI_PLATFORM:=--platform win_amd64
+LXML_ARCH:=win_amd64
+SHAPELY_ARCH:=win_amd64
+PILLOW_ARCH:=win_amd64
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py39h39b25cb_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py39hb6c915b_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py39hf3ebc58_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py39ha1f6a47_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py39hea4d8d1_4.tar.bz2
-LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/a7/ae/eab645c4075093584b7a65ab71cb8ff4563a015bd935c9b55dba14b2c1eb/shapely-2.0.1-cp39-cp39-win_amd64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/19/3f/b4d4bcf05dbcbe07f2e9613a8f4180c297395e73a91d8ad22c32c6624f8c/Pillow-9.2.0-cp39-cp39-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py310heb59267_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py310hd146abe_0.conda
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py310h1bf3f0a_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py310h7fb871d_0.conda
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py310h220cb41_4.tar.bz2
-LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
-SHAPELY_URL:=https://files.pythonhosted.org/packages/81/8a/7ac076a86b2632f1872284c5e60ed5f2fc26094875a85b35d9fa17b52504/shapely-2.0.1-cp310-cp310-win_amd64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/02/55/67a3c17b9e7d972ed8c246f104da99ca4f3ea42fba566697e479011b84b6/Pillow-9.2.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
+ifeq ($(PYVERSION), py311)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py311hd263b2c_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py311hd354db1_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py311h12feb9d_3.tar.bz2
+endif
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.2.5/download/win-64/assimp-5.2.5-h4dcb625_0.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/win-64/qhull-2020.2-h70d2c02_2.tar.bz2
 OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/win-64/octomap-1.9.8-h91493d7_0.tar.bz2
 BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2
 endif

+LXML_NAME:=lxml
+LXML_VER:=4.9.4
+SHAPELY_NAME:=shapely
+SHAPELY_VER:=2.0.2
+PILLOW_NAME:=pillow
+PILLOW_PKG_NAME:=Pillow
+PILLOW_VER:=9.5.0
+SHAPELY_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/s/$(SHAPELY_NAME)/$(SHAPELY_NAME)-$(SHAPELY_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(SHAPELY_ARCH).whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/p/$(PILLOW_NAME)/$(PILLOW_PKG_NAME)-$(PILLOW_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(PILLOW_ARCH).whl
+
+ifeq ($(PLATFORM), macosm1)
+ifeq ($(PYVERSION), py39)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h0520ce3_1.tar.bz2
+endif
+ifeq ($(PYVERSION), py310)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
+endif
+ifeq ($(PYVERSION), py311)
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py311h246f609_1.tar.bz2
+endif
+else
+LXML_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/l/$(LXML_NAME)/$(LXML_NAME)-$(LXML_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(LXML_ARCH).whl
+endif
+$(info $$LXML_URL is [${LXML_URL}])
+$(info $$SHAPELY_URL is [${SHAPELY_URL}])
+$(info $$PILLOW_URL is [${PILLOW_URL}])
+
 .PHONY: bump
 bump:
 	cd . && $(SED) "s/$(OLD)/$(NEW)/" Makefile
@@ -163,7 +211,7 @@ endif
 	cp -r blenderbim/* dist/blenderbim/

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

@@ -193,8 +241,10 @@ endif
 	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 IFCFM functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcfm/ifcfm dist/blenderbim/libs/site/packages/
+	# Provides bSDD functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/bsdd/* dist/blenderbim/libs/site/packages/
 	# Provides IFCDiff functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
 	# Provides IFCCSV functionality
@@ -375,6 +425,10 @@ endif
 	mkdir dist/working
 	cd dist/working && $(PYTHON) -m venv env
 	cd dist/working && mkdir site-packages
+	# Required by IfcCSV
+	cd dist/working && . env/bin/activate && $(PIP) install pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --target=./site-packages
+	cd dist/working && . env/bin/activate && $(PIP) install openpyxl --target=./site-packages
+	cd dist/working && . env/bin/activate && $(PIP) install odfpy --target=./site-packages
 	# Required by IFCCityJSON
 	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
 	# Provides express rule validation for ifcopenshell.validate
@@ -425,8 +479,7 @@ ifeq ($(PLATFORM), win)
 endif
 	rm -rf dist/working

-	# Required by hpp-fcl except on Windows
-ifneq ($(PLATFORM), win)
+	# Required by hpp-fcl
 	mkdir dist/working
 	cd dist/working && wget $(QHULL_URL)
 	cd dist/working && tar -xf qhull*
@@ -439,8 +492,10 @@ endif
 ifeq ($(PLATFORM), macosm1)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-	rm -rf dist/working
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
+	rm -rf dist/working

 	# Required by hpp-fcl
 	mkdir dist/working
@@ -475,7 +530,7 @@ ifeq ($(PLATFORM), macosm1)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
 ifeq ($(PLATFORM), win)
-	# Uh, do nothing, apparently? No DLLs are shipped.
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
 	rm -rf dist/working

@@ -581,28 +636,6 @@ endif
 	cd dist/working/parse_type-0.5.2/ && cp -r parse_type ../../blenderbim/libs/site/packages/
 	rm -rf dist/working

-	# Required by IFCCOBie for XLSX support
-	# TODO: see if we can replace this with openpyxl which does both read/write
-	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/0c/bc/82d6783f83f65f56d8b77d052773c4a2f952fa86385f0cd54e1e006658d7/XlsxWriter-1.2.9.tar.gz
-	cd dist/working && tar -xzvf XlsxWriter*
-	cd dist/working/XlsxWriter-1.2.9/ && cp -r xlsxwriter ../../blenderbim/libs/site/packages/
-	rm -rf dist/working
-
-	# Required by IFCCOBie for ODS support
-	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/97/73/8ade73f6749177003f7ce3304f524774adda96e6aaab30ea79fd8fda7934/odfpy-1.4.1.tar.gz
-	cd dist/working && tar -xzvf odfpy*
-	cd dist/working/odfpy-1.4.1/ && cp -r odf ../../blenderbim/libs/site/packages/
-	rm -rf dist/working
-
-	# Required by odfpy
-	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77/defusedxml-0.6.0.tar.gz
-	cd dist/working && tar -xzvf defusedxml*
-	cd dist/working/defusedxml-0.6.0/ && cp -r defusedxml ../../blenderbim/libs/site/packages/
-	rm -rf dist/working
-
 	# Required by augin
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/76/b4/b7baffbda025efd5dc8fcd8d2e953e3aa939c236a484084fa8f4c3588ee9/boto3-1.17.17.tar.gz
@@ -638,13 +671,6 @@ endif
 	cp -r dist/working/IFC2JSON_python-master/file_converters/ifcjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

-	# Provides OpenLCA functionality
-	mkdir dist/working
-	cd dist/working && wget https://files.pythonhosted.org/packages/85/33/f91b96e9e8608ff65a003b692e8a9cdd60f2178f60617e5b1d21334c009c/olca-ipc-0.0.10.tar.gz
-	cd dist/working && tar -xzvf olca-ipc*
-	cd dist/working/olca-ipc-0.0.10/ && cp -r olca ../../blenderbim/libs/site/packages/
-	rm -rf dist/working
-
 	# Provides Brickschema functionality
 	mkdir dist/working
 	# For now lets bundle the latest nightly schema
@@ -675,6 +701,7 @@ endif
 	rm -rf dist/blenderbim/libs/site/packages/numpy.libs

 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
+	cd dist/blenderbim/bim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim

@@ -22,13 +22,14 @@ import site

 bl_info = {
    "name": "BlenderBIM",
-    "description": "Author, import, and export data using the Industry Foundation Classes schema",
+    "description": "Transforms Blender into a native Building Information Model authoring platform using IFC.",
    "author": "IfcOpenShell Contributors",
-    "blender": (2, 80, 0),
+    "blender": (3, 1, 0),
    "version": (0, 0, 999999),
-    "location": "File > Export, File > Import, Scene / Object / Material / Mesh Properties",
+    "location": "File Menu, Scene Properties Tab. See documentation for more.",
+    "doc_url": "https://blenderbim.org/docs",
    "tracker_url": "https://github.com/IfcOpenShell/IfcOpenShell/issues",
-    "category": "Import-Export",
+    "category": "System",
 }

 if sys.modules.get("bpy", None):
@@ -16,15 +16,21 @@
 # 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
+from pathlib import Path
 import bpy
+import bpy.utils.previews
 import blenderbim
 import importlib
 from . import handler, ui, prop, operator, helper

+cwd = os.path.dirname(os.path.realpath(__file__))
+
 modules = {
    "project": None,
    "search": None,
    "bcf": None,
+    "bsdd": None,
    "root": None,
    "unit": None,
    "model": None,
@@ -38,8 +44,9 @@ modules = {
    "spatial": None,
    "void": None,
    "aggregate": None,
+    "nest": None,
    "geometry": None,
-    "cobie": None,
+    "fm": None,
    "resource": None,
    "cost": None,
    "sequence": None,
@@ -61,7 +68,6 @@ modules = {
    "document": None,
    "pset_template": None,
    "clash": None,
-    "lca": None,
    "csv": None,
    "tester": None,
    "bimtester": None,
@@ -72,6 +78,7 @@ modules = {
    "augin": None,
    "debug": None,
    "ifcgit": None,
+    "covering": 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,
@@ -86,9 +93,10 @@ classes = [
    operator.AddIfcFile,
    operator.BIM_OT_add_section_plane,
    operator.BIM_OT_remove_section_plane,
-    operator.ConfigureVisibility,
    operator.OpenUpstream,
    operator.OpenUri,
+    operator.SwitchTab,
+    operator.SetTab,
    operator.ReloadIfcFile,
    operator.RemoveIfcFile,
    operator.SelectDataDir,
@@ -105,8 +113,8 @@ classes = [
    operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
    prop.ObjProperty,
    prop.Attribute,
-    prop.ModuleVisibility,
    prop.BIMAreaProperties,
+    prop.BIMTabProperties,
    prop.BIMProperties,
    prop.IfcParameter,
    prop.PsetQto,
@@ -115,53 +123,90 @@ classes = [
    prop.BIMCollectionProperties,
    prop.BIMMaterialProperties,
    prop.BIMMeshProperties,
-    ui.BIM_PT_section_plane,
+    prop.BIMFacet,
+    prop.BIMFilterGroup,
    ui.BIM_UL_generic,
    ui.BIM_UL_topics,
    ui.BIM_ADDON_preferences,
-    # Scene panel groups
-    ui.BIM_PT_root,
-    ui.BIM_PT_project_info,
-    ui.BIM_PT_project_setup,
-    ui.BIM_PT_collaboration,
-    ui.BIM_PT_selection,
-    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,
+    # Tabs panel
+    ui.BIM_PT_tabs,
+    # Project overview
+    ui.BIM_PT_tab_project_info,
+    ui.BIM_PT_tab_project_setup,
+    ui.BIM_PT_tab_geometry,
+    ui.BIM_PT_tab_stakeholders,
+    ui.BIM_PT_tab_grouping_and_filtering,
+    # Object information
+    ui.BIM_PT_tab_object_metadata,
+    ui.BIM_PT_tab_misc,
+    # Geometry and materials
+    ui.BIM_PT_tab_placement,
+    ui.BIM_PT_tab_representations,
+    ui.BIM_PT_tab_geometric_relationships,
+    ui.BIM_PT_tab_parametric_geometry,
+    ui.BIM_PT_tab_profiles,
+    ui.BIM_PT_tab_materials,
+    ui.BIM_PT_tab_styles,
+    # Drawings and documents
+    ui.BIM_PT_tab_sheets,
+    ui.BIM_PT_tab_drawings,
+    ui.BIM_PT_tab_schedules,
+    ui.BIM_PT_tab_references,
+    # Services and systems
+    ui.BIM_PT_tab_services,
+    ui.BIM_PT_tab_zones,
+    # Structural analysis
+    ui.BIM_PT_tab_structural,
+    # Construction scheduling
+    ui.BIM_PT_tab_status,
+    ui.BIM_PT_tab_resources,
+    ui.BIM_PT_tab_cost,
+    ui.BIM_PT_tab_sequence,
+    # Facility management
+    ui.BIM_PT_tab_handover,
+    ui.BIM_PT_tab_operations,
+    # Quality and coordination
+    ui.BIM_PT_tab_quality_control,
+    ui.BIM_PT_tab_clash_detection,
+    ui.BIM_PT_tab_collaboration,
+    ui.BIM_PT_tab_sandbox,
+    # TODO: move this somewhere else and clean it up
+    ui.BIM_PT_section_plane,
 ]

 for mod in modules.values():
    classes.extend(mod.classes)

+addon_keymaps = []
+icons = None
+is_registering = False
+last_commit_hash = "8888888"
+overridden_scene_panels = dict()
+

 def on_register(scene):
-    handler.setDefaultProperties(scene)
+    global is_registering
+
+    if is_registering:
+        return
+    is_registering = True
+    handler.load_post(scene)
    if not bpy.app.background:
        bpy.app.handlers.depsgraph_update_post.remove(on_register)
+    is_registering = False


 def register():
    for cls in classes:
        bpy.utils.register_class(cls)
    bpy.app.handlers.depsgraph_update_post.append(on_register)
-    bpy.app.handlers.undo_pre.append(handler.undo_pre)
    bpy.app.handlers.undo_post.append(handler.undo_post)
-    bpy.app.handlers.redo_pre.append(handler.redo_pre)
    bpy.app.handlers.redo_post.append(handler.redo_post)
-    bpy.app.handlers.load_post.append(handler.setDefaultProperties)
+    bpy.app.handlers.load_post.append(handler.load_post)
    bpy.app.handlers.load_post.append(handler.loadIfcStore)
-    bpy.app.handlers.save_post.append(handler.ensureIfcExported)
    bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
    bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
+    bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
    bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
    bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
    bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
@@ -170,7 +215,6 @@ def register():
    bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.PointLight.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
-    bpy.types.SCENE_PT_unit.append(ui.ifc_units)
    if hasattr(bpy.types, "UI_MT_button_context_menu"):
        bpy.types.UI_MT_button_context_menu.append(ui.draw_custom_context_menu)
    bpy.types.STATUSBAR_HT_header.append(ui.draw_statusbar)
@@ -178,17 +222,48 @@ def register():
    for mod in modules.values():
        mod.register()

+    wm = bpy.context.window_manager
+    if wm.keyconfigs.addon:
+        km = wm.keyconfigs.addon.keymaps.new(name="Window", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.switch_tab", "TAB", "PRESS", ctrl=True)
+        addon_keymaps.append((km, kmi))
+
+    global icons
+
+    icons_dir = os.path.join(cwd, "data", "icons")
+    icon_preview = bpy.utils.previews.new()
+    for filename in os.listdir(icons_dir):
+        if filename.endswith(".png"):
+            icon_name = os.path.splitext(filename)[0]
+            icon_path = os.path.join(icons_dir, filename)
+            icon_preview.load(icon_name, icon_path, "IMAGE")
+
+    icons = icon_preview
+
+    global last_commit_hash
+    try:
+        import git
+
+        path = Path(__file__).resolve().parent
+        repo = git.Repo(str(path), search_parent_directories=True)
+        last_commit_hash = repo.head.object.hexsha
+    except:
+        pass
+

 def unregister():
+    global icons
+
+    bpy.utils.previews.remove(icons)
+
    for cls in reversed(classes):
        if getattr(cls, "is_registered", None) is None:
            bpy.utils.unregister_class(cls)
        elif cls.is_registered:
            bpy.utils.unregister_class(cls)

-    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
+    bpy.app.handlers.load_post.remove(handler.load_post)
    bpy.app.handlers.load_post.remove(handler.loadIfcStore)
-    bpy.app.handlers.save_post.remove(handler.ensureIfcExported)
    del bpy.types.Scene.BIMProperties
    del bpy.types.Collection.BIMCollectionProperties
    del bpy.types.Object.BIMObjectProperties
@@ -198,10 +273,22 @@ def unregister():
    del bpy.types.Curve.BIMMeshProperties
    del bpy.types.Camera.BIMMeshProperties
    del bpy.types.PointLight.BIMMeshProperties
-    bpy.types.SCENE_PT_unit.remove(ui.ifc_units)
    if hasattr(bpy.types, "UI_MT_button_context_menu"):
        bpy.types.UI_MT_button_context_menu.remove(ui.draw_custom_context_menu)
    bpy.types.STATUSBAR_HT_header.remove(ui.draw_statusbar)

    for mod in reversed(list(modules.values())):
        mod.unregister()
+
+    wm = bpy.context.window_manager
+    kc = wm.keyconfigs.addon
+    if kc:
+        for km, kmi in addon_keymaps:
+            km.keymap_items.remove(kmi)
+    addon_keymaps.clear()
+
+    for panel in tuple(overridden_scene_panels.keys()):
+        original_panel, override_panel = overridden_scene_panels[panel]
+        bpy.utils.unregister_class(override_panel)
+        bpy.utils.register_class(original_panel)
+        del overridden_scene_panels[panel]
@@ -27,6 +27,12 @@ text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type
 .IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .IfcGeographicElement { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 1; }
 .PredefinedType-LINEWORK { stroke: black; stroke-width: 0.25; }
+.PredefinedType-LINEWORK.dashed { stroke-dasharray: 3, 2; }
+.PredefinedType-LINEWORK.fine { stroke-width: 0.18; stroke: #777777; }
+.PredefinedType-LINEWORK.thin { stroke-width: 0.25; }
+.PredefinedType-LINEWORK.medium { stroke-width: 0.35; }
+.PredefinedType-LINEWORK.thick { stroke-width: 0.5; }
+.PredefinedType-LINEWORK.strong { stroke-width: 1; }
 .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; }
@@ -40,7 +46,6 @@ text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type
 .PredefinedType-SLOPEPERCENT { marker-end: url(#radius-marker-end); }
 .PredefinedType-SLOPEFRACTION { 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-SEALANT { fill: url(#crosshatch1); stroke-width: 0.25; }
@@ -75,7 +75,7 @@
    <marker id="stair-marker-end" markerHeight="42" markerWidth="21" orient="auto" refX="21" refY="21">
        <path d="M 0 0 L 21 21 L 0 42" class="annotation stair" style="stroke-width:2; marker-start: none; marker-end: none;" />
    </marker>
-    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15">
+    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15" orient="auto">
        <g>
            <path d="M 15 0 L 15 30" class="annotation" style="stroke-width:1;" />
            <path d="M 0 15 L 30 15" class="annotation" style="stroke-width:1;" />
@@ -84,7 +84,7 @@
            <path d="M 15 15 L 22.5 15 A 7.5 7.5 0 0 1 15 22.5 Z" fill="black"/>
        </g>
    </marker>
-    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10">
+    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10" orient="auto-start-reverse">
        <g>
            <path d="M 0 1 L 20 1 L 10 11 Z" fill="black" />
            <path d="M 0 1 L 90 1" class="annotation" style="stroke-width:1;" />
@@ -21,6 +21,9 @@
        <line x1="-5" x2="5" style="stroke: black; stroke-width: 0.25;" />
        <text y="2.5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
    </g>
+    <g id="window-tag">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="m 0.0161133,-6.0583333 5.2339915,3.8366023 -2.031433,6.1633977 c 0,0 -6.4894866,-0.027414 -6.4894866,-0.027414 l -1.97929,-6.1803395 5.2662181,-3.7922467" />
+    </g>
    <g id="space-tag">
        <text y="-5" class="large" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
@@ -41,4 +44,29 @@
        <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="dot">
+        <circle r="1" fill="black" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="setout-tag">
+        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
+        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
+        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
+        <text x="3" y="-8" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
+        <text x="3" y="-4" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
+    </g>
+    <g id="setout-point">
+        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
+        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
+        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
+    </g>
+    <g id="control-point">
+        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 2.286165,1.4798666 H -1.0000316e-7 -2.2861651 L -1.1430826,-0.5000101 -1.0000316e-7,-2.479888 1.1430827,-0.5000101 Z" />
+        <circle r="0.5" fill="black" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="traverse-point">
+        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M -2,-2 2,2 M -2,2 2,-2" />
+    </g>
+    <g id="spot-elevation">
+        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 0,-2 0,2 M -2,0 2,0" />
+    </g>
 </svg>
@@ -51,5 +51,5 @@ var json_data = `{{{json_data}}}`;
 <script>
 var data = `{{{data}}}`;
 setupPage(data);
-create_gantt_chart(json_data)
-</script>
+create_gantt_chart(atob(json_data))
+</script>
@@ -5,27 +5,27 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset
 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,#16,#17,#18,#19,#20,#21));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21,#22));
 #2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','The scale of this drawing represented as a numerator and denominator, such as 1/100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','The scale of this drawing in human readable format, such as 1:100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('2T$a4OFsv2LeD5JeBKEV4f',$,'IsNTS','Whether or not the scale is intended to be significant',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.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','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#14=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#15=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#16=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#17=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#18=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
-#19=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#20=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#21=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('2T$a4OFsv2LeD5JeBKEV4f',$,'IsNTS','Whether or not the scale is intended to be significant',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#14=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#15=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#20=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#21=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#22=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -0,0 +1,13 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EPset_Status.ifc','2020-01-01T00:00:00',(),(),'EPset_Status','EPset_Status',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('3JoyTt$cz4fhYuQvJeTMhs',$,'EPset_Status','',.PSET_TYPEDRIVENOVERRIDE.,'IfcProduct',(#2,#4));
+#2= IFCSIMPLEPROPERTYTEMPLATE('2HBOdOfz5E3hZ7IBLCq$$D',$,'Status','Status of the element, predominately used in renovation or retrofitting projects. The status can be assigned to as "New" - element designed as new addition, "Existing" - element exists and remains, "Demolish" - element existed but is to be demolished,  "Temporary" - element will exists only temporary (like a temporary support structure).',.P_ENUMERATEDVALUE.,'IfcLabel',$,#3,$,$,$,.READWRITE.);
+#3= IFCPROPERTYENUMERATION('EPEnum_ElementStatus',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3ttXxqmlz62BlxjzEPpqvH',$,'UserDefinedStatus','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;
@@ -0,0 +1,16 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EQto_BodyGeometryValidation.ifc','2020-01-01T00:00:00',(),(),'EQto_BodyGeometryValidation','EQto_BodyGeometryValidation',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('2KS9su6r517uLXTGKwwDdn',$,'EQto_BodyGeometryValidation','Quantities supplied for validating the correct interpretation of the body shape representation at import. In case of multiple representation items, the quantities are summed for each of the items (irrespective of any overlap). Choosing a suitable tolerance value for comparing the supplied numbers to the numbers calculated from the reconstructed geometry is at the discretion of the importing application.',.QTO_OCCURRENCEDRIVEN.,'IfcProduct',(#2,#3,#4,#5,#6,#7));
+#2=IFCSIMPLEPROPERTYTEMPLATE('3iCdOOLRjCwQ_HRTB41Xh8',$,'GrossSurfaceArea','Total gross area of the object, normally generated as perimeter * length + 2 * cross section area. It is the sum of OuterSurfaceArea + (2 x CrossSectionArea) and shall only be given, if the OuterSurfaceArea and CrossSectionArea cannot be established separately.\X2\000A000A\X0\Total gross surface area of the element before applying product-level geometric features such as openings and projections.',.Q_AREA.,$,$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('0juemEqF5889vg7HwR87Fv',$,'NetSurfaceArea','Net surface area of the object, normally generated as perimeter * length + 2 * cross section area taking into account possible processing features (cut-out''s, etc.) or openings and recesses.\X2\000A000A\X0\Total net surface area of the element after applying product-level geometric features such as openings and projections.',.Q_AREA.,$,$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('1LUuLSnMXFDgGLBCvte8aH',$,'GrossVolume','Total gross volume of the object. Openings, recesses, enclosed objects and projections are not taken into account.\X2\000A000A\X0\Total gross volume of the element before applying product-level geometric features such as openings and projections.',.Q_VOLUME.,$,$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('0ny7TXUFz8wvnoQ2eU8czF',$,'NetVolume','Total net volume of the object, taking into account possible processing features (cut-out''s, etc.) or openings and recesses.\X2\000A000A\X0\Total net volume of the element before applying product-level geometric features such as openings and projections.',.Q_VOLUME.,$,$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('31g8_gdUv8KRkOWzW48KoP',$,'SurfaceGenusBeforeFeatures','The Surface Genus of the evaluated representation items before applying product-level geometric features such as openings and projections.Surface Genus is a topological measure that represents the number of "holes" or "handles" on a surface. For example, a sphere has genus 0, and a torus has genus 1.Computed using the Euler characteristic:$$\\chi=V-E+F$$With the numbers of vertices (V), edges (E) and faces (F)$$\\chi=2\X2\2212\X0\2g\X2\2212\X0\b$$With surface genus (g) and the number of boundaries (b) the latter zero in case of an enclosed volume.',.Q_COUNT.,$,$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('3kBBtGUebC09mUggGTKpjj',$,'SurfaceGenusAfterFeatures','The Surface Genus of the evaluated representation items after applying product-level geometric features such as openings and projections.Surface Genus is a topological measure that represents the number of "holes" or "handles" on a surface. For example, a sphere has genus 0, and a torus has genus 1.Computed using the Euler characteristic:$$\\chi=V-E+F$$With the numbers of vertices (V), edges (E) and faces (F)$$\\chi=2\X2\2212\X0\2g\X2\2212\X0\b$$With surface genus (g) and the number of boundaries (b) the latter zero in case of an enclosed volume.',.Q_COUNT.,$,$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;
@@ -0,0 +1,23 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('','2023-09-28T23:00:50',(),(),'IfcOpenShell v0.7.0-fbd8ea1ed','IfcOpenShell v0.7.0-fbd8ea1ed','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('1TLQmgUKf0I8Zi07bm9Jqn',$,'ePSet_ProjectedCRS','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#2,#3,#4,#5,#6,#7));
+#2=IFCSIMPLEPROPERTYTEMPLATE('2cH53PtVT3v88uf_uGFblG',$,'Name','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('3JsReA6vXDqR7aNC$haRYW',$,'Description','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('0u0uEsT5HFtuX5GvozO9ba',$,'GeodeticDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('1JgEX9Fsf0$ggxYltdkqiY',$,'VerticalDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('3ahTZjYrD0MAOo5IH6QuGH',$,'MapProjection','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('3hqJR2ghD0GAti7q4sXKj7',$,'MapZone','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
+#8=IFCPROPERTYSETTEMPLATE('1jGHTycOj0vA8xHfRl4TNs',$,'ePSet_MapConversion','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#9,#10,#11,#12,#13,#15));
+#9=IFCSIMPLEPROPERTYTEMPLATE('0nxsULXo17JRrAvNteYtNR',$,'Eastings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('26RfaGJs5CqemN0Xin12XL',$,'Northings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('0ziCn3nZv3m850VEUwWH42',$,'OrthogonalHeight','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('3d4BOt4In8WR119ms1SaAe',$,'XAxisAbscissa','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('1Q4Voqj2j84RQRI8l67m28',$,'XAxisOrdinate','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#15=IFCSIMPLEPROPERTYTEMPLATE('0O1Hc0$XnDNOG_jPBmbW5r',$,'Scale','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;
@@ -1,214 +0,0 @@
-# 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"],
-}
@@ -82,7 +82,7 @@ class IfcExporter:
        )
        self.file.wrapped_data.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
        self.file.wrapped_data.header.file_name.originating_system = "{} {}".format(
-            self.get_application_name(), self.get_application_version()
+            self.get_application_name(), tool.Blender.get_blenderbim_version()
        )

    def sync_all_objects(self):
@@ -93,6 +93,8 @@ class IfcExporter:
            try:
                if isinstance(obj, bpy.types.Material):
                    continue
+                if obj.library:
+                    continue
                tool.Collector.sync(obj)
                result = self.sync_object_placement(obj)
                if result:
@@ -162,7 +164,7 @@ class IfcExporter:
        return "BlenderBIM"

    def get_application_version(self):
-        return ".".join(
+        version = ".".join(
            [
                str(x)
                for x in [
@@ -172,6 +174,9 @@ class IfcExporter:
                ][0]
            ]
        )
+        if blenderbim.bim.last_commit_hash != "8888888":
+            version += f"-{blenderbim.bim.last_commit_hash[:7]}"
+        return version


 class IfcExportSettings:
@@ -21,12 +21,14 @@ import bpy
 import json
 import addon_utils
 import ifcopenshell.api.owner.settings
+import blenderbim.bim
 import blenderbim.tool as tool
 import blenderbim.core.owner as core_owner
 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 blenderbim.bim.module.model.data import AuthoringData
+from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
 from mathutils import Vector
 from math import cos, degrees

@@ -35,29 +37,13 @@ cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()


-def mode_callback(obj, data):
-    objects = bpy.context.selected_objects
-    if bpy.context.active_object:
-        objects += [bpy.context.active_object]
-    for obj in objects:
-        if (
-            obj.mode != "EDIT"
-            or not obj.data
-            or not isinstance(obj.data, (bpy.types.Mesh, bpy.types.Curve, bpy.types.TextCurve))
-            or not obj.BIMObjectProperties.ifc_definition_id
-        ):
-            continue
-        if obj.data.BIMMeshProperties.ifc_definition_id:
-            tool.Ifc.edit(obj)
-        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
-            tool.Ifc.edit(obj)
-
-
 def name_callback(obj, data):
-    # TODO Do we still need this, now that we are monitoring the undo redo objects?
    try:
        obj.name
    except:
+        # The object is invalid but somehow still has a callback. Clear all
+        # msgbus subscriptions to prevent useless further triggers.
+        bpy.msgbus.clear_by_owner(obj)
        return  # In case the object RNA is gone during an undo / redo operation
    # Blender names are up to 63 UTF-8 bytes
    if len(bytes(obj.name, "utf-8")) >= 63:
@@ -71,17 +57,31 @@ def name_callback(obj, data):
        refresh_ui_data()
        return

-    if not obj.BIMObjectProperties.ifc_definition_id or "/" not in obj.name:
+    if not obj.BIMObjectProperties.ifc_definition_id:
        return
+
+    if obj.BIMObjectProperties.is_renaming:
+        obj.BIMObjectProperties.is_renaming = False
+        return
+
    element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+    if "/" in obj.name:
+        object_name = obj.name
+        element_name = obj.name.split("/", 1)[1]
+    else:
+        element_name = obj.name
+        object_name = element.is_a() + f"/{element_name}"
+        obj.name = object_name  # NOTE: doesn't trigger infinite recursion
+
    if element.is_a("IfcGridAxis"):
-        element.AxisTag = obj.name.split("/")[1]
+        element.AxisTag = object_name.split("/")[1]
        refresh_ui_data()
+
    if not element.is_a("IfcRoot"):
        return
+    element.Name = element_name
    if obj.BIMObjectProperties.collection:
-        obj.BIMObjectProperties.collection.name = obj.name
-    element.Name = "/".join(obj.name.split("/")[1:])
+        obj.BIMObjectProperties.collection.name = object_name
    refresh_ui_data()


@@ -104,7 +104,7 @@ def update_bim_tool_props():
        return
    mode = bpy.context.mode
    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
-    if not current_tool or current_tool.idname != "bim.bim_tool":
+    if not current_tool or current_tool.idname not in LIST_OF_TOOLS:
        return
    element = tool.Ifc.get_entity(obj)
    if not element:
@@ -112,6 +112,16 @@ def update_bim_tool_props():
    representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
    if not representation:
        return
+
+    props = bpy.context.scene.BIMModelProperties
+    if element.is_a("IfcElementType") or element.is_a("IfcElement"):
+        element_type = ifcopenshell.util.element.get_type(element)
+        if element_type:
+            is_bim_tool = current_tool.idname == "bim.bim_tool"
+            if is_bim_tool:
+                props.ifc_class = element_type.is_a()
+            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
+                props.relating_type_id = str(element_type.id())
    extrusion = tool.Model.get_extrusion(representation)
    if not extrusion:
        return
@@ -122,7 +132,6 @@ def update_bim_tool_props():
        return x_angle

    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    props = bpy.context.scene.BIMModelProperties
    if not AuthoringData.is_loaded:
        AuthoringData.load()

@@ -173,70 +182,42 @@ def refresh_ui_data():
        except AttributeError:
            pass

-    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
-        tool.Ifc.get().clear_cache()
-
-
-def purge_module_data():
-    from blenderbim.bim import modules
-
-    refresh_ui_data()
-    for name, value in modules.items():
-        try:
-            getattr(getattr(getattr(ifcopenshell.api, name), "data"), "Data").purge()
-        except AttributeError:
-            pass
-
+        # TODO: deprecate prop purge functions and refactor into data classes.
        try:
            getattr(value, "prop").purge()
        except AttributeError:
            pass

+    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
+        tool.Ifc.get().clear_cache()
+

@persistent
 def loadIfcStore(scene):
    IfcStore.purge()
-    purge_module_data()
+    refresh_ui_data()
    if not IfcStore.get_file():
        return
    IfcStore.get_schema()
    IfcStore.relink_all_objects()


-@persistent
-def undo_pre(scene):
-    IfcStore.track_undo_redo_stack_object_map()
-
-
@persistent
 def undo_post(scene):
    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.undo()
-        purge_module_data()
-    IfcStore.track_undo_redo_stack_selected_objects()
-    IfcStore.reload_undo_redo_stack_objects()
-
-
-@persistent
-def redo_pre(scene):
-    IfcStore.track_undo_redo_stack_object_map()
+        IfcStore.undo(until_key=bpy.context.scene.BIMProperties.last_transaction)
+        refresh_ui_data()
+    tool.Ifc.rebuild_element_maps()


@persistent
 def redo_post(scene):
    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.redo()
-        purge_module_data()
-    IfcStore.track_undo_redo_stack_selected_objects()
-    IfcStore.reload_undo_redo_stack_objects()
-
-
-@persistent
-def ensureIfcExported(scene):
-    if IfcStore.get_file() and not bpy.context.scene.BIMProperties.ifc_file:
-        bpy.ops.export_ifc.bim("INVOKE_DEFAULT")
+        IfcStore.redo(until_key=bpy.context.scene.BIMProperties.last_transaction)
+        refresh_ui_data()
+    tool.Ifc.rebuild_element_maps()


 def get_application(ifc):
@@ -273,8 +254,62 @@ def viewport_shading_changed_callback(area):
        bpy.context.scene.BIMStylesProperties.active_style_type = "External"


+@classmethod
+def poll_check_blender_tab(cls, context):
+    return tool.Blender.is_tab(context, "BLENDER")
+
+
+def get_override_scene_panel(panel_name):
+    original_panel = getattr(bpy.types, panel_name)
+
+    override_panel = type(f"Override_{panel_name}", (original_panel,), {})
+    override_panel.bl_idname = f"{panel_name}_override"
+
+    # some blender panel depend on other and register_class will throw an error
+    # if we won't override their `bl_parent_id`
+    bl_parent_id = getattr(override_panel, "bl_parent_id", None)
+    if bl_parent_id is not None:
+        override_panel.bl_parent_id = f"{bl_parent_id}_override"
+
+    # override poll method
+    poll = getattr(override_panel, "poll", None)
+    if poll is None:
+        override_panel.poll = poll_check_blender_tab
+    else:
+
+        @classmethod
+        def wrapped_poll(cls, context):
+            return super(override_panel, cls).poll(context) and poll_check_blender_tab.__func__(cls, context)
+
+        override_panel.poll = wrapped_poll
+
+    return override_panel
+
+
+# TODO: possibly override scene panels from other addons too?
+# list can be updated from
+# https://projects.blender.org/blender/blender/src/branch/main/scripts/startup/bl_ui/properties_scene.py#L421
+OVERRIDE_SCENE_PANELS = (
+    "SCENE_PT_scene",
+    "SCENE_PT_unit",
+    "SCENE_PT_physics",
+    "SCENE_PT_rigid_body_world",
+    "SCENE_PT_rigid_body_world_settings",
+    "SCENE_PT_rigid_body_cache",
+    "SCENE_PT_rigid_body_field_weights",
+    "SCENE_PT_audio",
+    "SCENE_PT_keying_sets",
+    "SCENE_PT_custom_props",
+    # after SCENE_PT_keying_sets
+    "SCENE_PT_keying_set_paths",
+    "SCENE_PT_keyframing_settings",
+)
+if bpy.app.version >= (4, 0):
+    OVERRIDE_SCENE_PANELS += ("SCENE_PT_simulation",)
+
+
@persistent
-def setDefaultProperties(scene):
+def load_post(scene):
    global global_subscription_owner
    active_object_key = bpy.types.LayerObjects, "active"
    bpy.msgbus.subscribe_rna(
@@ -299,32 +334,24 @@ def setDefaultProperties(scene):
    ifcopenshell.api.owner.settings.get_application = get_application
    AuthoringData.type_thumbnails = {}

+    if not bpy.context.preferences.addons["blenderbim"].preferences.should_setup_toolbar:
+        tool.Blender.unregister_toolbar()
+
    if bpy.context.preferences.addons["blenderbim"].preferences.should_setup_workspace:
        if "BIM" in bpy.data.workspaces:
            bpy.context.window.workspace = bpy.data.workspaces["BIM"]
        else:
            bpy.ops.workspace.append_activate(idname="BIM", filepath=os.path.join(cwd, "data", "workspace.blend"))

-        for obj in [bpy.data.objects.get("Camera"), bpy.data.objects.get("Light")]:
-            if obj:
-                bpy.data.objects.remove(obj)
-
-        for panel in [
-            "SCENE_PT_scene",
-            "SCENE_PT_unit",
-            "SCENE_PT_physics",
-            "SCENE_PT_rigid_body_world",
-            "SCENE_PT_audio",
-            "SCENE_PT_keying_sets",
-            "SCENE_PT_custom_props",
-        ]:
-            try:
-                bpy.utils.unregister_class(getattr(bpy.types, panel))
-            except:
-                pass
-
-    # https://blender.stackexchange.com/questions/140644/how-can-make-the-state-of-a-boolean-property-relative-to-the-3d-view-area
-    for screen in bpy.data.screens:
-        screen.BIMAreaProperties.clear()
-        for i in range(20):  # 20 is an arbitrary value of split areas
-            screen.BIMAreaProperties.add()
+        # To improve usability for new users, we hijack the scene properties
+        # tab. We override default scene properties panels with our own poll
+        # to hide them unless the user has chosen to view Blender properties.
+        for panel in OVERRIDE_SCENE_PANELS:
+            if panel in blenderbim.bim.overridden_scene_panels:
+                continue
+            override_panel = get_override_scene_panel(panel)
+            original_panel = getattr(bpy.types, panel)
+            bpy.utils.register_class(override_panel)
+            bpy.utils.unregister_class(original_panel)
+            blenderbim.bim.overridden_scene_panels[panel] = (original_panel, override_panel)
+    tool.Blender.setup_tabs()
@@ -87,8 +87,15 @@ def import_attributes(ifc_class, props, data, callback=None):

 # A more elegant attribute importer signature, intended to supersede import_attributes
 def import_attributes2(element, props, callback=None):
-    for attribute in element.wrapped_data.declaration().as_entity().all_attributes():
-        import_attribute(attribute, props, element.get_info(), callback=callback)
+    if isinstance(element, str):
+        attributes = tool.Ifc.schema().declaration_by_name(element).as_entity().all_attributes()
+        info = {a.name(): None for a in attributes}
+        info["type"] = element
+    else:
+        attributes = element.wrapped_data.declaration().as_entity().all_attributes()
+        info = element.get_info()
+    for attribute in attributes:
+        import_attribute(attribute, props, info, callback=callback)


 def import_attribute(attribute, props, data, callback=None):
@@ -238,7 +245,9 @@ def get_obj_ifc_definition_id(context, obj, obj_type):
        ].ifc_definition_id
    elif obj_type == "WorkSchedule":
        return context.scene.BIMWorkScheduleProperties.active_work_schedule_id
-
+    elif obj_type == "Group":
+        prop = context.scene.BIMGroupProperties
+        return prop.groups[prop.active_group_index].ifc_definition_id

 # hack to close popup
 # https://blender.stackexchange.com/a/202576/130742
@@ -260,12 +269,7 @@ def convert_property_group_from_si(property_group, skip_props=()):
    for prop_name in property_group.bl_rna.properties.keys():
        if prop_name in skip_props:
            continue
-        prop_bl_rna = property_group.bl_rna.properties[prop_name]
-        if prop_bl_rna.array_length > 0:
-            prop_value = prop_bl_rna.default_array
-        else:
-            prop_value = prop_bl_rna.default
-
+        prop_value = tool.Blender.get_blender_prop_default_value(property_group, prop_name)
        if type(prop_value) is float:
            prop_value = prop_value * conversion_k
        elif type(prop_value) is bpy.types.bpy_prop_array:
@@ -273,6 +277,85 @@ def convert_property_group_from_si(property_group, skip_props=()):
        setattr(property_group, prop_name, prop_value)


+def draw_filter(layout, filter_groups, data, module):
+    if not data.is_loaded:
+        data.load()
+
+    sprops = bpy.context.scene.BIMSearchProperties
+
+    if tool.Ifc.get():
+        row = layout.row(align=True)
+        row.label(text=f"{len(data.data['saved_searches'])} Saved Searches")
+
+        if data.data["saved_searches"]:
+            row.operator("bim.load_search", text="", icon="IMPORT").module = module
+        row.operator("bim.save_search", text="", icon="EXPORT").module = module
+
+    row = layout.row(align=True)
+    row.operator("bim.add_filter_group", text="Add Search Group", icon="ADD").module = module
+    row.operator("bim.edit_filter_query", text="", icon="FILTER").module = module
+
+    for i, filter_group in enumerate(filter_groups):
+        box = layout.box()
+
+        row = box.row(align=True)
+        row.prop(sprops, "facet", text="")
+        op = row.operator("bim.add_filter", text="Add Filter", icon="ADD")
+        op.type = sprops.facet
+        op.index = i
+        op.module = module
+
+        for j, ifc_filter in enumerate(filter_group.filters):
+            if ifc_filter.type == "entity":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="FILE_3D")
+            elif ifc_filter.type == "attribute":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "name", text="", icon="COPY_ID")
+                row.prop(ifc_filter, "value", text="")
+            elif ifc_filter.type == "type":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="FILE_VOLUME")
+            elif ifc_filter.type == "material":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="MATERIAL")
+            elif ifc_filter.type == "property":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "pset", text="", icon="PROPERTIES")
+                row.prop(ifc_filter, "name", text="")
+                row.prop(ifc_filter, "comparison", text="")
+                row.prop(ifc_filter, "value", text="")
+            elif ifc_filter.type == "classification":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="OUTLINER")
+            elif ifc_filter.type == "location":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="PACKAGE")
+            elif ifc_filter.type == "group":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="OUTLINER_COLLECTION")
+            elif ifc_filter.type == "query":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "name", text="", icon="POINTCLOUD_DATA")
+                row.prop(ifc_filter, "value", text="")
+            elif ifc_filter.type == "instance":
+                row = box.row(align=True)
+                row.prop(ifc_filter, "value", text="", icon="GRIP")
+                op = row.operator("bim.select_filter_elements", text="", icon="EYEDROPPER")
+                op.group_index = i
+                op.index = j
+                op.module = module
+            op = row.operator("bim.remove_filter", text="", icon="X")
+            op.group_index = i
+            op.index = j
+            op.module = module
+
+        row = box.row()
+        op = row.operator("bim.remove_filter_group", icon="X")
+        op.index = i
+        op.module = module
+
+
 # TODO this should move into ifcopenshell.util


@@ -26,6 +26,7 @@ import ifcopenshell
 import blenderbim.bim.handler
 import blenderbim.tool as tool
 from pathlib import Path
+from blenderbim.tool.brick import BrickStore


 class IfcStore:
@@ -43,9 +44,6 @@ class IfcStore:
    classification_file = None
    library_path = ""
    library_file = None
-    element_listeners = set()
-    undo_redo_stack_objects = set()
-    undo_redo_stack_object_names = {}
    current_transaction = ""
    last_transaction = ""
    history = []
@@ -160,103 +158,17 @@ class IfcStore:
            return
        return obj

-    @staticmethod
-    def add_element_listener(callback):
-        IfcStore.element_listeners.add(callback)
-
-    @staticmethod
-    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
-        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.
-        """
-        if bpy.context.active_object:
-            objects = set([o.name for o in bpy.context.selected_objects + [bpy.context.active_object]])
-            objects.update([o.name for o in bpy.context.active_object.children])
-        else:
-            objects = set([o.name for o in bpy.context.selected_objects])
-        for obj in bpy.context.selected_objects:
-            objects.update([o.name for o in obj.children])
-        IfcStore.undo_redo_stack_objects |= objects
-
-    @staticmethod
-    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
-
-        # 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:
-                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)
-
-        # 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:
-                # TODO not so sure about this obj_name check
-                obj_name = IfcStore.undo_redo_stack_object_names.get(key, None)
-                if not obj_name:
-                    continue
-                obj = bpy.data.objects.get(obj_name)
-                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:
+            if obj.library:
+                continue
            IfcStore.relink_object(obj)
        for obj in bpy.data.materials:
+            if obj.library:
+                continue
            IfcStore.relink_object(obj)

    @staticmethod
@@ -282,6 +194,13 @@ class IfcStore:

    @staticmethod
    def link_element(element, obj):
+        # Please use tool.Ifc.link() instead of this method. We want to
+        # refactor this class and deprecate usage of IfcStore in favour of
+        # tools.
+        if not isinstance(obj, (bpy.types.Object, bpy.types.Material)):
+            obj.BIMMeshProperties.ifc_definition_id = element.id()
+            return
+
        existing_obj = IfcStore.id_map.get(element.id(), None)
        if existing_obj == obj:
            return
@@ -305,11 +224,9 @@ class IfcStore:
        if isinstance(obj, bpy.types.Material):
            blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
        elif isinstance(obj, bpy.types.Object):
-            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
-            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
-
-        for listener in IfcStore.element_listeners:
-            listener(element, obj)
+            blenderbim.bim.handler.subscribe_to(
+                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
+            )

        if IfcStore.history:
            data = {"id": element.id(), "guid": getattr(element, "GlobalId", None), "obj": obj.name}
@@ -331,10 +248,13 @@ class IfcStore:
        IfcStore.id_map[data["id"]] = obj
        if "guid" in data:
            IfcStore.guid_map[data["guid"]] = obj
-        blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
        blenderbim.bim.handler.subscribe_to(obj, "name", blenderbim.bim.handler.name_callback)
        if isinstance(obj, bpy.types.Material):
            blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
+        elif isinstance(obj, bpy.types.Object):
+            blenderbim.bim.handler.subscribe_to(
+                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
+            )
        # TODO Listeners are not re-registered. Does this cause nasty problems to debug later on?
        # TODO We're handling id_map and guid_map, but what about edited_objs? This might cause big problems.

@@ -400,24 +320,33 @@ class IfcStore:
            )

    @staticmethod
-    def execute_ifc_operator(operator, context):
+    def execute_ifc_operator(operator, context, is_invoke=False):
        is_top_level_operator = not bool(IfcStore.current_transaction)

        if is_top_level_operator:
            IfcStore.begin_transaction(operator)
-            IfcStore.get_file().begin_transaction()
+            if tool.Ifc.get():
+                tool.Ifc.get().begin_transaction()
+            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
+                BrickStore.begin_transaction()
            # This empty transaction ensures that each operator has at least one transaction
            IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
        else:
            operator.transaction_key = IfcStore.current_transaction

-        result = getattr(operator, "_execute")(context)
+        if is_invoke:
+            result = getattr(operator, "_invoke")(context, None)
+        else:
+            result = getattr(operator, "_execute")(context)

        if is_top_level_operator:
-            IfcStore.get_file().end_transaction()
-            IfcStore.add_transaction_operation(
-                operator, rollback=lambda d: IfcStore.get_file().undo(), commit=lambda d: IfcStore.get_file().redo()
-            )
+            if tool.Ifc.get():
+                tool.Ifc.get().end_transaction()
+                IfcStore.add_transaction_operation(
+                    operator, rollback=lambda d: tool.Ifc.get().undo(), commit=lambda d: tool.Ifc.get().redo()
+                )
+            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
+                BrickStore.end_transaction()
            IfcStore.end_transaction(operator)
            blenderbim.bim.handler.refresh_ui_data()

@@ -425,8 +354,6 @@ class IfcStore:

    @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

@@ -452,19 +379,35 @@ class IfcStore:
        IfcStore.future = []

    @staticmethod
-    def undo():
+    def undo(until_key=None):
+        BrickStore.undo()
        if not IfcStore.history:
            return
-        event = IfcStore.history.pop()
-        for transaction in event["operations"][::-1]:
-            transaction["rollback"](transaction["data"])
-        IfcStore.future.append(event)
+
+        while IfcStore.history:
+            if IfcStore.history[-1]["key"] == until_key:
+                return
+
+            event = IfcStore.history.pop()
+            for transaction in event["operations"][::-1]:
+                transaction["rollback"](transaction["data"])
+            IfcStore.future.append(event)

    @staticmethod
-    def redo():
+    def redo(until_key=None):
+        BrickStore.redo()
+
        if not IfcStore.future:
            return
-        event = IfcStore.future.pop()
-        for transaction in event["operations"]:
-            transaction["commit"](transaction["data"])
-        IfcStore.history.append(event)
+
+        has_encountered_key = False
+        while IfcStore.future:
+            if has_encountered_key and IfcStore.future[-1]["key"] != until_key:
+                return
+            elif IfcStore.future[-1]["key"] == until_key:
+                has_encountered_key = True
+
+            event = IfcStore.future.pop()
+            for transaction in event["operations"]:
+                transaction["commit"](transaction["data"])
+            IfcStore.history.append(event)
@@ -20,14 +20,14 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    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,
+    operator.BIM_OT_aggregate_assign_object,
+    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_enable_editing_aggregate,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_select_parts,
+    operator.BIM_OT_aggregate_unassign_object,
    prop.BIMObjectAggregateProperties,
    ui.BIM_PT_aggregate,
 )
@@ -35,7 +35,7 @@ class AggregateData:
            "has_relating_object": cls.has_relating_object(),
            "relating_object_label": cls.get_relating_object_label(),
            "has_related_objects": cls.has_related_objects(),
-            "related_objects_amount": cls.get_related_objects_amount(),
+            "total_parts": cls.total_parts(),
            "ifc_class": cls.ifc_class(),
        }
        cls.is_loaded = True
@@ -59,7 +59,7 @@ class AggregateData:
        return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))

    @classmethod
-    def get_related_objects_amount(cls):
+    def total_parts(cls):
        parts = cls.get_related_objects()
        return len(parts) if parts else 0

@@ -33,11 +33,11 @@ class Operator:
        return {"FINISHED"}


-class BIM_OT_assign_object(bpy.types.Operator, Operator):
+class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator):
    """Create aggregation relationship between two ifc elements"""

-    bl_idname = "bim.assign_object"
-    bl_label = "Assign Object"
+    bl_idname = "bim.aggregate_assign_object"
+    bl_label = "Assign Object To Aggregation"
    bl_options = {"REGISTER", "UNDO"}
    relating_object: bpy.props.IntProperty()

@@ -67,11 +67,11 @@ class BIM_OT_assign_object(bpy.types.Operator, Operator):
                self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}")


-class BIM_OT_unassign_object(bpy.types.Operator, Operator):
+class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator):
    """Remove aggregation relationship between two ifc elements"""

-    bl_idname = "bim.unassign_object"
-    bl_label = "Unassign Object"
+    bl_idname = "bim.aggregate_unassign_object"
+    bl_label = "Unassign Object From Aggregation"
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
@@ -164,6 +164,7 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):

    def create_aggregate(self, context, ifc_class):
        aggregate = bpy.data.objects.new("Assembly", None)
+        aggregate.location = context.scene.cursor.location
        bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class=ifc_class)
        return aggregate

@@ -202,6 +203,7 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
        aggregate_obj = tool.Ifc.get_object(aggregate)
        if aggregate_obj in context.selectable_objects:
            aggregate_obj.select_set(True)
+            bpy.context.view_layer.objects.active = aggregate_obj
        return {"FINISHED"}


@@ -22,13 +22,13 @@ from blenderbim.bim.ifc import IfcStore


 class BIM_PT_aggregate(Panel):
-    bl_label = "IFC Aggregates"
+    bl_label = "Aggregates"
    bl_idname = "BIM_PT_aggregate"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_object_metadata"
+    bl_parent_id = "BIM_PT_tab_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -54,7 +54,7 @@ class BIM_PT_aggregate(Panel):
            row = layout.row(align=True)
            row.prop(props, "relating_object", text="")
            if props.relating_object:
-                op = row.operator("bim.assign_object", icon="CHECKMARK", text="")
+                op = row.operator("bim.aggregate_assign_object", icon="CHECKMARK", text="")
                op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id
            row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="")
        else:
@@ -65,15 +65,21 @@ class BIM_PT_aggregate(Panel):
                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 = row.operator("bim.aggregate_unassign_object", icon="X", text="")
            else:
                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")
+        total_parts = AggregateData.data["total_parts"]
+        if total_parts == 0:
+            row.label(text="No Parts", icon="TRIA_DOWN")
+        elif total_parts == 1:
+            row.label(text="1 Part", icon="TRIA_DOWN")
+        else:
+            row.label(text=f"{total_parts} Parts", 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
@@ -54,12 +54,12 @@ def draw_ui(context, layout, obj_type, attributes):


 class BIM_PT_object_attributes(Panel):
-    bl_label = "IFC Attributes"
+    bl_label = "Attributes"
    bl_idname = "BIM_PT_object_attributes"
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_object_metadata"
+    bl_parent_id = "BIM_PT_tab_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -76,7 +76,7 @@ class BIM_PT_object_attributes(Panel):


 class BIM_PT_material_attributes(Panel):
-    bl_label = "IFC Material Attributes"
+    bl_label = "Material Attributes"
    bl_idname = "BIM_PT_material_attributes"
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
@@ -26,7 +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"
+    bl_parent_id = "BIM_PT_tab_sandbox"

    def draw(self, context):
        layout = self.layout
@@ -16,6 +16,8 @@
 # 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 bcf
 import bcf.v2.bcfxml

@@ -23,12 +25,31 @@ import bcf.v2.bcfxml
 class BcfStore:
    bcfxml = None

-    @staticmethod
-    def get_bcfxml():
-        if not BcfStore.bcfxml:
-            BcfStore.bcfxml = bcf.v2.bcfxml.BcfXml()
-        return BcfStore.bcfxml
+    @classmethod
+    def get_bcfxml(cls):
+        if not cls.bcfxml:
+            bcf_filepath = bpy.context.scene.BCFProperties.bcf_file
+            if not os.path.isabs(bcf_filepath):
+                bcf_filepath = os.path.abspath(os.path.join(bpy.path.abspath("//"), bcf_filepath))
+            if bcf_filepath:
+                try:
+                    cls.bcfxml = bcf.bcfxml.load(bcf_filepath)
+                except:
+                    # there will be a plenty of "Permission denied" errors
+                    # as many poll() methods will try to access the bcfxml simultaneously
+                    # the first time it's loaded
+                    pass
+        return cls.bcfxml

    @classmethod
-    def set(cls, bcfxml):
+    def set(cls, bcfxml, filepath):
        cls.bcfxml = bcfxml
+        bpy.context.scene.BCFProperties.bcf_file = filepath
+
+    @classmethod
+    def set_by_filepath(cls, filepath):
+        cls.set(None, filepath)
+
+    @classmethod
+    def unload_bcfxml(cls):
+        cls.set(None, "")
@@ -42,11 +42,9 @@ class NewBcfProject(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        context.scene.BCFProperties.is_loaded = False
        bcfxml = bcf.v2.bcfxml.BcfXml.create_new("New Project")
-        bcfstore.BcfStore.set(bcfxml)
+        bcfstore.BcfStore.set(bcfxml, "")
        bpy.ops.bim.load_bcf_project()
-        context.scene.BCFProperties.is_loaded = True
        return {"FINISHED"}


@@ -59,11 +57,10 @@ class LoadBcfProject(bpy.types.Operator):

    def execute(self, context):
        if self.filepath:
-            bcfstore.BcfStore.bcfxml = bcf.bcfxml.load(self.filepath)
+            bcfstore.BcfStore.set_by_filepath(self.filepath)
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        context.scene.BCFProperties.name = bcfxml.project.name
        bpy.ops.bim.load_bcf_topics()
-        context.scene.BCFProperties.is_loaded = True
        return {"FINISHED"}

    def invoke(self, context, event):
@@ -77,8 +74,7 @@ class UnloadBcfProject(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        bcfstore.BcfStore.set(None)
-        context.scene.BCFProperties.is_loaded = False
+        bcfstore.BcfStore.unload_bcfxml()
        return {"FINISHED"}


@@ -267,6 +263,7 @@ class SaveBcfProject(bpy.types.Operator):
    def execute(self, context):
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        bcfxml.save(self.filepath)
+        bcfstore.BcfStore.set(bcfxml, self.filepath)
        return {"FINISHED"}

    def invoke(self, context, event):
@@ -964,7 +961,8 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                context_override = {}
                context_override["object"] = context_override["active_object"] = objs[0]
                context_override["selected_objects"] = context_override["selected_editable_objects"] = objs
-                bpy.ops.object.hide_view_set(context_override, unselected=True)
+                with context.temp_override(**context_override):
+                    bpy.ops.object.hide_view_set(unselected=True)
                context.area.type = old

        if viewpoint.visualization_info.components.view_setup_hints:
@@ -978,14 +976,16 @@ class ActivateBcfViewpoint(bpy.types.Operator):
            self.hide_spaces(context)
            self.set_openings_visibility(False, context)

+        # set selection at the end not to conflict with .hide_spaces
        self.set_selection(viewpoint)
        self.set_colours(viewpoint)

    def hide_spaces(self, context):
        old = context.area.type
        context.area.type = "VIEW_3D"
+        bpy.ops.object.select_all(action="DESELECT")
        bpy.ops.object.select_pattern(pattern="IfcSpace/*")
-        bpy.ops.object.hide_view_set({})
+        bpy.ops.object.hide_view_set()
        context.area.type = old

    def set_openings_visibility(self, is_visible, context):
@@ -41,37 +41,37 @@ def purge():


 def updateBcfReferenceLink(self, context):
-    if context.scene.BCFProperties.is_loaded:
+    if bcfstore.BcfStore.get_bcfxml():
        bpy.ops.bim.edit_bcf_reference_links()


 def updateBcfLabel(self, context):
-    if context.scene.BCFProperties.is_loaded:
+    if bcfstore.BcfStore.get_bcfxml():
        bpy.ops.bim.edit_bcf_labels()


 def updateBcfProjectName(self, context):
-    if self.is_loaded:
+    if bcfstore.BcfStore.get_bcfxml():
        bpy.ops.bim.edit_bcf_project_name()


 def updateBcfAuthor(self, context):
-    if self.is_loaded:
+    if bcfstore.BcfStore.get_bcfxml():
        bpy.ops.bim.edit_bcf_author()


 def updateBcfTopicName(self, context):
-    if context.scene.BCFProperties.is_loaded:
+    if bcfstore.BcfStore.get_bcfxml():
        bpy.ops.bim.edit_bcf_topic_name()


 def updateBcfTopicIsEditable(self, context):
-    if context.scene.BCFProperties.is_loaded and not self.is_editable:
+    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
        bpy.ops.bim.edit_bcf_topic()


 def updateBcfCommentIsEditable(self, context):
-    if context.scene.BCFProperties.is_loaded and not self.is_editable:
+    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
        bpy.ops.bim.edit_bcf_comment(comment_guid=self.name)


@@ -151,7 +151,7 @@ class BcfTopic(PropertyGroup):


 class BCFProperties(PropertyGroup):
-    is_loaded: BoolProperty(name="Is Loaded", default=False)
+    bcf_file: StringProperty(name="BCF File")
    comment_text_width: IntProperty(name="Comment Text Width", default=40)
    name: StringProperty(default="", name="Project Name", update=updateBcfProjectName)
    author: StringProperty(default="john@doe.com", name="Author Email", update=updateBcfAuthor)
@@ -29,7 +29,7 @@ class BIM_PT_bcf(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration"
+    bl_parent_id = "BIM_PT_tab_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -39,8 +39,7 @@ class BIM_PT_bcf(Panel):
        scene = context.scene
        props = scene.BCFProperties

-
-        if not props.is_loaded:
+        if not bcfstore.BcfStore.get_bcfxml():
            row = layout.row(align=True)
            row.operator("bim.new_bcf_project", text="New Project")
            row.operator("bim.load_bcf_project", text="Load Project")
@@ -27,7 +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"
+    bl_parent_id = "BIM_PT_tab_quality_control"

    def draw(self, context):
        self.layout.use_property_split = True
@@ -62,14 +62,14 @@ class BoundaryDecorator:
        gpu.state.point_size_set(6)
        gpu.state.blend_set("ALPHA")

-        self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
+        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
        self.line_shader.bind()  # required to be able to change uniforms of the shader
        # POLYLINE_UNIFORM_COLOR specific uniforms
        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
        self.line_shader.uniform_float("lineWidth", 2.0)

        # general shader
-        self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
+        self.shader = gpu.shader.from_builtin("UNIFORM_COLOR")

        selected_vertices = []
        selected_edges = []
@@ -63,7 +63,8 @@ def disable_editing_boundary_geometry(context):


 class Loader:
-    def __init__(self):
+    def __init__(self, operator=None):
+        self.operator = operator
        self.ifc_file = None
        self.logger = None
        self.ifc_importer = None
@@ -85,14 +86,33 @@ class Loader:
            tool.Loader.link_mesh(shape, mesh)
        except RuntimeError:
            # Fallback solution for invalid geometry provided by Revit. (InnerBoundaries cuting OuterBoundary)
-            print(f"Failed to create mesh from IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid")
-            shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
+            self.operator.report(
+                {"WARNING"},
+                (
+                    f"IfcRelSpaceBoundary {boundary.id()} mesh creation failed. Geometry might be invalid. Using fallback solution"
+                ),
+            )
+            try:
+                shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
+            except RuntimeError:
+                self.operator.report(
+                    {"WARNING"},
+                    f"Skipping IfcRelSpaceBoundary {boundary.id()}. Fallback solution failed. Geometry might be invalid",
+                )
+                return None
            mesh = bpy.data.meshes.new(str(surface.id()))
            bm = bmesh.new()
            verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
            bm.faces.new(verts)
            for inner_boundary in surface.InnerBoundaries:
-                shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
+                try:
+                    shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
+                except RuntimeError:
+                    self.operator.report(
+                        {"WARNING"},
+                        f"Skipping an inner boundary for IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid",
+                    )
+                    return None
                verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
                for i in range(len(verts) - 1):
                    bm.edges.new(verts[i : i + 2])
@@ -104,9 +124,7 @@ class Loader:
            matrix = mathutils.Matrix(
                ifcopenshell.util.placement.get_axis2placement(surface.BasisSurface.Position).tolist()
            )
-            matrix[0][3] *= unit_scale
-            matrix[1][3] *= unit_scale
-            matrix[2][3] *= unit_scale
+            matrix.translation *= unit_scale
            mesh.transform(matrix)
        return mesh

@@ -128,7 +146,15 @@ class Loader:
        self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
        self.ifc_importer.file = self.ifc_file

-    def load_boundary(self, boundary, blender_space):
+    def load_boundary(self, boundary, blender_space=None):
+        if not blender_space:
+            if not boundary.RelatingSpace:
+                self.operator.report(
+                    {"WARNING"},
+                    f"Skipping IfcRelSpaceBoundary {boundary.id()} which have no relating space. Invalid boundary.",
+                )
+                return
+            blender_space = tool.Ifc.get_object(boundary.RelatingSpace)
        obj = tool.Ifc.get_object(boundary)
        if obj:
            return obj
@@ -147,9 +173,9 @@ class LoadProjectSpaceBoundaries(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        loader = Loader()
+        loader = Loader(self)
        for rel in tool.Ifc.get().by_type("IfcRelSpaceBoundary"):
-            loader.load_boundary(rel, tool.Ifc.get_object(rel.RelatingSpace))
+            loader.load_boundary(rel)
        return {"FINISHED"}


@@ -160,7 +186,7 @@ class LoadBoundary(bpy.types.Operator):
    boundary_id: bpy.props.IntProperty()

    def execute(self, context):
-        loader = Loader()
+        loader = Loader(self)
        for obj in context.visible_objects:
            obj.select_set(False)
        obj = loader.load_boundary(tool.Ifc.get().by_id(self.boundary_id), context.active_object)
@@ -175,7 +201,7 @@ class LoadSpaceBoundaries(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        loader = Loader()
+        loader = Loader(self)
        element = tool.Ifc.get_entity(context.active_object)
        for rel in element.BoundedBy or []:
            loader.load_boundary(rel, context.active_object)
@@ -423,7 +449,7 @@ class EnableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
        bpy.ops.object.mode_set(mode="EDIT")
        ProfileDecorator.install(context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context))
        if not bpy.app.background:
-            bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
+            tool.Blender.set_viewport_tool("bim.cad_tool")
        return {"FINISHED"}


@@ -461,7 +487,7 @@ class EditBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
            ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_surface)

            old_mesh = obj.data
-            loader = Loader()
+            loader = Loader(self)
            obj.data = loader.create_mesh(element)
            tool.Geometry.delete_data(old_mesh)

@@ -486,7 +512,7 @@ class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):

    def _execute(self, context):
        props = bpy.context.scene.BIMBoundaryProperties
-        loader = Loader()
+        loader = Loader(self)
        for obj in context.selected_objects:
            element = tool.Ifc.get_entity(obj)
            if not element or not getattr(element, "BoundedBy", None):
@@ -540,6 +566,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        related_building_element = None
        relating_space_obj = None
        related_building_element_obj = None
+        parent_boundaries = []

        objs = context.selected_objects
        if len(objs) == 2:
@@ -554,8 +581,14 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                else:
                    related_building_element = element
                    related_building_element_obj = obj
+            parent_boundary = self.create_element_boundary(
+                context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
+            )
+            if parent_boundary:
+                parent_boundaries.append(parent_boundary)
        elif len(objs) == 1:
            # Optionally the user may select just the space, and the building element shall be auto-detected
+            # TODO : refactor to be able to generate all boundaries for selected space automatically or with an option

            def msg(self, context):
                self.layout.label(text="NO ACTIVE STOREY")
@@ -565,8 +598,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                relating_space = element
                relating_space_obj = objs[0]

-            target = bpy.context.scene.cursor.location
-
            collection = context.view_layer.active_layer_collection.collection
            collection_obj = bpy.data.objects.get(collection.name)
            if not collection_obj:
@@ -578,19 +609,37 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                return

            for subelement in ifcopenshell.util.element.get_decomposition(spatial_element):
-                if not (subelement.is_a("IfcWall") or subelement.is_a("IfcSlab")):
+                if not (
+                    subelement.is_a("IfcWall") or subelement.is_a("IfcSlab") or subelement.is_a("IfcVirtualElement")
+                ):
                    continue
                obj = tool.Ifc.get_object(subelement)
                if obj:
-                    raycast = obj.closest_point_on_mesh(obj.matrix_world.inverted() @ target, distance=0.1)
-                    if raycast[0]:
-                        related_building_element = subelement
-                        related_building_element_obj = obj
-                        break
+                    related_building_element = subelement
+                    related_building_element_obj = obj
+                    parent_boundary = self.create_element_boundary(
+                        context,
+                        relating_space,
+                        relating_space_obj,
+                        related_building_element,
+                        related_building_element_obj,
+                    )
+                    if parent_boundary:
+                        parent_boundaries.append(parent_boundary)

+        bpy.ops.bim.show_boundaries()
+        for parent_boundary in parent_boundaries:
+            obj = tool.Ifc.get_object(parent_boundary)
+            obj.select_set(True)
+
+    def create_element_boundary(
+        self, context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
+    ):
        if not relating_space or not related_building_element:
            return

+        # Find which face on space should be bounded to related building element
+        # TODO: Handle round wall where multiple faces need to be bound to the same related building element
        bm = bmesh.new()
        bm.from_mesh(relating_space_obj.data)
        bmesh.ops.dissolve_limit(bm, angle_limit=pi * 2 / 360, verts=bm.verts, edges=bm.edges)
@@ -611,8 +660,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        if not target_face:
            return

-        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
-
        # Is this right? Or should I use loop?
        target_face_verts = [v.co.copy() for v in target_face.verts]
        target_face_matrix = self.get_face_matrix(*[v.copy() for v in target_face_verts[0:3]])
@@ -632,6 +679,18 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                    gross_boundary_polygon = geom
                    break

+        if (
+            not (isinstance(gross_boundary_polygon, shapely.Polygon) and gross_boundary_polygon.is_valid)
+            or gross_boundary_polygon.is_empty
+        ):
+            return
+
+        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
+        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
+        # Set to EXTERNAL by default and turn later to internal if there is a corresponding boundary relating to an
+        # internal space
+        parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
+
        # The gross boundary polygon may not be a true gross boundary since it
        # may have openings already removed, such as in IFC4 Reference View. So
        # we cheat by using the exterior boundary to mean "gross". Later, we
@@ -639,19 +698,25 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        # space.
        exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)

-        net_boundary_polygon = shapely.Polygon(gross_boundary_polygon)
-
        inner_boundaries = []

        for rel in getattr(related_building_element, "HasOpenings", []):
            opening = rel.RelatedOpeningElement
-            filling = None
-            if opening.HasFillings:
-                filling = opening.HasFillings[0].RelatedBuildingElement
+            if not opening.HasFillings:
+                continue
+            # TODO: HasFilling is a zero to many relationship. How to handle many ?
+            filling = opening.HasFillings[0].RelatedBuildingElement

            opening_polygon = self.get_flattened_polygon(opening, relating_space_obj, target_face_matrix_i)

-            net_boundary_polygon = net_boundary_polygon.difference(opening_polygon)
+            # An inner boundary is supposed to overlap its parent boundary according to IFC4 documentation
+            # so we extend our exterior boundary with all opening which has a filling
+            # Also see Implementation aggreement SB 1.1 for IFC 2x3 TC1 Space Boundary Addon View
+            # https://standards.buildingsmart.org/MVD/RELEASE/IFC2x3/TC1/SB1_1/IFC%20Space%20Boundary%20Implementation%20Agreement%20Addendum%202010-03-22.pdf
+            unionised_object = exterior_boundary_polygon.union(opening_polygon)
+            if isinstance(unionised_object, shapely.Polygon):
+                exterior_boundary_polygon = unionised_object
+
            # Only openings that are projected onto our exterior boundary are relevant.
            if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
                continue
@@ -659,24 +724,25 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
            connection_geometry = self.create_connection_geometry_from_polygon(opening_polygon, target_face_matrix)
            boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
            boundary.RelatingSpace = relating_space
-            boundary.RelatedBuildingElement = filling or related_building_element
+            boundary.RelatedBuildingElement = filling
            boundary.ConnectionGeometry = connection_geometry
-            boundary.PhysicalOrVirtualBoundary = "PHYSICAL" if filling else "VIRTUAL"
-            boundary.InternalOrExternalBoundary = "INTERNAL"
-
+            if related_building_element.is_a("IfcVirtualElement"):
+                boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
+            else:
+                boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
+            boundary.InternalOrExternalBoundary = parent_boundary.InternalOrExternalBoundary
+            self.set_boundary_name(boundary)
            if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
                boundary.ParentBoundary = parent_boundary

-        connection_geometry = self.create_connection_geometry_from_polygon(net_boundary_polygon, target_face_matrix)
+        connection_geometry = self.create_connection_geometry_from_polygon(
+            exterior_boundary_polygon, target_face_matrix
+        )
        parent_boundary.RelatingSpace = relating_space
        parent_boundary.RelatedBuildingElement = related_building_element
        parent_boundary.ConnectionGeometry = connection_geometry
-        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-        parent_boundary.InternalOrExternalBoundary = "INTERNAL"
-
-        bpy.ops.bim.show_boundaries()
-        obj = tool.Ifc.get_object(parent_boundary)
-        obj.select_set(True)
+        self.set_boundary_name(parent_boundary)
+        return parent_boundary

    def get_face_matrix(self, p1, p2, p3):
        edge1 = p2 - p1
@@ -691,7 +757,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        mat.col[0][:3] = x_axis
        mat.col[1][:3] = y_axis
        mat.col[2][:3] = z_axis
-        mat.col[3][:3] = p1
+        mat.translation = p1

        return mat

@@ -725,17 +791,19 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
    def export_surface(self, polygon, target_face_matrix):
        x_axis = target_face_matrix.col[0][:3]
        z_axis = target_face_matrix.col[2][:3]
-        p1 = target_face_matrix.col[3][:3]
+        p1 = target_face_matrix.translation

        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
        tool.Model.unit_scale = self.unit_scale

        surface = tool.Ifc.get().createIfcCurveBoundedPlane()
-        surface.BasisSurface = tool.Ifc.get().createIfcPlane(tool.Ifc.get().createIfcAxis2Placement3D(
-            tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
-            tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
-            tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
-        ))
+        surface.BasisSurface = tool.Ifc.get().createIfcPlane(
+            tool.Ifc.get().createIfcAxis2Placement3D(
+                tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
+                tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
+                tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
+            )
+        )

        if tool.Ifc.get().schema != "IFC2X3":
            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
@@ -748,9 +816,24 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
                inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
        else:
-            pass # TODO
+            pass  # TODO

        surface.OuterBoundary = outer_boundary
        surface.InnerBoundaries = inner_boundaries

        return surface
+
+    def set_boundary_name(self, boundary):
+        """
+        By convention 1stLevel and 2ndLevel boundary have specific name and description
+        See https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRelSpaceBoundary.htm
+        Warning: IfcRelSpaceBoundary2ndLevel is a subclass of IfcRelSpaceBoundary1stLevel test order matter
+        """
+        if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
+            boundary.Name = "2ndLevel"
+            if boundary.CorrespondingBoundary:
+                boundary.Description = "2a"
+            else:
+                boundary.Description = "2b"
+        elif boundary.is_a("IfcRelSpaceBoundary1stLevel"):
+            boundary.Name = "1stLevel"
@@ -25,13 +25,13 @@ from blenderbim.bim.module.boundary.data import SpaceBoundariesData


 class BIM_PT_SceneBoundaries(Panel):
-    bl_label = "IFC Space Boundaries"
+    bl_label = "Space Boundaries"
    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"
+    bl_parent_id = "BIM_PT_tab_geometry"

    @classmethod
    def poll(cls, context):
@@ -45,12 +45,12 @@ class BIM_PT_SceneBoundaries(Panel):


 class BIM_PT_Boundary(Panel):
-    bl_label = "IFC Space Boundary"
+    bl_label = "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"
+    bl_parent_id = "BIM_PT_tab_geometric_relationships"

    @classmethod
    def poll(cls, context):
@@ -117,14 +117,14 @@ class BIM_PT_Boundary(Panel):


 class BIM_PT_SpaceBoundaries(Panel):
-    bl_label = "IFC Space Boundaries"
+    bl_label = "Space Boundaries"
    bl_idname = "BIM_PT_SpaceBoundaries"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
    bl_order = 1
-    bl_parent_id = "BIM_PT_geometry_object"
+    bl_parent_id = "BIM_PT_tab_geometric_relationships"

    @classmethod
    def poll(cls, context):
@@ -21,7 +21,7 @@ from . import ui, prop, operator

 classes = (
    operator.AddBrick,
-    operator.AddBrickFeed,
+    operator.AddBrickRelation,
    operator.AssignBrickReference,
    operator.CloseBrickProject,
    operator.ConvertBrickProject,
@@ -33,15 +33,18 @@ classes = (
    operator.RewindBrickClass,
    operator.ViewBrickClass,
    operator.ViewBrickItem,
-    operator.UndoBrick,
-    operator.RedoBrick,
    operator.SerializeBrick,
    operator.AddBrickNamespace,
+    operator.RemoveBrickRelation,
    prop.Brick,
    prop.BIMBrickProperties,
    ui.BIM_PT_brickschema,
-    ui.BIM_PT_ifc_brickschema_references,
+    ui.BIM_PT_brickschema_project_info,
+    ui.BIM_PT_brickschema_namespaces,
+    ui.BIM_PT_brickschema_create_entity,
+    ui.BIM_PT_brickschema_viewport,
    ui.BIM_UL_bricks,
+    ui.BIM_PT_ifc_brickschema_references,
 )


@@ -41,17 +41,15 @@ class BrickschemaData:
        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(),
+            "active_relations": cls.active_relations(),
        }

    @classmethod
    def get_is_loaded(cls):
-        return BrickStore.graph is not None
+        return BrickStore.graph is not None  # `if BrickStore.graph` by itself takes ages.

    @classmethod
-    def attributes(cls):
+    def active_relations(cls):
        if BrickStore.graph is None:
            return []
        props = bpy.context.scene.BIMBrickProperties
@@ -59,80 +57,75 @@ class BrickschemaData:
            brick = props.bricks[props.active_brick_index]
        except:
            return []
-        results = []
        uri = brick.uri
+        namespace = str(uri.split("#")[0])
+        if namespace == "https://brickschema.org/schema/Brick":
+            return []
+        results = []
        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 }
+            SELECT DISTINCT ?predicate ?object ?label ?sp ?sv  WHERE {
+                <{uri}> ?predicate ?object .
+                OPTIONAL {
+                    ?object rdfs:label ?label . 
+                }
+                OPTIONAL {
+                    { ?predicate rdfs:range brick:TimeseriesReference . }
+                    UNION
+                    { ?predicate a brick:EntityProperty . }
+                    ?object ?sp ?sv .
+                }
            }
+            GROUP BY ?object
        """.replace(
                "{uri}", uri
            )
        )
-
        for row in query:
-            name = row.get("name").toPython().split("#")[-1]
-            value = row.get("value")
+            predicate_uri = row.get("predicate")
+            predicate_name = predicate_uri.toPython().split("#")[-1]
+            object_uri = row.get("object")
+            object_name = row.get("label")
+            if not object_name:
+                if isinstance(object_uri, BNode):
+                    object_name = "[]"
+                else:
+                    try:
+                        object_name = object_uri.toPython().split("#")[-1]
+                    except:
+                        object_name = str(object_uri)
            results.append(
                {
-                    "name": name,
-                    "value": value.toPython().split("#")[-1],
-                    "is_uri": isinstance(value, URIRef),
-                    "value_uri": value.toPython(),
-                    "is_globalid": name == "globalID",
+                    "predicate_uri": predicate_uri,
+                    "predicate_name": predicate_name,
+                    "object_uri": object_uri,
+                    "object_name": object_name,
+                    "is_uri": isinstance(object_uri, URIRef),
+                    "is_globalid": predicate_name == "ifcGlobalID",
                }
            )
-            if isinstance(row.get("value"), BNode):
-                for s, p, o in BrickStore.graph.triples((value, None, None)):
+            if isinstance(object_uri, BNode):
+                for subject2, predicate2, object2 in BrickStore.graph.triples((object_uri, None, None)):
+                    predicate2_name = predicate2.toPython().split("#")[-1]
+                    try:
+                        object2_name = object2.toPython().split("#")[-1]
+                    except:
+                        object2_name = str(object2)
                    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",
+                            "predicate_uri": None,
+                            "predicate_name": predicate_name + ":" + predicate2_name,
+                            "object_uri": object2,
+                            "object_name": object2_name,
+                            "is_uri": isinstance(object2, URIRef),
+                            "is_globalid": predicate2_name == "ifcGlobalID",
                        }
                    )
        return results

-    @classmethod
-    def namespaces(cls):
-        if BrickStore.graph is None:
-            return []
-        results = []
-        filter = ["brick", "owl", "w3", "xml"]
-        for alias, uri in BrickStore.graph.namespaces():
-            if alias not in filter:
-                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 = {}
@@ -156,7 +149,7 @@ class BrickschemaReferencesData:
        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:
+            elif library.Location and ".ttl" in library.Location:
                results.append((str(library.id()), library.Name or "Unnamed", ""))
        return results

@@ -16,6 +16,7 @@
 # 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 ifcopenshell.api
 import blenderbim.tool as tool
@@ -24,9 +25,10 @@ import blenderbim.bim.handler
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.tool.brick import BrickStore

+
 class Operator:
    def execute(self, context):
-        self._execute(context)
+        IfcStore.execute_ifc_operator(self, context)
        blenderbim.bim.handler.refresh_ui_data()
        return {"FINISHED"}

@@ -35,11 +37,16 @@ class LoadBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.load_brick_project"
    bl_label = "Load Brickschema Project"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Load in a Brick project from a file"
    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)
+        if os.path.exists(self.filepath) and "ttl" in os.path.splitext(self.filepath)[1].lower():
+            root = context.scene.BIMBrickProperties.brick_list_root
+            core.load_brick_project(tool.Brick, filepath=self.filepath, brick_root=root)
+        else:
+            self.report({'ERROR'}, f'Failed to load {self.filepath}')

    def invoke(self, context, event):
        context.window_manager.fileselect_add(self)
@@ -50,35 +57,45 @@ class ViewBrickClass(bpy.types.Operator, Operator):
    bl_idname = "bim.view_brick_class"
    bl_label = "View Brick Class"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Inspect the subclasses of this class"
    brick_class: bpy.props.StringProperty(name="Brick Class")
+    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        core.view_brick_class(tool.Brick, brick_class=self.brick_class)
+        core.view_brick_class(tool.Brick, brick_class=self.brick_class, split_screen=self.split_screen)


 class ViewBrickItem(bpy.types.Operator, Operator):
    bl_idname = "bim.view_brick_item"
    bl_label = "View Brick Item"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Inspect this entity in the viewer"
    item: bpy.props.StringProperty(name="Brick Item")
+    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        core.view_brick_item(tool.Brick, item=self.item)
+        try:
+            core.view_brick_item(tool.Brick, item=self.item, split_screen=self.split_screen)
+        except:
+            self.report({'ERROR'}, f'Could not find {self.item}')


 class RewindBrickClass(bpy.types.Operator, Operator):
    bl_idname = "bim.rewind_brick_class"
    bl_label = "Rewind Brick Class"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Go back to the previous list view"
+    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        core.rewind_brick_class(tool.Brick)
+        core.rewind_brick_class(tool.Brick, split_screen=self.split_screen)


 class CloseBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.close_brick_project"
    bl_label = "Close Brick Project"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Close the Brick project"

    def _execute(self, context):
        core.close_brick_project(tool.Brick)
@@ -88,6 +105,7 @@ class ConvertBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.convert_brick_project"
    bl_label = "Convert Brick Project"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Create an Ifc library for this Brick project"

    def _execute(self, context):
        core.convert_brick_project(tool.Ifc, tool.Brick)
@@ -97,9 +115,18 @@ class AssignBrickReference(bpy.types.Operator, Operator):
    bl_idname = "bim.assign_brick_reference"
    bl_label = "Assign Brick Reference"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Assign the selected Ifc entity to the selected Brick entity"

    def _execute(self, context):
+        if not context.active_object:
+            self.report({'ERROR'}, f'No Ifc selected')
+            return
        props = context.scene.BIMBrickProperties
+        try:
+            props.bricks[props.active_brick_index]
+        except:
+            self.report({'ERROR'}, f'No Brick selected')
+            return
        core.assign_brick_reference(
            tool.Ifc,
            tool.Brick,
@@ -113,36 +140,41 @@ class AddBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.add_brick"
    bl_label = "Add Brick"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Create the Brick entity"

    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,
-            label=props.new_brick_label
+            brick_class=props.brick_entity_class,
+            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
+            label=props.new_brick_label,
        )


-class AddBrickFeed(bpy.types.Operator, Operator):
-    bl_idname = "bim.add_brick_feed"
-    bl_label = "Add Brick Feed"
+class AddBrickRelation(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick_relation"
+    bl_label = "Add Brick Relation"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Create the Brick relationship"

    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,
+        props = context.scene.BIMBrickProperties
+        brick = props.bricks[props.active_brick_index]
+        if props.new_brick_relation_type == "http://www.w3.org/2000/01/rdf-schema#label":
+            object = props.new_brick_relation_object
+        elif props.split_screen_toggled:
+            object = props.split_screen_bricks[props.split_screen_active_brick_index].uri
+        else:
+            object = props.namespace + props.new_brick_relation_object
+        core.add_brick_relation(
            tool.Brick,
-            source=source,
-            destination=destination,
+            brick_uri=brick.uri,
+            predicate=props.new_brick_relation_type,
+            object=object
        )


@@ -150,6 +182,7 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.convert_ifc_to_brick"
    bl_label = "Convert IFC To Brick"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Convert Ifc entities and relations to Brick entities and relations"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
@@ -159,19 +192,44 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
        core.convert_ifc_to_brick(tool.Brick, namespace=props.namespace, library=library)


-class NewBrickFile(bpy.types.Operator, Operator):
+class NewBrickFile(bpy.types.Operator):
    bl_idname = "bim.new_brick_file"
    bl_label = "New Brick File"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Create a Brick project from scratch"
+
+    def execute(self, context):
+        IfcStore.begin_transaction(self)
+        IfcStore.add_transaction_operation(self, rollback=self.rollback, commit=lambda data: True)
+        self._execute(context)
+        self.transaction_data = {
+            "schema": BrickStore.schema,
+            "path": BrickStore.path,
+            "graph": BrickStore.graph,
+        }
+        IfcStore.add_transaction_operation(self, rollback=lambda data: True, commit=self.commit)
+        IfcStore.end_transaction(self)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}

    def _execute(self, context):
-        core.new_brick_file(tool.Brick)
+        root = context.scene.BIMBrickProperties.brick_list_root
+        core.new_brick_file(tool.Brick, brick_root=root)
+
+    def rollback(self, data):
+        BrickStore.purge()
+
+    def commit(self, data):
+        BrickStore.schema = data["schema"]
+        BrickStore.path = data["path"]
+        BrickStore.graph = data["graph"]


 class RefreshBrickViewer(bpy.types.Operator, Operator):
    bl_idname = "bim.refresh_brick_viewer"
    bl_label = "Refresh Brick Viewer"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Refresh the list view"

    def _execute(self, context):
        core.refresh_brick_viewer(tool.Brick)
@@ -181,6 +239,7 @@ class RemoveBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.remove_brick"
    bl_label = "Remove Brick"
    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Delete this entity"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
@@ -191,21 +250,8 @@ class RemoveBrick(bpy.types.Operator, Operator):
            brick_uri=props.bricks[props.active_brick_index].uri,
        )

-class UndoBrick(bpy.types.Operator, Operator):
-    bl_idname = "bim.undo_brick"
-    bl_label = "Undo Brick"

-    def _execute(self, context):
-        core.undo_brick(tool.Brick)
-
-class RedoBrick(bpy.types.Operator, Operator):
-    bl_idname = "bim.redo_brick"
-    bl_label = "Redo Brick"
-
-    def _execute(self, context):
-        core.redo_brick(tool.Brick)
-
-class SerializeBrick(bpy.types.Operator, Operator):
+class SerializeBrick(bpy.types.Operator):
    bl_idname = "bim.serialize_brick"
    bl_label = "Serialize Brick"
    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
@@ -220,24 +266,40 @@ class SerializeBrick(bpy.types.Operator, Operator):
        else:
            return self.execute(context)

-    def _execute(self, context):
+    def execute(self, context):
        if self.should_save_as or not BrickStore.path:
            BrickStore.path = self.filepath
        core.serialize_brick(tool.Brick)
        return {"FINISHED"}
-    
+
    @classmethod
    def description(cls, context, properties):
        if properties.should_save_as:
            return "Save Brick project to a selected file"
        return "Save the Brick project"
-    
+
+
 class AddBrickNamespace(bpy.types.Operator, Operator):
    bl_idname = "bim.add_brick_namespace"
    bl_label = "Add Brick Namespace"
+    bl_description = "Bind a new namespace to the Brick project"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
        alias = props.new_brick_namespace_alias
        uri = props.new_brick_namespace_uri
-        core.add_namespace(tool.Brick, alias=alias, uri=uri)
+        core.add_brick_namespace(tool.Brick, alias=alias, uri=uri)
+
+
+class RemoveBrickRelation(bpy.types.Operator, Operator):
+    bl_idname = "bim.remove_brick_relation"
+    bl_label = "Remove Relation"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Delete this relationship"
+    predicate: bpy.props.StringProperty(name="Relation")
+    object: bpy.props.StringProperty(name="Object")
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        brick = props.bricks[props.active_brick_index]
+        core.remove_brick_relation(tool.Brick, brick_uri=brick.uri, predicate=self.predicate, object=self.object)
@@ -30,7 +30,9 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
-
+import blenderbim.core.brick as core
+import blenderbim.tool.brick as tool
+from blenderbim.tool.brick import BrickStore

 def update_active_brick_index(self, context):
    BrickschemaData.is_loaded = False
@@ -43,15 +45,35 @@ def get_libraries(self, context):


 def get_namespaces(self, context):
-    if not BrickschemaData.is_loaded:
-        BrickschemaData.load()
-    return BrickschemaData.data["namespaces"]
+    return [(uri, f"{alias}: {uri}", "") for alias, uri in BrickStore.namespaces]


-def get_brick_equipment_classes(self, context):
-    if not BrickschemaData.is_loaded:
-        BrickschemaData.load()
-    return BrickschemaData.data["brick_equipment_classes"]
+def get_brick_entity_classes(self, context):
+    entity = self.brick_entity_create_type
+    return [(uri, uri.split("#")[-1], "") for uri in BrickStore.entity_classes[entity]]
+
+
+def get_brick_roots(self, context): 
+    return [(root, root, "") for root in BrickStore.root_classes]
+
+
+def get_brick_relations(self, context):
+    relations = [(uri, uri.split("#")[-1], "") for uri in BrickStore.relationships]
+    for relation in BrickschemaData.data["active_relations"]:
+        if relation["predicate_name"] == "label":
+            return relations
+    relations.append(("http://www.w3.org/2000/01/rdf-schema#label", "label", ""))
+    return relations
+    
+
+
+def update_view(self, context):
+    root = context.scene.BIMBrickProperties.brick_list_root
+    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=False)
+
+def split_screen_update_view(self, context):
+    root = context.scene.BIMBrickProperties.split_screen_brick_list_root
+    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=True)


 class Brick(PropertyGroup):
@@ -67,9 +89,26 @@ class BIMBrickProperties(PropertyGroup):
    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)
+    set_list_root_toggled: BoolProperty(name="Set List Root Toggled", default=False)
+    brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots, update=update_view)
+    # namespace manager
    namespace: EnumProperty(name="Namespace", items=get_namespaces)
-    brick_equipment_class: EnumProperty(name="Brick Equipment Class", items=get_brick_equipment_classes)
-    brick_settings_toggled: BoolProperty(name="Brick Settings Toggled", default=False)
-    new_brick_label: StringProperty(name="New Brick Label")
    new_brick_namespace_alias: StringProperty(name="New Brick Namespace Alias")
-    new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI")
+    new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI")
+    # create brick entity
+    new_brick_label: StringProperty(name="New Brick Label")
+    brick_entity_create_type: EnumProperty(name="Brick Entity Types", items=get_brick_roots)
+    brick_entity_class: EnumProperty(name="Brick Equipment Class", items=get_brick_entity_classes)
+    # create relations
+    brick_create_relations_toggled: BoolProperty(name="Brick Create Relations Toggled", default=False)
+    brick_edit_relations_toggled: BoolProperty(name="Brick Edit Relations Toggled", default=False)
+    new_brick_relation_type: EnumProperty(name="New Brick Relation Type", items=get_brick_relations)
+    new_brick_relation_object: StringProperty(name="New Brick Relation Object")
+    add_brick_relation_failed: BoolProperty(name="Add Relation Failed", default=False)
+    # create relations split screen
+    split_screen_toggled: BoolProperty(name="Split Screen Toggled", default=False)
+    split_screen_bricks: CollectionProperty(name="Split Screen Bricks", type=Brick)
+    split_screen_active_brick_index: IntProperty(name="Split Screen Active Brick Index", update=update_active_brick_index)
+    split_screen_active_brick_class: StringProperty(name="Split Screen Active Brick Class")
+    split_screen_brick_breadcrumbs: CollectionProperty(name="Split Screen Brick Breadcrumbs", type=StrProperty)
+    split_screen_brick_list_root: EnumProperty(name="Split Screen Brick List Root", items=get_brick_roots, update=split_screen_update_view)
@@ -22,97 +22,249 @@ from blenderbim.bim.helper import prop_with_search
 from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
 from blenderbim.tool.brick import BrickStore

+
 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"
-
-    @classmethod
-    def poll(cls, context):
-        aprops = context.screen.BIMAreaProperties[context.screen.areas[:].index(context.area)]
-        return aprops.tab == "OTHER"
+    bl_parent_id = "BIM_PT_tab_operations"

    def draw(self, context):
        if not BrickschemaData.is_loaded:
            BrickschemaData.load()
-        self.props = context.scene.BIMBrickProperties

+
+class BIM_PT_brickschema_project_info(Panel):
+    bl_label = "Project Info"
+    bl_idname = "BIM_PT_brickschema_project_info"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_brickschema"
+
+    def draw(self, context):
+        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 BrickStore.path:
-            row = self.layout.row(align=True)
-            row.label(text=BrickStore.path, icon='FILEBROWSER')
-
+            row.label(text=BrickStore.path, icon="FILEBROWSER")
+        else:
+            row.label(text="No file", icon="FILEBROWSER")
+        
        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.prop(data=self.props, property="brick_settings_toggled", text="", icon="PREFERENCES")
-        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
-        row.operator("bim.close_brick_project", text="", icon="CANCEL")
-
-        if self.props.brick_settings_toggled:
-            box = self.layout.box()
-            row = box.row(align=True)
-            row.label(text="Active Namespace:")
-            row = box.row(align=True)
-            prop_with_search(row, self.props, "namespace", text="")
-            row = box.row(align=True)
-            row.label(text="Bind New Namespace:")
-            row = box.row(align=True)
-            row.prop(data=self.props, property="new_brick_namespace_alias", text="")
-            col = row.column()
-            col.alignment = "CENTER"
-            col.scale_x = 1.1 
-            col.label(text=":")
-            row.prop(data=self.props, property="new_brick_namespace_uri", text="")
-            row.operator("bim.add_brick_namespace", text="", icon="ADD")
-
-        row = self.layout.row(align=True)
-        row.label(text="Create Entity:")
-        row = self.layout.row(align=True)
-        row.prop(data=self.props, property="new_brick_label", text="")
-        prop_with_search(row, 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")
-
-        row = self.layout.row(align=True)
-        row.operator("bim.undo_brick", icon="LOOP_BACK")
-        row.operator("bim.redo_brick", icon="LOOP_FORWARDS")
+        if BrickStore.last_saved:
+            row.label(text=BrickStore.last_saved, icon="TIME")
+        else:
+            row.label(text="Not saved", icon="TIME")

        row = self.layout.row(align=True)
        op = row.operator("bim.serialize_brick", icon="EXPORT", text="Save")
        op.should_save_as = False
        op = row.operator("bim.serialize_brick", icon="FILE_TICK", text="Save As")
        op.should_save_as = True
+        row.operator("bim.close_brick_project", text="", icon="CANCEL")

-        self.layout.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")

-        for attribute in BrickschemaData.data["attributes"]:
+class BIM_PT_brickschema_namespaces(Panel):
+    bl_label = "Namespaces"
+    bl_idname = "BIM_PT_brickschema_namespaces"
+    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 BrickStore.graph != None
+
+    def draw(self, context):
+        self.props = context.scene.BIMBrickProperties
+
+        row = self.layout.row(align=True)
+        row.label(text="Active Namespace:")
+
+        row = self.layout.row(align=True)
+        prop_with_search(row, self.props, "namespace", text="")
+
+        row = self.layout.row(align=True)
+        row.label(text="Bind New Namespace:")
+
+        row = self.layout.row(align=True)
+        row.prop(data=self.props, property="new_brick_namespace_alias", text="")
+        col = row.column()
+        col.alignment = "CENTER"
+        col.scale_x = 1.1
+        col.label(text=":")
+        row.prop(data=self.props, property="new_brick_namespace_uri", text="")
+        row.operator("bim.add_brick_namespace", text="", icon="ADD")
+
+
+class BIM_PT_brickschema_create_entity(Panel):
+    bl_label = "Create Entity"
+    bl_idname = "BIM_PT_brickschema_create_entity"
+    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 BrickStore.graph != None
+
+    def draw(self, context):
+        self.props = context.scene.BIMBrickProperties
+        # TO DO: hide this if selected entity already has a reference, or something similar
+
+        row = self.layout.row(align=True)
+        row.prop(data=self.props, property="brick_entity_create_type", text="Class")
+
+        row = self.layout.row(align=True)
+        prop_with_search(row, self.props, "brick_entity_class", text="Type")
+        
+        row = self.layout.row(align=True)
+        active = tool.Ifc.get_entity(context.active_object)
+        if active and context.selected_objects:
+            row.label(text="Label:")
+            row.label(text=active.Name if active.Name else "Unnamed")
+        else:
+            row.prop(data=self.props, property="new_brick_label", text="Label")
+
+        row = self.layout.row(align=True)
+        row.operator("bim.add_brick", text="Create Entity")
+     
+
+class BIM_PT_brickschema_viewport(Panel):
+    bl_label = "Viewport"
+    bl_idname = "BIM_PT_brickschema_viewport"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_brickschema"
+
+    @classmethod
+    def poll(cls, context):
+        return BrickStore.graph != None
+
+    def draw(self, context):
+        self.props = context.scene.BIMBrickProperties
+
+        row = self.layout.row(align=True)
+        row.column().alignment = "RIGHT"
+        row.prop(data=self.props, property="set_list_root_toggled", text="", icon="OUTLINER")
+        row.prop(data=self.props, property="split_screen_toggled", text="", icon="WINDOW")
+        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
+
+        grid = self.layout.grid_flow(even_columns=True)
+        grid_left = grid.column(align=True)
+        row = grid_left.row(align=True)
+        if len(self.props.brick_breadcrumbs):
+            op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
+            op.split_screen = False
+        row.label(text=self.props.active_brick_class)
+
+        if self.props.set_list_root_toggled:
+            row = grid_left.row(align=True)
+            row.prop(data=self.props, property="brick_list_root", text="")
+
+        row = grid_left.row()
+        BIM_UL_bricks.split_screen = False
+        row.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
+
+        if self.props.split_screen_toggled:
+            grid_right = grid.column(align=True)
+            row = grid_right.row(align=True)
+            if len(self.props.split_screen_brick_breadcrumbs):
+                op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
+                op.split_screen = True
+            row.label(text=self.props.split_screen_active_brick_class)
+
+            if self.props.set_list_root_toggled:
+                row = grid_right.row(align=True)
+                row.prop(data=self.props, property="split_screen_brick_list_root", text="")
+
+            row = grid_right.row()
+            BIM_UL_bricks.split_screen = True
+            row.template_list("BIM_UL_bricks", "", self.props, "split_screen_bricks", self.props, "split_screen_active_brick_index")
+
+        if BrickschemaData.data["active_relations"]:
            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"]
+            row.column().alignment = "RIGHT"
+            row.prop(data=self.props, property="brick_create_relations_toggled", text="", icon="PLUGIN")
+            row.prop(data=self.props, property="brick_edit_relations_toggled", text="", icon="TOOL_SETTINGS")
+            row.operator("bim.remove_brick", text="", icon="X")

+            if self.props.brick_create_relations_toggled and self.props.split_screen_toggled:
+                row = self.layout.row(align=True)
+                try:
+                    split_screen_selection = self.props.split_screen_bricks[self.props.split_screen_active_brick_index]
+                except:
+                    split_screen_selection = None
+                if not split_screen_selection or split_screen_selection.total_items:
+                    row.label(text="No selection", icon="INFO")
+                else:
+                    prop_with_search(row, self.props, "new_brick_relation_type", text="")
+                    row.label(text=split_screen_selection.label if split_screen_selection.label else split_screen_selection.name)
+                    row.operator("bim.add_brick_relation", text="", icon="ADD")
+
+            elif self.props.brick_create_relations_toggled:
+                row = self.layout.row(align=True)
+                prop_with_search(row, self.props, "new_brick_relation_type", text="")
+                row.prop(data=self.props, property="new_brick_relation_object", text="")
+                row.operator("bim.add_brick_relation", text="", icon="ADD")
+
+            if self.props.brick_create_relations_toggled and self.props.add_brick_relation_failed:
+                row = self.layout.row(align=True)
+                row.label(text="Failed to find this entity!", icon="ERROR")
+
+        for relation in BrickschemaData.data["active_relations"]:
+            split = self.layout.split(factor=0.85, align=True)
+            row = split.row(align=True)
+            row.label(text=relation["predicate_name"])
+            row.separator()
+            row.label(text=relation["object_name"])
+            row = split.row(align=True)
+            row.column().alignment = "RIGHT"
+            if self.props.brick_edit_relations_toggled and relation["predicate_uri"] and relation["predicate_name"] != "type":
+                op = row.operator("bim.remove_brick_relation", text="", icon="UNLINKED")
+                op.predicate = relation["predicate_uri"]
+                op.object = relation["object_uri"]
+            if relation["is_uri"] and relation["object_uri"].toPython().split("#")[-1] != self.props.active_brick_class:
+                op = row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT")
+                op.item = relation["object_uri"]
+            if relation["is_globalid"]:
+                op = row.operator("bim.select_global_id", icon="RESTRICT_SELECT_OFF", text="")
+                op.global_id = relation["object_name"]
+
+
+class BIM_UL_bricks(UIList):
+    split_screen = False
+
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            split = layout.split(factor=0.85, align=True)
+            row = split.row()
+            label = item.label if item.label else item.name
+            if item.total_items:
+                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
+                op.brick_class = item.name
+                op.split_screen = self.split_screen
+            row.label(text=label)
+            if item.total_items:
+                row = split.row()
+                row.label(text=str(item.total_items))

 class BIM_PT_ifc_brickschema_references(Panel):
-    bl_label = "IFC Brickschema References"
+    bl_label = "Brickschema References"
    bl_idname = "BIM_PT_ifc_brickschema_references"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -134,15 +286,24 @@ class BIM_PT_ifc_brickschema_references(Panel):
            row.label(text="No Brickschema Project Loaded")
            return

-        if not BrickschemaReferencesData.data["libraries"]:
+        if not BrickschemaReferencesData.data["libraries"] and BrickStore.path:
            row = self.layout.row(align=True)
            row.label(text="No IFC Libraries")
            row.operator("bim.convert_brick_project", text="", icon="ADD")
            return
+        
+        elif not BrickschemaReferencesData.data["libraries"]:
+            row = self.layout.row(align=True)
+            row.label(text="No IFC Libraries: save the Brick project to create a new library", icon="ERROR")
+
+            row = self.layout.row(align=True)
+            row.label(text="Libraries must have location pointing to a \".ttl\" file", icon="INFO")
+            return

        row = self.layout.row(align=True)
        prop_with_search(row, self.props, "libraries")
-        row.operator("bim.convert_brick_project", text="", icon="ADD")
+        if BrickStore.path:
+            row.operator("bim.convert_brick_project", text="", icon="ADD")

        row = self.layout.row(align=True)
        row.operator("bim.assign_brick_reference", icon="ADD")
@@ -157,16 +318,4 @@ class BIM_PT_ifc_brickschema_references(Panel):
            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))
+            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
@@ -0,0 +1,42 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 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.GetBSDDClassificationProperties,
+    operator.LoadBSDDDomains,
+    operator.SearchBSDDClass,
+    operator.SetActiveBSDDDictionary,
+    prop.BSDDDomain,
+    prop.BSDDClassification,
+    prop.BSDDPset,
+    prop.BIMBSDDProperties,
+    ui.BIM_UL_bsdd_domains,
+    ui.BIM_UL_bsdd_classifications,
+    ui.BIM_PT_bsdd,
+)
+
+
+def register():
+    bpy.types.Scene.BIMBSDDProperties = bpy.props.PointerProperty(type=prop.BIMBSDDProperties)
+
+
+def unregister():
+    del bpy.types.Scene.BIMBSDDProperties
@@ -0,0 +1,65 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 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 bsdd
+import blenderbim.tool as tool
+from blenderbim.core import bsdd as core
+
+
+class LoadBSDDDomains(bpy.types.Operator):
+    bl_idname = "bim.load_bsdd_domains"
+    bl_label = "Load bSDD Dictionaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.load_bsdd(bsdd.Client(), tool.Bsdd)
+        return {"FINISHED"}
+
+
+class SetActiveBSDDDictionary(bpy.types.Operator):
+    bl_idname = "bim.set_active_bsdd_domain"
+    bl_label = "Load bSDD Dictionary"
+    bl_options = {"REGISTER", "UNDO"}
+    name: bpy.props.StringProperty()
+    uri: bpy.props.StringProperty()
+
+    def execute(self, context):
+        core.set_active_bsdd_dictionary(self.name, self.uri, tool.Bsdd)
+        return {"FINISHED"}
+
+
+class SearchBSDDClass(bpy.types.Operator):
+    bl_idname = "bim.search_bsdd_classifications"
+    bl_label = "Search bSDD Class"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        keyword = context.scene.BIMBSDDProperties.keyword
+        core.search_class(keyword, bsdd.Client(), tool.Bsdd)
+        return {"FINISHED"}
+
+
+class GetBSDDClassificationProperties(bpy.types.Operator):
+    bl_idname = "bim.get_bsdd_classification_properties"
+    bl_label = "Search bSDD Classifications"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        core.get_class_properties(bsdd.Client(), tool.Bsdd)
+        return {"FINISHED"}
@@ -0,0 +1,67 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 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 blenderbim.bim.prop import Attribute, StrProperty
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+
+
+class BSDDDomain(PropertyGroup):
+    name: StringProperty(name="Name")
+    uri: StringProperty(name="URI")
+    default_language_code: StringProperty(name="Language")
+    organization_name_owner: StringProperty(name="Organization")
+    status: StringProperty(name="Status")
+    version: StringProperty(name="Version")
+
+
+class BSDDClassification(PropertyGroup):
+    name: StringProperty(name="Name")
+    reference_code: StringProperty(name="Reference Code")
+    description: StringProperty(name="Description")
+    uri: StringProperty(name="Namespace URI")
+    domain_name: StringProperty(name="Domain Name")
+    domain_namespace_uri: StringProperty(name="Domain Namespace URI")
+
+
+class BSDDPset(PropertyGroup):
+    name: StringProperty(name="Name")
+    properties: CollectionProperty(name="Properties", type=Attribute)
+
+
+class BIMBSDDProperties(PropertyGroup):
+    active_domain: StringProperty(name="Active Domain")
+    active_uri: StringProperty(name="Active URI")
+    domains: CollectionProperty(name="Domains", type=BSDDDomain)
+    active_domain_index: IntProperty(name="Active Domain Index")
+    classifications: CollectionProperty(name="Classifications", type=BSDDClassification)
+    active_classification_index: IntProperty(name="Active Classification Index")
+    keyword: StringProperty(name="Keyword")
+    should_filter_ifc_class: BoolProperty(name="Filter Active IFC Class", default=True)
+    load_preview_domains: BoolProperty(name="Load Preview Domains", default=False)
+    classification_psets: CollectionProperty(name="Classification Psets", type=BSDDPset)
@@ -0,0 +1,79 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 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.ifc import IfcStore
+
+
+class BIM_PT_bsdd(Panel):
+    bl_label = "buildingSMART Data Dictionary"
+    bl_idname = "BIM_PT_bsdd"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_tab_project_setup"
+
+    def draw(self, context):
+        props = context.scene.BIMBSDDProperties
+        row = self.layout.row(align=True)
+        row.prop(props, "load_preview_domains")
+        if len(props.domains):
+            row.operator("bim.load_bsdd_domains", text="", icon="FILE_REFRESH")
+
+        if props.active_domain:
+            row = self.layout.row()
+            row.label(text="Active: " + props.active_domain, icon="URL")
+        else:
+            row = self.layout.row()
+            row.label(text="No Active bSDD Domain", icon="ERROR")
+
+        if len(props.domains):
+            self.layout.template_list(
+                "BIM_UL_bsdd_domains",
+                "",
+                props,
+                "domains",
+                props,
+                "active_domain_index",
+            )
+        else:
+            row = self.layout.row()
+            row.operator("bim.load_bsdd_domains")
+
+
+class BIM_UL_bsdd_domains(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            if item.status != "Active":
+                row.label(text=f"{item.name} ({item.organization_name_owner}) - {item.status}", icon="ERROR")
+            else:
+                row.label(text=f"{item.name} ({item.organization_name_owner})")
+            op = row.operator("bim.set_active_bsdd_domain", text="", icon="RESTRICT_SELECT_OFF")
+            op.name = item.name
+            op.uri = item.uri
+
+
+class BIM_UL_bsdd_classifications(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            row.label(text=item.reference_code)
+            row.label(text=item.name)
@@ -24,6 +24,8 @@ import bpy_extras
 import blenderbim.tool as tool
 from mathutils import Vector, Matrix
 from math import pi, radians, sin, cos, sqrt
+import ifcopenshell.util.unit
+

 messages = {
    "SHARED_VERTEX": "Shared Vertex, no intersection possible",
@@ -140,6 +142,9 @@ class CadFillet(bpy.types.Operator):
            layout.prop(self, prop)

    def execute(self, context):
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        self.radius = self.radius * si_conversion
+        
        bpy.ops.object.mode_set(mode="OBJECT")
        bpy.ops.object.mode_set(mode="EDIT")

@@ -361,6 +366,10 @@ class CadOffset(bpy.types.Operator):
        # dialog that Mesh Tools has. Sverchok is 2D based, but has a weird side
        # effect of converting an unclosed loop into a closed loop which is also
        # not what users expect.
+
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        self.distance = self.distance * si_conversion
+        
        bpy.ops.object.mode_set(mode="OBJECT")
        bpy.ops.object.mode_set(mode="EDIT")

@@ -498,6 +507,8 @@ class CadOffset(bpy.types.Operator):
                    local_direction = (rotation_i @ direction).normalized()
                    normals.append(local_direction)

+
+
                if len(normals) == 2:
                    # https://stackoverflow.com/a/54042831/9627415
                    new_normal = (normals[0].lerp(normals[1], 0.5)).normalized()
@@ -531,7 +542,7 @@ class CadOffset(bpy.types.Operator):
 class AddIfcCircle(bpy.types.Operator):
    bl_idname = "bim.add_ifccircle"
    bl_label = "Add IfcCircle"
-    radius: bpy.props.FloatProperty(name="Radius", default=0.1)
+    radius: bpy.props.FloatProperty(name="Radius", default=0.5)

    @classmethod
    def poll(cls, context):
@@ -539,6 +550,9 @@ class AddIfcCircle(bpy.types.Operator):
        return bool(obj) and obj.type == "MESH"

    def execute(self, context):
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        self.radius = self.radius * si_conversion
+
        if self.has_selected_existing_circle(context):
            self.change_radius(context)
        else:
@@ -622,6 +636,9 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
            layout.prop(self, prop)

    def execute(self, context):
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        self.radius = self.radius * si_conversion
+        
        if self.has_selected_existing_arc(context):
            self.change_radius(context)
        else:
@@ -786,8 +803,8 @@ class AlignViewToProfile(bpy.types.Operator):
 class AddRectangle(bpy.types.Operator):
    bl_idname = "bim.add_rectangle"
    bl_label = "Add Rectangle"
-    x: bpy.props.FloatProperty(name="X", default=0.1)
-    y: bpy.props.FloatProperty(name="Y", default=0.1)
+    x: bpy.props.FloatProperty(name="X", default=1)
+    y: bpy.props.FloatProperty(name="Y", default=1)

    @classmethod
    def poll(cls, context):
@@ -795,6 +812,10 @@ class AddRectangle(bpy.types.Operator):
        return bool(obj) and obj.type == "MESH"

    def execute(self, context):
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        self.x = self.x * si_conversion
+        self.y = self.y * si_conversion        
+        
        obj = context.active_object
        bm = bmesh.from_edit_mesh(obj.data)
        cursor = obj.matrix_world.inverted() @ context.scene.cursor.location
@@ -137,7 +137,7 @@ class CadTool(WorkSpaceTool):
        else:
            if (
                (RailingData.is_loaded or not RailingData.load())
-                and RailingData.data["parameters"]
+                and RailingData.data["pset_data"]
                and context.active_object.BIMRailingProperties.is_editing_path
            ):
                row = layout.row(align=True)
@@ -147,7 +147,7 @@ class CadTool(WorkSpaceTool):

            elif (
                (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["parameters"]
+                and RoofData.data["pset_data"]
                and context.active_object.BIMRoofProperties.is_editing_path
            ):
                row = layout.row(align=True)
@@ -227,7 +227,7 @@ class CadHotkey(bpy.types.Operator):
                row.prop(props, "y")
            elif (
                (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["parameters"]
+                and RoofData.data["pset_data"]
                and bpy.context.active_object.BIMRoofProperties.is_editing_path
            ):
                self.layout.row().prop(props, "gable_roof_edge_angle")
@@ -273,7 +273,7 @@ class CadHotkey(bpy.types.Operator):
            bpy.ops.bim.add_rectangle(x=self.props.x, y=self.props.y)
        elif (
            (RoofData.is_loaded or not RoofData.load())
-            and RoofData.data["parameters"]
+            and RoofData.data["pset_data"]
            and bpy.context.active_object.BIMRoofProperties.is_editing_path
        ):
            bpy.ops.bim.set_gable_roof_edge_angle(
@@ -20,26 +20,33 @@ import bpy
 from . import ui, prop, operator

 classes = (
+    operator.AddClashSet,
+    operator.AddClashSource,
+    operator.ExecuteIfcClash,
    operator.ExportClashSets,
    operator.ImportClashSets,
-    operator.AddClashSet,
+    operator.LoadIfcClashes,
+    operator.SaveIfcClashes,
+    operator.LoadSmartGroupsForActiveClashSet,
    operator.RemoveClashSet,
-    operator.AddClashSource,
    operator.RemoveClashSource,
-    operator.SelectClashSource,
-    operator.ExecuteIfcClash,
-    operator.SelectIfcClashResults,
+    operator.SelectClash,
    operator.SelectClashResults,
+    operator.SelectClashSource,
+    operator.SelectIfcClashResults,
+    operator.SelectSmartGroup,
    operator.SelectSmartGroupedClashesPath,
    operator.SmartClashGroup,
-    operator.SelectSmartGroup,
-    operator.LoadSmartGroupsForActiveClashSet,
+    prop.Clash,
    prop.ClashSource,
    prop.ClashSet,
    prop.SmartClashGroup,
    prop.BIMClashProperties,
    ui.BIM_PT_ifcclash,
    ui.BIM_PT_clash_manager,
+    ui.BIM_PT_dumb_clash_manager,
+    ui.BIM_PT_smart_clash_manager,
+    ui.BIM_UL_clashes,
    ui.BIM_UL_clash_sets,
    ui.BIM_UL_smart_groups,
 )
@@ -26,6 +26,7 @@ import ifcopenshell
 from mathutils import Matrix, Vector
 from math import radians
 from blenderbim.bim.ifc import IfcStore
+import blenderbim.tool as tool


 class ExportClashSets(bpy.types.Operator):
@@ -245,12 +246,14 @@ class ExecuteIfcClash(bpy.types.Operator):
                y = Vector([y.x, y.y, y.z])
                x = y.cross(z)

-                mat = Matrix([
-                    [x[0], y[0], z[0], p.x],
-                    [x[1], y[1], z[1], p.y],
-                    [x[2], y[2], z[2], p.z],
-                    [0, 0, 0, 0],
-                ])
+                mat = Matrix(
+                    [
+                        [x[0], y[0], z[0], p.x],
+                        [x[1], y[1], z[1], p.y],
+                        [x[2], y[2], z[2], p.z],
+                        [0, 0, 0, 0],
+                    ]
+                )

                camera.matrix_world = mat
                context.scene.camera = camera
@@ -336,12 +339,132 @@ class SelectIfcClashResults(bpy.types.Operator):
            else:
                element_file = self.file

-            element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-            if element.GlobalId in global_ids:
+            try:
+                element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            except:
+                continue
+
+            global_id = getattr(element, "GlobalId", None)
+            if not global_id:
+                continue
+            if global_id in global_ids:
                obj.select_set(True)
        return {"FINISHED"}


+class LoadIfcClashes(bpy.types.Operator):
+    bl_idname = "bim.load_ifc_clashes"
+    bl_label = "Load IFC Clashes"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Load the clashing IFC geometry stored in a file"
+    filename_ext = ".json"
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+
+    def invoke(self, context, event):
+        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".json")
+        WindowManager = context.window_manager
+        WindowManager.fileselect_add(self)
+        return {"RUNNING_MODAL"}
+
+    def execute(self, context):
+        self.file = IfcStore.get_file()
+        self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
+        with open(self.filepath) as f:
+            clash_sets_json = json.load(f)
+        active_clash_set = context.scene.BIMClashProperties.active_clash_set
+
+        for clash_set in clash_sets_json:
+            if not "clashes" in clash_set.keys():
+                self.report({"WARNING"}, "No clashes found for the selected Clash Set.")
+                return {"CANCELLED"}
+            active_clash_set.clashes.clear()
+            for clash in clash_set["clashes"].values():
+                blender_clash = active_clash_set.clashes.add()
+                blender_clash.a_global_id = clash["a_global_id"]
+                blender_clash.b_global_id = clash["b_global_id"]
+                blender_clash.a_name = "{}/{}".format(clash["a_ifc_class"], clash["a_name"])
+                blender_clash.b_name = "{}/{}".format(clash["b_ifc_class"], clash["b_name"])
+                blender_clash.status = False if not "status" in clash.keys() else clash["status"]
+        return {"FINISHED"}
+
+
+class SaveIfcClashes(bpy.types.Operator):
+    bl_idname = "bim.save_ifc_clashes"
+    bl_label = "Save IFC Clashes"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Save the clashing IFC geometry stored in a file"
+    filename_ext = ".json"
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+
+    def invoke(self, context, event):
+        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".json")
+        WindowManager = context.window_manager
+        WindowManager.fileselect_add(self)
+        return {"RUNNING_MODAL"}
+
+    def execute(self, context):
+        self.file = IfcStore.get_file()
+        self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
+        clash_sets_json = self.load_json()
+        active_clash_set = context.scene.BIMClashProperties.active_clash_set
+        self.update_clash_sets(clash_sets_json, active_clash_set)
+        self.save_json(clash_sets_json)
+        return {"FINISHED"}
+
+    def load_json(self):
+        with open(self.filepath) as f:
+            return json.load(f)
+
+    def update_clash_sets(self, clash_sets_json, active_clash_set):
+        for clash_set in clash_sets_json:
+            if clash_set["name"] != active_clash_set.name or "clashes" not in clash_set.keys():
+                continue
+            for clash in active_clash_set.clashes:
+                clash_key = clash.a_global_id + "-" + clash.b_global_id
+                if clash_set.get("clashes", {}).get(clash_key, None) is not None:
+                    clash_set["clashes"][clash_key]["status"] = clash.status
+
+    def save_json(self, clash_sets_json):
+        with open(self.filepath, "w") as destination:
+            json.dump(clash_sets_json, destination, indent=4)
+
+
+class SelectClash(bpy.types.Operator):
+    bl_idname = "bim.select_clash"
+    bl_label = "Select Clash"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Select the clashing IFC geometry stored in a file"
+    index: bpy.props.IntProperty()
+
+    def execute(self, context):
+        clash = context.scene.BIMClashProperties.active_clash
+
+        products = []
+        linked_objects = []
+        try:
+            products.append(tool.Ifc.get().by_guid(clash.a_global_id))
+        except:
+            linked_objects.append(clash.a_name)
+        try:
+            products.append(tool.Ifc.get().by_guid(clash.b_global_id))
+        except:
+            linked_objects.append(clash.b_name)
+
+        tool.Spatial.select_products(products, unhide=True)
+        print(linked_objects)
+        for obj_name in linked_objects:
+            obj = bpy.data.objects.get(obj_name)
+            if obj:
+                obj.select_set(True)
+            else:
+                print("Object not found:", obj_name)
+        if context.scene.BIMClashProperties.sould_focus_on_clash:
+            context_override = tool.Blender.get_viewport_context()
+            with bpy.context.temp_override(**context_override):
+                bpy.ops.view3d.view_selected()
+        return {"FINISHED"}
+
+
 class SmartClashGroup(bpy.types.Operator):
    bl_idname = "bim.smart_clash_group"
    bl_label = "Smart Group Clashes"
@@ -426,9 +549,9 @@ class LoadSmartGroupsForActiveClashSet(bpy.types.Operator):
                    new_group = context.scene.BIMClashProperties.smart_clash_groups.add()
                    new_group.number = f"{smart_group}"
                    for pair in global_id_pairs:
-                        for id in pair:
+                        for guid in pair:
                            new_global_id = new_group.global_ids.add()
-                            new_global_id.name = id
+                            new_global_id.guid = guid

        return {"FINISHED"}

@@ -443,20 +566,16 @@ class SelectSmartGroup(bpy.types.Operator):
        return IfcStore.get_file() and context.visible_objects and context.scene.BIMClashProperties.active_smart_group

    def execute(self, context):
-        self.file = IfcStore.get_file()
-        # Select smart group in view
        selected_smart_group = context.scene.BIMClashProperties.active_smart_group
-        # print(selected_smart_group.number)
-
-        for obj in context.visible_objects:
-            if not obj.BIMObjectProperties.ifc_definition_id:
+        products = []
+        for global_id in selected_smart_group.global_ids:
+            try:
+                products.append(tool.Ifc.get().by_guid(global_id.guid))
+            except:
                continue
-            element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-            for id in selected_smart_group.global_ids:
-                # print("Id: ", id)
-                # print("Global id: ", element.GlobalId)
-                if element.GlobalId in id.name:
-                    # print("object match: ", global_id)
-                    obj.select_set(True)
-
+        tool.Spatial.select_products(products, unhide=True)
+        context_override = tool.Blender.get_viewport_context()
+        with bpy.context.temp_override(**context_override):
+            bpy.ops.view3d.view_selected()
        return {"FINISHED"}
+
@@ -43,11 +43,20 @@ class ClashSource(PropertyGroup):
    )


+class Clash(PropertyGroup):
+    a_global_id: StringProperty(name="A")
+    b_global_id: StringProperty(name="B")
+    a_name: StringProperty(name="A Name")
+    b_name: StringProperty(name="B Name")
+    status: BoolProperty(name="Status", default=False)
+
+
 class ClashSet(PropertyGroup):
    name: StringProperty(name="Name")
    tolerance: FloatProperty(name="Tolerance")
    a: CollectionProperty(name="Group A", type=ClashSource)
    b: CollectionProperty(name="Group B", type=ClashSource)
+    clashes: CollectionProperty(name="Clashes", type=Clash)


 class SmartClashGroup(PropertyGroup):
@@ -63,11 +72,13 @@ class BIMClashProperties(PropertyGroup):
    clash_results_path: StringProperty(name="Clash Results Path")
    smart_grouped_clashes_path: StringProperty(name="Smart Grouped Clashes Path")
    active_clash_set_index: IntProperty(name="Active Clash Set Index")
+    active_clash_index: IntProperty(name="Active Clash Index")
    smart_clash_groups: CollectionProperty(name="Smart Clash Groups", type=SmartClashGroup)
    active_smart_group_index: IntProperty(name="Active Smart Group Index")
    smart_clash_grouping_max_distance: IntProperty(
        name="Smart Clash Grouping Max Distance", default=3, soft_min=1, soft_max=10
    )
+    sould_focus_on_clash: BoolProperty(name="Show Focus Clash", default=False)

    @property
    def active_clash_set(self):
@@ -80,3 +91,9 @@ class BIMClashProperties(PropertyGroup):
        if not self.smart_clash_groups:
            return None
        return self.smart_clash_groups[self.active_smart_group_index]
+
+    @property
+    def active_clash(self):
+        if not self.active_clash_set:
+            return None
+        return self.active_clash_set.clashes[self.active_clash_index]
@@ -21,13 +21,13 @@ from bpy.types import Panel


 class BIM_PT_ifcclash(Panel):
-    bl_label = "IFC Clash Sets"
+    bl_label = "Clash Sets"
    bl_idname = "BIM_PT_ifcclash"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_quality_control"
+    bl_parent_id = "BIM_PT_tab_clash_detection"

    def draw(self, context):
        layout = self.layout
@@ -102,9 +102,46 @@ class BIM_PT_clash_manager(Panel):
    bl_idname = "BIM_PT_clash_manager"
    bl_label = "Clash Manager"
    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "BlenderBIM"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_tab_clash_detection"
+
+    def draw(self, context):
+        pass
+
+
+class BIM_PT_dumb_clash_manager(Panel):
+    bl_idname = "BIM_PT_dumb_clash_manager"
+    bl_label = "Dumb Manager"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_clash_manager"
+
+    def draw(self, context):
+        layout = self.layout
+        props = context.scene.BIMClashProperties
+
+        row = layout.row(align=True)
+        row.operator("bim.load_ifc_clashes", text="LOAD IFC CLASHES", icon="IMPORT")
+        row.operator("bim.save_ifc_clashes", text="SAVE CLASH RESULTS", icon="EXPORT")
+        layout.template_list("BIM_UL_clashes", "", props.active_clash_set, "clashes", props, "active_clash_index")
+        # bim.select_clash
+        row = layout.row(align=True)
+        row.operator("bim.select_clash", text="SELECT CLASH", icon="IMPORT")
+        row.prop(props, "sould_focus_on_clash", icon="RESTRICT_VIEW_OFF")
+
+
+class BIM_PT_smart_clash_manager(Panel):
+    bl_idname = "BIM_PT_smart_clash_manager"
+    bl_label = "Smart Clash Manager"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_clash_manager"

    def draw(self, context):
        layout = self.layout
@@ -155,3 +192,14 @@ class BIM_UL_smart_groups(bpy.types.UIList):
            layout.label(text=str(item.number), translate=False, icon="NONE", icon_value=0)
        else:
            layout.label(text="", translate=False)
+
+
+class BIM_UL_clashes(bpy.types.UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            row.label(text=str(item.a_name), translate=False, icon="NONE", icon_value=0)
+            row.label(text=str(item.b_name), translate=False, icon="NONE", icon_value=0)
+            row.prop(item, "status", text="")
+        else:
+            layout.label(text="", translate=False)
@@ -21,13 +21,21 @@ from . import ui, prop, operator

 classes = (
    operator.AddClassification,
+    operator.AddClassificationFromBSDD,
    operator.AddClassificationReference,
+    operator.AddClassificationReferenceFromBSDD,
+    operator.AddManualClassification,
+    operator.AddManualClassificationReference,
    operator.ChangeClassificationLevel,
+    operator.DisableAddingManualClassification,
+    operator.DisableAddingManualClassificationReference,
    operator.DisableEditingClassification,
    operator.DisableEditingClassificationReference,
    operator.DisableEditingClassificationReferences,
    operator.EditClassification,
    operator.EditClassificationReference,
+    operator.EnableAddingManualClassification,
+    operator.EnableAddingManualClassificationReference,
    operator.EnableEditingClassification,
    operator.EnableEditingClassificationReference,
    operator.LoadClassificationLibrary,
@@ -73,6 +73,10 @@ class ReferencesData:
        if name in [e.Name for e in tool.Ifc.get().by_type("IfcClassification")]:
            return name

+    @classmethod
+    def classifications(cls):
+        return [(str(e.id()), e.Name, "") for e in tool.Ifc.get().by_type("IfcClassification")]
+

 class ClassificationReferencesData(ReferencesData):
    data = {}
@@ -83,6 +87,8 @@ class ClassificationReferencesData(ReferencesData):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
        cls.data["active_classification_library"] = cls.active_classification_library()
+        cls.data["classifications"] = cls.classifications()
+        cls.data["object_type"] = "OBJECT"

    @classmethod
    def references(cls):
@@ -105,6 +111,8 @@ class MaterialClassificationsData(ReferencesData):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
        cls.data["active_classification_library"] = cls.active_classification_library()
+        cls.data["classifications"] = cls.classifications()
+        cls.data["object_type"] = "MATERIAL"

    @classmethod
    def references(cls):
@@ -127,6 +135,8 @@ class CostClassificationsData(ReferencesData):
        cls.is_loaded = True
        cls.data["references"] = cls.references()
        cls.data["active_classification_library"] = cls.active_classification_library()
+        cls.data["classifications"] = cls.classifications()
+        cls.data["object_type"] = "COST"

    @classmethod
    def references(cls):
@@ -54,6 +54,120 @@ class AddClassification(bpy.types.Operator, tool.Ifc.Operator):
        )


+class AddManualClassification(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_manual_classification"
+    bl_label = "Add Manual Classification"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMClassificationProperties
+        attributes = blenderbim.bim.helper.export_attributes(props.classification_attributes)
+        classification = ifcopenshell.api.run(
+            "classification.add_classification", tool.Ifc.get(), classification="Unnamed"
+        )
+        ifcopenshell.api.run(
+            "classification.edit_classification", tool.Ifc.get(), classification=classification, attributes=attributes
+        )
+        props.is_adding = False
+
+
+class AddManualClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_manual_classification_reference"
+    bl_label = "Add Manual Classification Reference"
+    bl_options = {"REGISTER", "UNDO"}
+    obj_type: bpy.props.StringProperty()
+
+    def _execute(self, context):
+        obj = context.active_object
+        props = obj.BIMClassificationReferenceProperties
+        attributes = blenderbim.bim.helper.export_attributes(props.reference_attributes)
+        product = tool.Ifc.get_entity(obj)
+        # TODO: refactor and support material and cost item classifications
+        classification = tool.Ifc.get().by_id(int(props.classifications))
+        reference = ifcopenshell.api.run(
+            "classification.add_reference",
+            tool.Ifc.get(),
+            product=product,
+            classification=classification,
+            identification="X",
+            name="Unnamed",
+        )
+        ifcopenshell.api.run(
+            "classification.edit_reference", tool.Ifc.get(), reference=reference, attributes=attributes
+        )
+        props.is_adding = False
+
+
+class AddClassificationFromBSDD(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_classification_from_bsdd"
+    bl_label = "Add Classification From bSDD"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBSDDProperties
+        domain = [d for d in props.domains if d.name == props.active_domain][0]
+        for element in tool.Ifc.get().by_type("IfcClassification"):
+            if element.Name == props.active_domain or element.Location == domain.uri:
+                return
+        classification = ifcopenshell.api.run(
+            "classification.add_classification", tool.Ifc.get(), classification=props.active_domain
+        )
+        classification.Source = domain.organization_name_owner
+        classification.Location = domain.uri
+        classification.Edition = domain.version
+
+
+class EnableAddingManualClassification(bpy.types.Operator):
+    bl_idname = "bim.enable_adding_manual_classification"
+    bl_label = "Enable Adding Manual Classification"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        props = context.scene.BIMClassificationProperties
+        props.is_adding = True
+        props.active_classification_id = 0
+        props.classification_attributes.clear()
+        blenderbim.bim.helper.import_attributes2("IfcClassification", props.classification_attributes)
+        return {"FINISHED"}
+
+
+class DisableAddingManualClassification(bpy.types.Operator):
+    bl_idname = "bim.disable_adding_manual_classification"
+    bl_label = "Disable Adding Manual Classification"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        props = context.scene.BIMClassificationProperties
+        props.is_adding = False
+        return {"FINISHED"}
+
+
+class EnableAddingManualClassificationReference(bpy.types.Operator):
+    bl_idname = "bim.enable_adding_manual_classification_reference"
+    bl_label = "Enable Adding Manual Classification Reference"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        obj = context.active_object
+        props = obj.BIMClassificationReferenceProperties
+        props.is_adding = True
+        props.reference_attributes.clear()
+        blenderbim.bim.helper.import_attributes2("IfcClassificationReference", props.reference_attributes)
+        return {"FINISHED"}
+
+
+class DisableAddingManualClassificationReference(bpy.types.Operator):
+    bl_idname = "bim.disable_adding_manual_classification_reference"
+    bl_label = "Disable Adding Manual Classification Reference"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        obj = context.active_object
+        props = obj.BIMClassificationReferenceProperties
+        props.is_adding = False
+        return {"FINISHED"}
+
+
 class EnableEditingClassification(bpy.types.Operator):
    bl_idname = "bim.enable_editing_classification"
    bl_label = "Enable Editing Classification"
@@ -175,21 +289,23 @@ class RemoveClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
        else:
            objects = [self.obj]

-        identification = tool.Ifc.get().by_id(self.reference)[0]
+        active_reference = tool.Ifc.get().by_id(self.reference)
+        identification = active_reference[1]

        for obj in objects:
            ifc_definition_id = blenderbim.bim.helper.get_obj_ifc_definition_id(context, obj, self.obj_type)
            element = tool.Ifc.get().by_id(ifc_definition_id)
            references = ifcopenshell.util.classification.get_references(element, should_inherit=False)
            for reference in references:
-                if reference[0] == identification:
+                if (identification and reference[1] == identification) or (
+                    not identification and reference == active_reference
+                ):
                    ifcopenshell.api.run(
                        "classification.remove_reference",
                        tool.Ifc.get(),
                        reference=reference,
                        product=element,
                    )
-                    break


 class EditClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
@@ -254,6 +370,85 @@ class AddClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
            )


+class AddClassificationReferenceFromBSDD(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_classification_reference_from_bsdd"
+    bl_label = "Add Classification Reference From bSDD"
+    bl_options = {"REGISTER", "UNDO"}
+    obj: bpy.props.StringProperty()
+    obj_type: bpy.props.StringProperty()
+
+    def _execute(self, context):
+        if self.obj_type == "Object":
+            if context.selected_objects:
+                objects = [o.name for o in context.selected_objects]
+            else:
+                objects = [context.active_object.name]
+        else:
+            objects = [self.obj]
+        props = context.scene.BIMClassificationProperties
+        bprops = context.scene.BIMBSDDProperties
+
+        bsdd_classification = bprops.classifications[bprops.active_classification_index]
+
+        classification = None
+        for element in tool.Ifc.get().by_type("IfcClassification"):
+            if (
+                element.Name == bsdd_classification.domain_name
+                or element.Location == bsdd_classification.domain_namespace_uri
+            ):
+                classification = element
+                break
+
+        if not classification:
+            classification = ifcopenshell.api.run(
+                "classification.add_classification", tool.Ifc.get(), classification=bsdd_classification.domain_name
+            )
+            classification.Location = bsdd_classification.domain_namespace_uri
+
+        for obj in objects:
+            ifc_definition_id = blenderbim.bim.helper.get_obj_ifc_definition_id(context, obj, self.obj_type)
+            if not ifc_definition_id:
+                continue
+            element = tool.Ifc.get().by_id(ifc_definition_id)
+            reference = ifcopenshell.api.run(
+                "classification.add_reference",
+                tool.Ifc.get(),
+                product=element,
+                classification=classification,
+                identification=bsdd_classification.reference_code,
+                name=bsdd_classification.name,
+            )
+            reference.Location = bsdd_classification.uri
+
+            for classification_pset in bprops.classification_psets:
+                is_pset = not classification_pset.name.startswith("Qto_")
+
+                if is_pset:
+                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, psets_only=True)
+                else:
+                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, qtos_only=True)
+
+                if pset:
+                    pset = tool.Ifc.get().by_id(pset["id"])
+                elif is_pset:
+                    pset = ifcopenshell.api.run(
+                        "pset.add_pset", tool.Ifc.get(), product=element, name=classification_pset.name
+                    )
+                else:
+                    pset = ifcopenshell.api.run(
+                        "pset.add_qto", tool.Ifc.get(), product=element, name=classification_pset.name
+                    )
+
+                properties = {}
+                for prop in classification_pset.properties:
+                    properties[prop.name] = prop.get_value()
+
+                if is_pset:
+                    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties=properties)
+                else:
+                    ifcopenshell.api.run("pset.edit_qto", tool.Ifc.get(), qto=pset, properties=properties)
+
+
 class ChangeClassificationLevel(bpy.types.Operator):
    bl_idname = "bim.change_classification_level"
    bl_label = "Change Classification Level"
@@ -17,9 +17,10 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
+import blenderbim.bim.helper
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.prop import StrProperty, Attribute
-from blenderbim.bim.module.classification.data import ClassificationsData
+from blenderbim.bim.module.classification.data import ClassificationsData, ClassificationReferencesData
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -39,6 +40,12 @@ def get_available_classifications(self, context):
    return ClassificationsData.data["available_classifications"]


+def get_classifications(self, context):
+    if not ClassificationReferencesData.is_loaded:
+        ClassificationReferencesData.load()
+    return ClassificationReferencesData.data["classifications"]
+
+
 class ClassificationReference(PropertyGroup):
    name: StringProperty(name="Name")
    identification: StringProperty(name="Identification")
@@ -48,6 +55,16 @@ class ClassificationReference(PropertyGroup):


 class BIMClassificationProperties(PropertyGroup):
+    is_adding: BoolProperty(name="Is Adding", default=False)
+    classification_source: EnumProperty(
+        items=[
+            ("FILE", "IFC File", ""),
+            ("BSDD", "buildingSMART Data Dictionary", ""),
+            ("MANUAL", "Manual Entry", ""),
+        ],
+        name="Classification Source",
+        default="FILE",
+    )
    available_classifications: EnumProperty(items=get_available_classifications, name="Available Classifications")
    classification_attributes: CollectionProperty(name="Classification Attributes", type=Attribute)
    active_classification_id: IntProperty(name="Active Classification Id")
@@ -57,5 +74,7 @@ class BIMClassificationProperties(PropertyGroup):


 class BIMClassificationReferenceProperties(PropertyGroup):
+    is_adding: BoolProperty(name="Is Adding", default=False)
+    classifications: EnumProperty(items=get_classifications, name="Classifications")
    reference_attributes: CollectionProperty(name="Reference Attributes", type=Attribute)
    active_reference_id: IntProperty(name="Active Reference Id")
@@ -30,13 +30,13 @@ from blenderbim.bim.module.classification.data import (


 class BIM_PT_classifications(Panel):
-    bl_label = "IFC Classifications"
+    bl_label = "Classifications"
    bl_idname = "BIM_PT_classifications"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_setup"
+    bl_parent_id = "BIM_PT_tab_project_setup"

    @classmethod
    def poll(cls, context):
@@ -48,6 +48,48 @@ class BIM_PT_classifications(Panel):

        self.props = context.scene.BIMClassificationProperties

+        row = self.layout.row(align=True)
+        row.label(text="Source", icon="OUTLINER")
+        row.prop(self.props, "classification_source", text="")
+
+        if self.props.classification_source == "FILE":
+            self.draw_add_file_ui(context)
+        elif self.props.classification_source == "BSDD":
+            self.draw_add_bsdd_ui(context)
+        elif self.props.classification_source == "MANUAL":
+            self.draw_add_manual_ui(context)
+
+        for classification in ClassificationsData.data["classifications"]:
+            if self.props.active_classification_id == classification["id"]:
+                self.draw_editable_ui()
+            else:
+                self.draw_ui(classification)
+
+    def draw_add_manual_ui(self, context):
+        if self.props.is_adding:
+            blenderbim.bim.helper.draw_attributes(self.props.classification_attributes, self.layout)
+            row = self.layout.row(align=True)
+            row.operator("bim.add_manual_classification", text="Save", icon="CHECKMARK")
+            row.operator("bim.disable_adding_manual_classification", text="", icon="CANCEL")
+        else:
+            row = self.layout.row()
+            row.operator("bim.enable_adding_manual_classification", text="Add Classification", icon="ADD")
+
+    def draw_add_bsdd_ui(self, context):
+        self.bprops = context.scene.BIMBSDDProperties
+
+        if not self.bprops.active_domain:
+            row = self.layout.row()
+            row.label(text="No Active bSDD Domain", icon="ERROR")
+            return
+
+        row = self.layout.row()
+        row.label(text="Active: " + self.bprops.active_domain, icon="URL")
+
+        row = self.layout.row()
+        row.operator("bim.add_classification_from_bsdd", icon="ADD")
+
+    def draw_add_file_ui(self, context):
        if ClassificationsData.data["has_classification_file"]:
            row = self.layout.row(align=True)
            row.prop(self.props, "available_classifications", text="")
@@ -58,12 +100,6 @@ class BIM_PT_classifications(Panel):
            row.label(text="No Active Classification Library")
            row.operator("bim.load_classification_library", text="", icon="IMPORT")

-        for classification in ClassificationsData.data["classifications"]:
-            if self.props.active_classification_id == classification["id"]:
-                self.draw_editable_ui()
-            else:
-                self.draw_ui(classification)
-
    def draw_editable_ui(self):
        row = self.layout.row(align=True)
        row.operator("bim.edit_classification", text="Save changes", icon="CHECKMARK")
@@ -84,6 +120,7 @@ class ReferenceUI:
        obj = context.active_object
        self.oprops = obj.BIMObjectProperties
        self.sprops = context.scene.BIMClassificationProperties
+        self.bprops = context.scene.BIMBSDDProperties
        self.props = obj.BIMClassificationReferenceProperties
        self.file = IfcStore.get_file()

@@ -100,14 +137,85 @@ class ReferenceUI:
                self.draw_reference_ui(reference)

    def draw_add_ui(self, context):
+        row = self.layout.row(align=True)
+        row.label(text="Source", icon="OUTLINER")
+        row.prop(self.sprops, "classification_source", text="")
+
+        if self.sprops.classification_source == "FILE":
+            self.draw_add_file_ui(context)
+        elif self.sprops.classification_source == "BSDD":
+            self.draw_add_bsdd_ui(context)
+        elif self.sprops.classification_source == "MANUAL":
+            self.draw_add_manual_ui(context)
+
+    def draw_add_manual_ui(self, context):
+        row = self.layout.row()
+        row.prop(self.props, "classifications", text="")
+        if self.props.is_adding:
+            blenderbim.bim.helper.draw_attributes(self.props.reference_attributes, self.layout)
+            row = self.layout.row(align=True)
+            op = row.operator("bim.add_manual_classification_reference", text="Save", icon="CHECKMARK")
+            op.type = self.data.data["object_type"]
+            row.operator("bim.disable_adding_manual_classification_reference", text="", icon="CANCEL")
+        else:
+            row = self.layout.row()
+            row.operator("bim.enable_adding_manual_classification_reference", text="Add Reference", icon="ADD")
+
+    def draw_add_bsdd_ui(self, context):
+        if not self.bprops.active_domain:
+            row = self.layout.row()
+            row.label(text="No Active bSDD Domain", icon="ERROR")
+            return
+
+        row = self.layout.row()
+        row.label(text="Active: " + self.bprops.active_domain, icon="URL")
+
+        row = self.layout.row(align=True)
+        row.prop(self.bprops, "keyword", text="")
+        row.operator("bim.search_bsdd_classifications", text="", icon="VIEWZOOM")
+
+        row = self.layout.row()
+        row.prop(self.bprops, "should_filter_ifc_class")
+
+        if len(self.bprops.classifications):
+            self.layout.template_list(
+                "BIM_UL_bsdd_classifications",
+                "",
+                self.bprops,
+                "classifications",
+                self.bprops,
+                "active_classification_index",
+            )
+        else:
+            row = self.layout.row()
+            row.label(text="No Search Results")
+
+        if self.bprops.active_classification_index < len(self.bprops.classifications):
+            row = self.layout.row(align=True)
+            op = row.operator(
+                "bim.add_classification_reference_from_bsdd", text="Add Classification Reference", icon="ADD"
+            )
+            op.obj = self.obj
+            op.obj_type = self.obj_type
+            row.operator("bim.get_bsdd_classification_properties", text="", icon="COPY_ID")
+
+            if len(self.bprops.classification_psets):
+                for pset in self.bprops.classification_psets:
+                    box = self.layout.box()
+                    row = box.row()
+                    row.label(text=pset.name, icon="COPY_ID")
+                    blenderbim.bim.helper.draw_attributes(pset.properties, box)
+
+    def draw_add_file_ui(self, context):
        if not self.data.data["active_classification_library"]:
            row = self.layout.row(align=True)
-            row.label(text="No Active Classification Library")
+            row.label(text="No Active Classification Library", icon="ERROR")
            row.operator("bim.load_classification_library", text="", icon="IMPORT")
            return
+
        row = self.layout.row(align=True)
        row.label(text=f"Active Classification Library: {self.data.data['active_classification_library']}")
-        #row.prop(self.sprops, "available_classifications", text="")
+        # row.prop(self.sprops, "available_classifications", text="")
        if not self.sprops.available_library_references:
            op = row.operator("bim.change_classification_level", text="", icon="GREASEPENCIL")
            op.parent_id = int(self.sprops.available_classifications)
@@ -146,6 +254,8 @@ class ReferenceUI:
            name = reference["Identification"] or "No Identification"
        row.label(text=name, icon="ASSET_MANAGER")
        row.label(text=reference["Name"] or "")
+        if reference["Location"]:
+            row.operator("bim.open_uri", icon="URL", text="").uri = reference["Location"]
        if not self.props.active_reference_id:
            op = row.operator("bim.enable_editing_classification_reference", text="", icon="GREASEPENCIL")
            op.reference = reference["id"]
@@ -156,13 +266,13 @@ class ReferenceUI:


 class BIM_PT_classification_references(Panel, ReferenceUI):
-    bl_label = "IFC Classification References"
+    bl_label = "Classification References"
    bl_idname = "BIM_PT_classification_references"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_object_metadata"
+    bl_parent_id = "BIM_PT_tab_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -180,7 +290,7 @@ class BIM_PT_classification_references(Panel, ReferenceUI):


 class BIM_PT_material_classifications(Panel, ReferenceUI):
-    bl_label = "IFC Material Classifications"
+    bl_label = "Material Classifications"
    bl_idname = "BIM_PT_material_classifications"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -206,7 +316,7 @@ class BIM_PT_material_classifications(Panel, ReferenceUI):


 class BIM_PT_cost_classifications(Panel, ReferenceUI):
-    bl_label = "IFC Cost Classifications"
+    bl_label = "Cost Classifications"
    bl_idname = "BIM_PT_cost_classifications"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -1,124 +0,0 @@
-# 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 os
-import logging
-import ifcopenshell
-import json
-import webbrowser
-import tempfile
-from blenderbim.bim.ifc import IfcStore
-
-
-class SelectCobieIfcFile(bpy.types.Operator):
-    bl_idname = "bim.select_cobie_ifc_file"
-    bl_label = "Select COBie IFC File"
-    bl_options = {"REGISTER", "UNDO"}
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-
-    def execute(self, context):
-        context.scene.COBieProperties.cobie_ifc_file = self.filepath
-        return {"FINISHED"}
-
-    def invoke(self, context, event):
-        context.window_manager.fileselect_add(self)
-        return {"RUNNING_MODAL"}
-
-
-class SelectCobieJsonFile(bpy.types.Operator):
-    bl_idname = "bim.select_cobie_json_file"
-    bl_label = "Select COBie JSON File"
-    bl_options = {"REGISTER", "UNDO"}
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-
-    def execute(self, context):
-        context.scene.COBieProperties.cobie_json_file = self.filepath
-        return {"FINISHED"}
-
-    def invoke(self, context, event):
-        context.window_manager.fileselect_add(self)
-        return {"RUNNING_MODAL"}
-
-
-class ExecuteIfcCobie(bpy.types.Operator):
-    bl_idname = "bim.execute_ifc_cobie"
-    bl_label = "Execute IFCCOBie"
-    file_format: bpy.props.StringProperty()
-
-    @classmethod
-    def poll(cls, context):
-        props = context.scene.COBieProperties
-        return props.should_load_from_memory or props.cobie_ifc_file
-
-    def execute(self, context):
-        from cobie import IfcCobieParser
-
-        props = context.scene.COBieProperties
-
-        if props.should_load_from_memory:
-            output_dir = tempfile.gettempdir()
-        else:
-            output_dir = os.path.dirname(props.cobie_ifc_file)
-
-        output = os.path.join(output_dir, "output")
-        logger = logging.getLogger("IFCtoCOBie")
-        fh = logging.FileHandler(os.path.join(output_dir, "cobie.log"))
-        fh.setLevel(logging.DEBUG)
-        fh.setFormatter(logging.Formatter("%(asctime)s : %(levelname)s : %(message)s"))
-        logger = logging.getLogger("IFCtoCOBie")
-        logger.addHandler(fh)
-        selector = ifcopenshell.util.selector.Selector()
-        if props.cobie_json_file:
-            with open(props.cobie_json_file, "r") as f:
-                custom_data = json.load(f)
-        else:
-            custom_data = {}
-        parser = IfcCobieParser(logger, selector)
-
-        ifc_file = IfcStore.get_file()
-
-        if not (ifc_file and props.should_load_from_memory):
-            ifc_file = props.cobie_ifc_file
-
-        parser.parse(
-            ifc_file,
-            props.cobie_types,
-            props.cobie_components,
-            custom_data,
-        )
-        if self.file_format == "xlsx":
-            from cobie import CobieXlsWriter
-
-            writer = CobieXlsWriter(parser, output)
-            writer.write()
-            webbrowser.open("file://" + output + "." + self.file_format)
-        elif self.file_format == "ods":
-            from cobie import CobieOdsWriter
-
-            writer = CobieOdsWriter(parser, output)
-            writer.write()
-            webbrowser.open("file://" + output + "." + self.file_format)
-        else:
-            from cobie import CobieCsvWriter
-
-            writer = CobieCsvWriter(parser, output_dir)
-            writer.write()
-            webbrowser.open("file://" + output_dir)
-        webbrowser.open("file://" + output_dir + "/cobie.log")
-        return {"FINISHED"}
@@ -23,13 +23,13 @@ from blenderbim.bim.module.constraint.data import ConstraintsData, ObjectConstra


 class BIM_PT_constraints(Panel):
-    bl_label = "IFC Constraints"
+    bl_label = "Constraints"
    bl_idname = "BIM_PT_constraints"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_setup"
+    bl_parent_id = "BIM_PT_tab_project_setup"

    @classmethod
    def poll(cls, context):
@@ -68,14 +68,14 @@ class BIM_PT_constraints(Panel):


 class BIM_PT_object_constraints(Panel):
-    bl_label = "IFC Constraints"
+    bl_label = "Constraints"
    bl_idname = "BIM_PT_object_constraints"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
    bl_order = 1
-    bl_parent_id = "BIM_PT_misc_object"
+    bl_parent_id = "BIM_PT_tab_misc"

    @classmethod
    def poll(cls, context):
@@ -23,13 +23,13 @@ from blenderbim.bim.module.context.data import ContextData


 class BIM_PT_context(bpy.types.Panel):
-    bl_label = "IFC Geometric Representation Contexts"
+    bl_label = "Geometric Representation Contexts"
    bl_idname = "BIM_PT_context"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry"
+    bl_parent_id = "BIM_PT_tab_geometry"

    @classmethod
    def poll(cls, context):
@@ -20,64 +20,65 @@ import bpy
 from . import ui, prop, operator

 classes = (
+    operator.AddCostColumn,
+    operator.AddCostItem,
+    operator.AddCostItemQuantity,
    operator.AddCostSchedule,
-    operator.RemoveCostSchedule,
-    operator.EditCostSchedule,
+    operator.AddCostValue,
+    operator.AddCurrency,
+    operator.AddSummaryCostItem,
+    operator.AssignCostItemQuantity,
+    operator.AssignCostItemType,
+    operator.AssignCostValue,
+    operator.CalculateCostItemResourceValue,
+    operator.ChangeParentCostItem,
+    operator.ClearCostItemAssignments,
+    operator.ContractCostItem,
+    operator.ContractCostItemRate,
+    operator.ContractCostItems,
+    operator.CopyCostItem,
+    operator.CopyCostItemValues,
+    operator.DisableEditingCostItem,
+    operator.DisableEditingCostItemQuantity,
+    operator.DisableEditingCostItemValue,
+    operator.DisableEditingCostSchedule,
    operator.EditCostItem,
    operator.EditCostItemQuantity,
    operator.EditCostItemValue,
    operator.EditCostItemValueFormula,
-    operator.EnableEditingCostSchedule,
-    operator.EnableEditingCostItems,
+    operator.EditCostSchedule,
    operator.EnableEditingCostItem,
-    operator.ExportCostSchedules,
-    operator.ExpandCostItems,
    operator.EnableEditingCostItemQuantities,
    operator.EnableEditingCostItemQuantity,
-    operator.EnableEditingCostItemValues,
+    operator.EnableEditingCostItems,
    operator.EnableEditingCostItemValue,
    operator.EnableEditingCostItemValueFormula,
-    operator.DisableEditingCostItem,
-    operator.DisableEditingCostSchedule,
-    operator.DisableEditingCostItemQuantity,
-    operator.DisableEditingCostItemValue,
-    operator.AddCostColumn,
-    operator.RemoveCostColumn,
-    operator.AddCostItem,
-    operator.AddSummaryCostItem,
+    operator.EnableEditingCostItemValues,
+    operator.EnableEditingCostSchedule,
    operator.ExpandCostItem,
-    operator.ContractCostItem,
+    operator.ExpandCostItemRate,
+    operator.ExpandCostItems,
+    operator.ExportCostSchedules,
+    operator.HighlightProductCostItem,
+    operator.ImportCostScheduleCsv,
+    operator.LoadCostItemElementQuantities,
+    operator.LoadCostItemQuantities,
+    operator.LoadCostItemResourceQuantities,
+    operator.LoadCostItemTaskQuantities,
+    operator.LoadCostItemTypes,
+    operator.LoadProductCostItems,
+    operator.LoadScheduleOfRates,
+    operator.RemoveCostColumn,
    operator.RemoveCostItem,
-    operator.AssignCostItemType,
-    operator.UnassignCostItemType,
-    operator.AssignCostItemQuantity,
-    operator.UnassignCostItemQuantity,
-    operator.AddCostItemQuantity,
    operator.RemoveCostItemQuantity,
-    operator.AddCostValue,
    operator.RemoveCostItemValue,
-    operator.CopyCostItemValues,
+    operator.RemoveCostSchedule,
+    operator.ReorderCostItem,
    operator.SelectCostItemProducts,
    operator.SelectCostScheduleProducts,
-    operator.ImportCostScheduleCsv,
-    operator.LoadCostItemQuantities,
-    operator.LoadCostItemTypes,
-    operator.AssignCostValue,
-    operator.LoadScheduleOfRates,
-    operator.ExpandCostItemRate,
-    operator.ContractCostItemRate,
-    operator.CalculateCostItemResourceValue,
-    operator.ClearCostItemAssignments,
-    operator.HighlightProductCostItem,
-    operator.LoadProductCostItems,
-    operator.ReorderCostItem,
    operator.SelectUnassignedProducts,
-    operator.LoadCostItemElementQuantities,
-    operator.LoadCostItemTaskQuantities,
-    operator.LoadCostItemResourceQuantities,
-    operator.ChangeParentCostItem,
-    operator.CopyCostItem,
-    operator.AddCurrency,
+    operator.UnassignCostItemQuantity,
+    operator.UnassignCostItemType,
    prop.CostItem,
    prop.CostItemQuantity,
    prop.CostItemType,
@@ -117,6 +117,7 @@ class CostSchedulesData:
        data["TotalAppliedValue"] = 0.0
        data["TotalCost"] = 0.0
        has_unit_basis = False
+        is_sum = False
        if root_element.is_a("IfcCostItem"):
            values = root_element.CostValues
        elif root_element.is_a("IfcConstructionResource"):
@@ -130,14 +131,18 @@ class CostSchedulesData:
                data["UnitBasisValueComponent"] = cost_value_data["UnitBasis"]["ValueComponent"]
                data["UnitBasisUnitSymbol"] = cost_value_data["UnitBasis"]["UnitSymbol"]
                has_unit_basis = True
-        if has_unit_basis:
-            data["TotalCost"] = data["TotalAppliedValue"] / data["UnitBasisValueComponent"]
-        else:
-            if data["TotalCostQuantity"] is not None:
-                data["TotalCost"] = data["TotalAppliedValue"] * data["TotalCostQuantity"]
            else:
-                data["TotalCost"] = data["TotalAppliedValue"]
-                data["TotalAppliedValue"] = None
+                data["UnitBasisValueComponent"] = 1
+                data["UnitBasisUnitSymbol"] = "U"
+            if cost_value.Category == "*":
+                is_sum = True
+        cost_quantity = data["TotalCostQuantity"] or 1
+        if has_unit_basis:
+            data["TotalCost"] = data["TotalAppliedValue"] * cost_quantity / data["UnitBasisValueComponent"]
+        else:
+            data["TotalCost"] = data["TotalAppliedValue"] * cost_quantity
+        if is_sum:
+            data["TotalAppliedValue"] = None

    @classmethod
    def _load_cost_item_quantities(cls, cost_item, data):
@@ -153,8 +158,10 @@ class CostSchedulesData:
            unit = ifcopenshell.util.unit.get_property_unit(quantity, tool.Ifc.get())
            if unit:
                data["UnitSymbol"] = ifcopenshell.util.unit.get_unit_symbol(unit)
-            else:
-                data["UnitSymbol"] = None
+            if quantity.is_a("IfcPhysicalSimpleQuantity"):
+                measure_class = quantity.wrapped_data.declaration().as_entity().attribute_by_index(3).type_of_attribute().declared_type().name()
+                if "Count" in measure_class:
+                    data["UnitSymbol"] = "U"

        # same_unit_nested_cost_item = set()
        # data["DerivedTotalCostQuantity"] = None
@@ -249,7 +256,7 @@ class CostSchedulesData:
        for cost_value in cost_item.CostValues or []:
            label = "{0:.2f}".format(ifcopenshell.util.cost.calculate_applied_value(cost_item, cost_value))
            label += " = {}".format(ifcopenshell.util.cost.serialise_cost_value(cost_value))
-            results.append({"id": cost_value.id(), "label": label})
+            results.append({"id": cost_value.id(), "label": label, "name": cost_value.Name})
        return results

    @classmethod
@@ -33,9 +33,24 @@ class AddCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
    bl_label = "Add Cost Schedule"
    bl_options = {"REGISTER", "UNDO"}
    bl_description = "Add a new cost schedule"
+    name: bpy.props.StringProperty()
+    object_type: bpy.props.StringProperty()

    def _execute(self, context):
-        core.add_cost_schedule(tool.Ifc, predefined_type=context.scene.BIMCostProperties.cost_schedule_predefined_types)
+        predefined_type = context.scene.BIMCostProperties.cost_schedule_predefined_types
+        if predefined_type == "USERDEFINED":
+            predefined_type = self.object_type
+        core.add_cost_schedule(tool.Ifc, name=self.name, predefined_type=predefined_type)
+
+    def draw(self, context):
+        layout = self.layout
+        layout.prop(self, "name", text="Name")
+        layout.prop(context.scene.BIMCostProperties, "cost_schedule_predefined_types", text="Type")
+        if context.scene.BIMCostProperties.cost_schedule_predefined_types == "USERDEFINED":
+            layout.prop(self, "object_type", text="Object type")
+
+    def invoke(self, context, event):
+        return context.window_manager.invoke_props_dialog(self)


 class EditCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
@@ -156,6 +171,17 @@ class ContractCostItem(bpy.types.Operator, tool.Ifc.Operator):
        core.contract_cost_item(tool.Cost, cost_item=tool.Ifc.get().by_id(self.cost_item))


+class ContractCostItems(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.contract_cost_items"
+    bl_label = "Contract Cost Item"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Collapse cost item tree"
+    cost_item: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        core.contract_cost_items(tool.Cost)
+
+
 class RemoveCostItem(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.remove_cost_item"
    bl_label = "Remove Cost Item"
@@ -635,7 +661,9 @@ class ExportCostSchedules(bpy.types.Operator):

    def execute(self, context):
        cost_schedule = tool.Ifc.get().by_id(self.cost_schedule) if self.cost_schedule else None
-        r = core.export_cost_schedules(tool.Cost, filepath=self.filepath, format=self.format, cost_schedule=cost_schedule)
+        r = core.export_cost_schedules(
+            tool.Cost, filepath=self.filepath, format=self.format, cost_schedule=cost_schedule
+        )
        if isinstance(r, str):
            self.report({"ERROR"}, r)
        return {"FINISHED"}
@@ -24,13 +24,13 @@ from blenderbim.bim.module.cost.data import CostSchedulesData


 class BIM_PT_cost_schedules(Panel):
-    bl_label = "IFC Cost Schedules"
+    bl_label = "Cost Schedules"
    bl_idname = "BIM_PT_cost_schedules"
-    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_4D5D"
+    bl_parent_id = "BIM_PT_tab_cost"
+    bl_options = {"HIDE_HEADER"}

    @classmethod
    def poll(cls, context):
@@ -42,16 +42,18 @@ class BIM_PT_cost_schedules(Panel):
            CostSchedulesData.load()

        self.props = context.scene.BIMCostProperties
-        row = self.layout.row()
        if not self.props.active_cost_schedule_id:
+            row = self.layout.row(align=True)
            if CostSchedulesData.data["total_cost_schedules"]:
+                row.alignment = "RIGHT"
+                row.operator("bim.export_cost_schedules",icon="EXPORT",text="Export All Schedules")
+                row = self.layout.row(align=True)
                row.label(text=f"{CostSchedulesData.data['total_cost_schedules']} Cost Schedules Found", icon="TEXT")
-                row.operator("bim.export_cost_schedules", text="Export as spreadsheet", icon="EXPORT")
            else:
-                row.label(text="No Cost Schedules Found found.", icon="COMMUNITY")
-            row = self.layout.row()
-            row.prop(self.props, "cost_schedule_predefined_types")
-            row.operator("bim.add_cost_schedule", icon="ADD", text="Add")
+                row.label(text="No Cost Schedules found.", icon="TEXT")
+
+            row.operator("bim.add_cost_schedule", icon="ADD", text="")
+            row.operator("import_cost_schedule_csv.bim",icon="IMPORT",text="")

        for schedule in CostSchedulesData.data["schedules"]:
            self.draw_cost_schedule_ui(schedule)
@@ -139,8 +141,8 @@ class BIM_PT_cost_schedules(Panel):
        row = self.layout.row(align=True)
        row.alignment = "RIGHT"
        row.operator("bim.add_summary_cost_item", text="Add Summary Cost", icon="ADD")
-        row.operator("bim.expand_all_tasks", text="Expand All")
-        row.operator("bim.contract_all_tasks", text="Contract All")
+        row.operator("bim.expand_cost_items", text="Expand All")
+        row.operator("bim.contract_cost_items", text="Contract All")
        row = self.layout.row(align=True)
        row.alignment = "RIGHT"
        if self.props.cost_items and self.props.active_cost_item_index < len(self.props.cost_items):
@@ -236,6 +238,8 @@ class BIM_PT_cost_schedules(Panel):
            blenderbim.bim.helper.draw_attributes(self.props.cost_value_attributes, self.layout.box())

    def draw_readonly_cost_value_ui(self, layout, cost_value):
+        if cost_value["name"]:
+            layout.label(text=f"{cost_value['name']}: ")
        if self.props.active_cost_value_id == cost_value["id"] and self.props.cost_value_editing_type == "FORMULA":
            layout.prop(self.props, "cost_value_formula", text="")
        else:
@@ -267,7 +271,7 @@ class BIM_PT_cost_schedules(Panel):


 class BIM_PT_cost_item_types(Panel):
-    bl_label = "IFC Cost Item Types"
+    bl_label = "Cost Item Types"
    bl_idname = "BIM_PT_cost_item_types"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -353,7 +357,7 @@ class BIM_PT_cost_item_types(Panel):


 class BIM_PT_cost_item_quantities(Panel):
-    bl_label = "IFC Cost Item Quantities"
+    bl_label = "Cost Item Quantities"
    bl_idname = "BIM_PT_cost_item_quantities"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -525,7 +529,7 @@ class BIM_PT_cost_item_quantities(Panel):


 class BIM_PT_cost_item_rates(Panel):
-    bl_label = "IFC Cost Item Rates"
+    bl_label = "Cost Item Rates"
    bl_idname = "BIM_PT_cost_item_rates"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -620,18 +624,22 @@ class BIM_UL_cost_items_trait:
        else:
            row.label(text="", icon="DOT")

-    def draw_total_cost_column(self, layout, cost_item):
-        format_numbers = "{0:,.2f}".format(cost_item["TotalCost"]).replace(",", " ")
-        currency = CostSchedulesData.data["currency"]
-        text = "{} {}".format(format_numbers, currency["name"]) if currency else format_numbers
-        layout.label(text=text)
-
    def draw_quantity_column(self, layout, cost_item):
        if CostSchedulesData.data["is_editing_rates"]:
            self.draw_uom_column(layout, cost_item)
        else:
            self.draw_total_quantity_column(layout, cost_item)

+    def draw_uom_column(self, layout, cost_item):
+        layout.label(text=cost_item["UnitBasisUnitSymbol"])
+
+    def draw_total_quantity_column(self, layout, cost_item):
+        if cost_item["TotalCostQuantity"]:
+            label = "{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}"
+            layout.label(text=label)
+        else:
+            layout.label(text="-")
+
    def draw_value_column(self, layout, cost_item):
        if cost_item["TotalAppliedValue"]:
            text = "{0:,.2f}".format(cost_item["TotalAppliedValue"]).replace(",", " ")
@@ -643,8 +651,11 @@ class BIM_UL_cost_items_trait:
        else:
            layout.label(text="-")

-    def draw_uom_column(self, layout, cost_item):
-        layout.label(text=cost_item["UnitBasisUnitSymbol"] or "-" if cost_item["UnitBasisValueComponent"] else "-")
+    def draw_total_cost_column(self, layout, cost_item):
+        format_numbers = "{0:,.2f}".format(cost_item["TotalCost"]).replace(",", " ")
+        currency = CostSchedulesData.data["currency"]
+        text = "{} {}".format(format_numbers, currency["name"]) if currency else format_numbers
+        layout.label(text=text)

    def draw_order_operator(self, row, ifc_definition_id, cost_item):
        if cost_item["NestingIndex"] is not None:
@@ -657,20 +668,6 @@ class BIM_UL_cost_items_trait:
                op.cost_item = ifc_definition_id
                op.new_index = cost_item["NestingIndex"] - 1

-    def draw_total_quantity_column(self, layout, cost_item):
-        if cost_item["TotalCostQuantity"]:
-            label = "{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}"
-            layout.label(text=label)
-        else:
-            layout.label(text="-")
-        # if cost_item["DerivedTotalCostQuantity"] not in [None, 0]:
-        #     layout.label(text="{0:.2f}".format(cost_item["DerivedTotalCostQuantity"]) + f" {cost_item['DerivedUnitSymbol'] or '-'}")
-        # else:
-        #     if cost_item["TotalCostQuantity"] == 0:
-        #         layout.label(text="-")
-        #     else:
-        #         layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}")
-

 class BIM_UL_cost_items(BIM_UL_cost_items_trait, UIList):
    def __init__(self):
@@ -0,0 +1,41 @@
+# 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
+from . import prop, workspace
+
+classes = (
+    prop.BIMCoveringProperties,
+    workspace.Hotkey,
+)
+
+
+def register():
+    if not bpy.app.background:
+        bpy.utils.register_tool(workspace.CoveringTool, after={"bim.structural_tool"}, separator=False, group=False)
+    bpy.types.Scene.BIMCoveringProperties = bpy.props.PointerProperty(type=prop.BIMCoveringProperties)
+#    bpy.types.Object.BIMObjectSpatialProperties = bpy.props.PointerProperty(type=prop.BIMObjectSpatialProperties)
+#    bpy.types.Scene.BIMSpatialManagerProperties = bpy.props.PointerProperty(type=prop.BIMSpatialManagerProperties)
+
+
+def unregister():
+    if not bpy.app.background:
+        bpy.utils.unregister_tool(workspace.CoveringTool)
+    del bpy.types.Scene.BIMCoveringProperties
+#    del bpy.types.Object.BIMObjectSpatialProperties
+#    del bpy.types.Scene.BIMSpatialManagerProperties
@@ -17,8 +17,8 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-from blenderbim.bim.module.lca.data import LcaData
 from blenderbim.bim.prop import StrProperty, Attribute
+#from blenderbim.bim.module.spatial.data import SpatialData
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -30,15 +30,10 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
+#import blenderbim.tool as tool
+#import blenderbim.core.geometry
+#import ifcopenshell


-def get_product_systems(self, context):
-    if not LcaData.is_loaded:
-        LcaData.load()
-    return LcaData.data["product_systems"]
-
-
-class BIMLCAProperties(PropertyGroup):
-    is_connected: BoolProperty(name="Is Connected")
-    amount: FloatProperty(name="Amount")
-    product_systems: EnumProperty(items=get_product_systems, name="Product Systems")
+class BIMCoveringProperties(PropertyGroup):
+    ceiling_height: bpy.props.FloatProperty(name="ceiling_height", default=2.7, subtype="DISTANCE", description="Ceiling height")
@@ -0,0 +1,272 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 @Andrej730
+#
+# 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 ifcopenshell
+import blenderbim.tool as tool
+from blenderbim.bim.helper import prop_with_search
+from blenderbim.bim.module.model.data import AuthoringData
+from bpy.types import WorkSpaceTool
+from blenderbim.bim.ifc import IfcStore
+import blenderbim.bim.handler
+
+
+# declaring it here to avoid circular import problems
+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+class CoveringTool(WorkSpaceTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "OBJECT"
+    bl_idname = "bim.covering_tool"
+    bl_label = "Covering Tool"
+    bl_description = "Create and edit coverings"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.covering")
+    bl_widget = None
+    ifc_element_type = "IfcCoveringType"
+    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
+        ("bim.covering_hotkey", {"type": "A", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_A")]}),
+        ("bim.covering_hotkey", {"type": "G", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_G")]}),
+    )
+
+    @classmethod
+    def draw_settings(cls, context, layout, ws_tool):
+        CoveringToolUI.draw(context, layout, ifc_element_type=cls.ifc_element_type)
+
+def add_layout_hotkey(layout, text, hotkey, description):
+    args = ["covering", layout, text, hotkey, description]
+    tool.Blender.add_layout_hotkey_operator(*args)
+
+class CoveringToolUI:
+    @classmethod
+    def draw(cls, context, layout, ifc_element_type = None):
+        cls.layout = layout
+        cls.props = context.scene.BIMModelProperties
+        cls.covering_props = context.scene.BIMCoveringProperties
+
+
+        row = cls.layout.row(align=True)
+        if not tool.Ifc.get():
+            row.label(text="No IFC Project", icon="ERROR")
+            return
+
+        if not AuthoringData.is_loaded:
+            AuthoringData.load(ifc_element_type)
+        elif AuthoringData.data["ifc_element_type"] != ifc_element_type:
+            AuthoringData.load(ifc_element_type)
+
+        if context.region.type == "TOOL_HEADER":
+            cls.draw_header_interface()
+        elif context.region.type in ("UI", "WINDOW"):
+            cls.draw_basic_bim_tool_interface()
+
+        cls.draw_default_interface()
+
+
+
+    @classmethod
+    def draw_header_interface(cls):
+        cls.draw_type_selection_interface()
+
+    @classmethod
+    def draw_default_interface(cls):
+        row = cls.layout.row(align=True)
+        row.prop(data=cls.props, property="rl3", text="RL")
+        row = cls.layout.row(align=True)
+        row.prop(data=cls.covering_props, property="ceiling_height", text="Ceiling Height")
+        if AuthoringData.data["ifc_classes"]:
+            active_obj = bpy.context.active_object
+            element = tool.Ifc.get_entity(active_obj)
+            collection = bpy.context.view_layer.active_layer_collection.collection
+            collection_obj = collection.BIMCollectionProperties.obj
+
+            relating_type_id = int(cls.props.relating_type_id)
+            type_material_usage = ifcopenshell.util.element.get_material(tool.Ifc.get().by_id(relating_type_id)).is_a()
+
+#               PLEASE KEEP COMMENTS AS A REMINDER
+#                elif element and bpy.context.selected_objects and element.is_a("IfcSpace"):
+#                    op. = row.operator("bim.add_istance_flooring_from_spaces"):
+
+            if (type_material_usage == "IfcMaterialLayerSet" and
+                not bpy.context.selected_objects):
+                row = cls.layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_A")
+                if tool.Ifc.get_entity(collection_obj):
+                    if AuthoringData.data["predefined_type"] == "FLOORING":
+                        op = row.operator("bim.add_instance_flooring_covering_from_cursor")
+                    elif AuthoringData.data["predefined_type"] == "CEILING":
+                        op = row.operator("bim.add_instance_ceiling_covering_from_cursor")
+                    else:
+                        op = row.operator("bim.add_constr_type_instance", text="Add")
+                        op.from_invoke = True
+                        if cls.props.relating_type_id.isnumeric():
+                            op.relating_type_id = int(cls.props.relating_type_id)
+
+                else:
+                    op = row.operator("bim.add_constr_type_instance", text="Add")
+                    op.from_invoke = True
+                    if cls.props.relating_type_id.isnumeric():
+                        op.relating_type_id = int(cls.props.relating_type_id)
+
+            elif (AuthoringData.data["predefined_type"] == "FLOORING" and
+                type_material_usage == "IfcMaterialLayerSet" and
+                element and
+                bpy.context.selected_objects and
+                element.is_a("IfcWall")):
+                    row = cls.layout.row(align=True)
+                    row.label(text="", icon="EVENT_SHIFT")
+                    row.label(text="", icon="EVENT_A")
+                    op = row.operator("bim.add_instance_flooring_coverings_from_walls")
+
+            elif (AuthoringData.data["predefined_type"] == "CEILING" and
+                type_material_usage == "IfcMaterialLayerSet" and
+                element and
+                bpy.context.selected_objects and
+                element.is_a("IfcWall")):
+                    row = cls.layout.row(align=True)
+                    row.label(text="", icon="EVENT_SHIFT")
+                    row.label(text="", icon="EVENT_A")
+                    op = row.operator("bim.add_instance_ceiling_coverings_from_walls")
+
+            elif (element and
+                  bpy.context.selected_objects and
+                  element.is_a("IfcCovering") and
+#                  AuthoringData.data["predefined_type"] == "FLOORING" and
+                  AuthoringData.data["active_material_usage"] == "LAYER3"):
+                row = cls.layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_G")
+                op = row.operator("bim.regen_selected_covering_object")
+
+
+
+#            elif AuthoringData.data["predefined_type"] == "CEILING":
+#                row = cls.layout.row(align=True)
+#                row.prop(data=cls.props, property="ceiling_height", text="ceiling height")
+#                if element and bpy.context.selected_objects and element.is_a("IfcWall"):
+#                    op = row.operator("bim.add_instance_ceiling_coverings_from_walls")
+#                elif element and bpy.context.selected_objects and element.is_a("IfcSpace"):
+#                    op. = row.operator("bim.add_istance_flooring_from_spaces"):
+#                else:
+#                    op = row.operator("bim.add_instance_ceiling_from_cursor")
+#                    op = row.operator("bim.add_constr_type_instance", text="Add")
+#                    op.from_invoke = True
+#                    if cls.props.relating_type_id.isnumeric():
+#                        op.relating_type_id = int(cls.props.relating_type_id)
+            else:
+                row = cls.layout.row(align=True)
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_A")
+                op = row.operator("bim.add_constr_type_instance", text="Add")
+                op.from_invoke = True
+                if cls.props.relating_type_id.isnumeric():
+                    op.relating_type_id = int(cls.props.relating_type_id)
+
+    @classmethod
+    def draw_type_selection_interface(cls):
+        # shared by both sidebar and header
+        row = cls.layout.row(align=True)
+        if AuthoringData.data["ifc_classes"]:
+            row = cls.layout.row(align=True)
+            row.label(text="", icon="FILE_3D")
+            prop_with_search(row, cls.props, "relating_type_id", text="")
+            row.operator("bim.launch_type_manager", icon="LIGHTPROBE_GRID", text="")
+        else:
+            row.label(text=f"No {AuthoringData.data['ifc_element_type']} Found", icon="ERROR")
+            row = cls.layout.row()
+            row.operator("bim.launch_type_manager", icon="LIGHTPROBE_GRID", text="Launch Type Manager")
+
+    @classmethod
+    def draw_basic_bim_tool_interface(cls):
+        cls.draw_type_selection_interface()
+
+        if AuthoringData.data["ifc_classes"]:
+            if cls.props.ifc_class:
+                box = cls.layout.box()
+                if AuthoringData.data["type_thumbnail"]:
+                    box.template_icon(icon_value=AuthoringData.data["type_thumbnail"], scale=5)
+                else:
+                    op = box.operator("bim.load_type_thumbnails", text="Load Thumbnails", icon="FILE_REFRESH")
+                    op.ifc_class = cls.props.ifc_class
+
+
+class Hotkey(bpy.types.Operator, Operator):
+    bl_idname = "bim.covering_hotkey"
+    bl_label = "Hotkey"
+    bl_options = {"REGISTER", "UNDO"}
+    hotkey: bpy.props.StringProperty()
+    description: bpy.props.StringProperty()
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+
+    @classmethod
+    def description(cls, context, operator):
+        return operator.description or ""
+
+    def _execute(self, context):
+#        self.props = context.scene.BIMCoveringProperties
+        getattr(self, f"hotkey_{self.hotkey}")()
+
+    def invoke(self, context, event):
+        # https://blender.stackexchange.com/questions/276035/how-do-i-make-operators-remember-their-property-values-when-called-from-a-hotkey
+        # self.props = context.scene.BIMSpatialProperties
+        return self.execute(context)
+
+    def draw(self, context):
+        pass
+
+    def hotkey_S_A(self):
+        active_obj = bpy.context.active_object
+        element = tool.Ifc.get_entity(active_obj)
+        collection = bpy.context.view_layer.active_layer_collection.collection
+        collection_obj = collection.BIMCollectionProperties.obj
+
+        if AuthoringData.data["predefined_type"] == "FLOORING":
+            if element and bpy.context.selected_objects and element.is_a("IfcWall"):
+                bpy.ops.bim.add_instance_flooring_coverings_from_walls()
+            elif tool.Ifc.get_entity(collection_obj):
+                bpy.ops.bim.add_instance_flooring_covering_from_cursor()
+            else:
+                bpy.ops.bim.add_constr_type_instance()
+        elif AuthoringData.data["predefined_type"] == "CEILING":
+            if element and bpy.context.selected_objects and element.is_a("IfcWall"):
+                bpy.ops.bim.add_instance_ceiling_coverings_from_walls()
+            elif tool.Ifc.get_entity(collection_obj):
+                bpy.ops.bim.add_instance_ceiling_covering_from_cursor()
+            else:
+                bpy.ops.bim.add_constr_type_instance()
+        else:
+            bpy.ops.bim.add_constr_type_instance()
+
+    def hotkey_S_G(self):
+        active_obj = bpy.context.active_object
+        element = tool.Ifc.get_entity(active_obj)
+        if (element and
+            bpy.context.selected_objects and
+            element.is_a("IfcCovering") and
+            AuthoringData.data["active_material_usage"] == "LAYER3"):
+                bpy.ops.bim.regen_selected_covering_object()
+
@@ -26,7 +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"
+    bl_parent_id = "BIM_PT_tab_sandbox"

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

 classes = (
    operator.AddCsvAttribute,
-    operator.RemoveCsvAttribute,
-    operator.RemoveAllCsvAttributes,
-    operator.ExportIfcCsv,
-    operator.ImportIfcCsv,
-    operator.EyedropIfcCsv,
-    operator.SelectCsvIfcFile,
-    operator.ImportCsvAttributes,
    operator.ExportCsvAttributes,
+    operator.ExportIfcCsv,
+    operator.ImportCsvAttributes,
+    operator.ImportIfcCsv,
+    operator.RemoveAllCsvAttributes,
+    operator.RemoveCsvAttribute,
+    operator.ReorderCsvAttribute,
+    operator.SelectCsvIfcFile,
+    prop.CsvAttribute,
    prop.CsvProperties,
    ui.BIM_PT_ifccsv,
 )
@@ -16,16 +16,17 @@
 # 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 ifccsv
-import ifcopenshell
 import os
-import logging
+import bpy
 import json
-import webbrowser
+import ifccsv
+import logging
 import tempfile
+import ifcopenshell
+import blenderbim.tool as tool
+import blenderbim.bim.module.drawing.scheduler as scheduler
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.handler import purge_module_data
+from blenderbim.bim.handler import refresh_ui_data


 class AddCsvAttribute(bpy.types.Operator):
@@ -61,28 +62,57 @@ class RemoveAllCsvAttributes(bpy.types.Operator):
        return {"FINISHED"}


+class ReorderCsvAttribute(bpy.types.Operator):
+    bl_idname = "bim.reorder_csv_attribute"
+    bl_label = "Reorder CSV Attribute"
+    bl_options = {"REGISTER", "UNDO"}
+    old_index: bpy.props.IntProperty()
+    new_index: bpy.props.IntProperty()
+
+    def execute(self, context):
+        old = context.scene.CsvProperties.csv_attributes[self.old_index]
+        new = context.scene.CsvProperties.csv_attributes[self.new_index]
+        props = ["name", "header", "sort", "group", "varies_value", "summary"]
+        for prop in props:
+            value = getattr(new, prop)
+            setattr(new, prop, getattr(old, prop))
+            setattr(old, prop, value)
+        return {"FINISHED"}
+
+
 class ImportCsvAttributes(bpy.types.Operator):
    bl_idname = "bim.import_csv_attributes"
-    bl_label = "Import CSV Template"
+    bl_label = "Load CSV Settings"
    bl_description = "Import a json template for CSV export"
    bl_options = {"REGISTER", "UNDO"}
    filter_glob: bpy.props.StringProperty(default="*.json", options={"HIDDEN"})
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")

    def execute(self, context):
-        csv_props = context.scene.CsvProperties
-        csv_json = json.load(open(self.filepath))
+        props = context.scene.CsvProperties
+        data = json.load(open(self.filepath))
+        tool.Search.import_filter_query(data["query"], props.filter_groups)

-        expression = csv_json.get("expression", "")
-        if expression:
-            csv_props.ifc_selector = expression
-
-        attributes = csv_json.get("attributes", [])
-        if attributes:
-            csv_props.csv_attributes.clear()
-            for attribute in attributes:
-                csv_props.csv_attributes.add().name = attribute
+        for prop in [
+            "should_generate_svg",
+            "should_preserve_existing",
+            "include_global_id",
+            "null_value",
+            "empty_value",
+            "true_value",
+            "false_value",
+            "concat_value",
+            "csv_delimiter",
+            "format",
+            "csv_custom_delimiter",
+        ]:
+            setattr(props, prop, data["settings"][prop])

+        props.csv_attributes.clear()
+        for attribute in data["attributes"]:
+            new = props.csv_attributes.add()
+            for prop in ["name", "header", "sort", "group", "summary", "formatting"]:
+                setattr(new, prop, attribute[prop])
        return {"FINISHED"}

    def invoke(self, context, event):
@@ -92,7 +122,7 @@ class ImportCsvAttributes(bpy.types.Operator):

 class ExportCsvAttributes(bpy.types.Operator):
    bl_idname = "bim.export_csv_attributes"
-    bl_label = "Export CSV Template"
+    bl_label = "Save CSV Settings"
    bl_options = {"REGISTER", "UNDO"}
    bl_description = "Save a json template for CSV export"
    filename_ext = ".json"
@@ -100,22 +130,42 @@ class ExportCsvAttributes(bpy.types.Operator):
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")

    def execute(self, context):
-        csv_props = context.scene.CsvProperties
+        props = context.scene.CsvProperties

-        csv_template = {}
-        expression = csv_props.ifc_selector
-        if expression:
-            csv_template["expression"] = expression
+        settings = {}
+        for prop in [
+            "should_generate_svg",
+            "should_preserve_existing",
+            "include_global_id",
+            "null_value",
+            "empty_value",
+            "true_value",
+            "false_value",
+            "concat_value",
+            "csv_delimiter",
+            "format",
+            "csv_custom_delimiter",
+        ]:
+            settings[prop] = getattr(props, prop)

-        csv_attributes = []
-        for attribute in csv_props.csv_attributes:
-            attribute_name = attribute.name
-            csv_attributes.append(attribute_name)
-        if csv_attributes:
-            csv_template["attributes"] = csv_attributes
+        data = {
+            "query": tool.Search.export_filter_query(props.filter_groups),
+            "attributes": [
+                {
+                    "name": a.name,
+                    "header": a.header,
+                    "sort": a.sort,
+                    "group": a.group,
+                    "summary": a.summary,
+                    "formatting": a.formatting,
+                }
+                for a in props.csv_attributes
+            ],
+            "settings": settings,
+        }

        with open(self.filepath, "w") as outfile:
-            json.dump(csv_template, outfile)
+            json.dump(data, outfile)

        return {"FINISHED"}

@@ -129,9 +179,8 @@ class ExportCsvAttributes(bpy.types.Operator):
 class ExportIfcCsv(bpy.types.Operator):
    bl_idname = "bim.export_ifccsv"
    bl_label = "Export IFC"
-    #filename_ext = ".csv"
+    filename_ext = ".csv"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-    

    def invoke(self, context, event):
        props = context.scene.CsvProperties
@@ -149,19 +198,61 @@ class ExportIfcCsv(bpy.types.Operator):
            ifc_file = IfcStore.get_file()
        else:
            ifc_file = ifcopenshell.open(props.csv_ifc_file)
-        selector = ifcopenshell.util.selector.Selector()
-        results = selector.parse(ifc_file, props.ifc_selector)
+        results = ifcopenshell.util.selector.filter_elements(
+            ifc_file, tool.Search.export_filter_query(props.filter_groups)
+        )
+
        ifc_csv = ifccsv.IfcCsv()
        attributes = [a.name for a in props.csv_attributes]
+        headers = [a.header for a in props.csv_attributes]
+
+        sort = []
+        groups = []
+        summaries = []
+        formatting = []
+        for attribute in props.csv_attributes:
+            if attribute.sort != "NONE":
+                sort.append({"name": attribute.name, "order": attribute.sort})
+            if attribute.group != "NONE":
+                groups.append({"name": attribute.name, "type": attribute.group, "varies_value": attribute.varies_value})
+            if attribute.summary != "NONE":
+                summaries.append({"name": attribute.name, "type": attribute.summary})
+
+            if attribute.formatting != "{{value}}" and "{{value}}" in attribute.formatting:
+                formatting.append({"name": attribute.name, "format": attribute.formatting})
+
        sep = props.csv_custom_delimiter if props.csv_delimiter == "CUSTOM" else props.csv_delimiter
-        ifc_csv.export(ifc_file, results, attributes, output=self.filepath, format=props.format, delimiter=sep)
+        ifc_csv.export(
+            ifc_file,
+            results,
+            attributes,
+            headers=headers,
+            output=self.filepath,
+            format=props.format,
+            should_preserve_existing=props.should_preserve_existing,
+            delimiter=sep,
+            include_global_id=props.include_global_id,
+            null=props.null_value,
+            empty=props.empty_value,
+            bool_true=props.true_value,
+            bool_false=props.false_value,
+            concat=props.concat_value,
+            sort=sort,
+            groups=groups,
+            summaries=summaries,
+            formatting=formatting,
+        )
+
+        if props.format != "csv" and props.should_generate_svg:
+            schedule_creator = scheduler.Scheduler()
+            schedule_creator.schedule(self.filepath, tool.Drawing.get_path_with_ext(self.filepath, "svg"))
        return {"FINISHED"}


 class ImportIfcCsv(bpy.types.Operator):
    bl_idname = "bim.import_ifccsv"
-    bl_label = "Import CSV to IFC"
-    filename_ext = ".csv"
+    bl_label = "Import to IFC"
+    filter_glob: bpy.props.StringProperty(default="*.csv;*.ods;*.xlsx", options={"HIDDEN"})
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")

    def invoke(self, context, event):
@@ -180,25 +271,20 @@ class ImportIfcCsv(bpy.types.Operator):
            ifc_file = ifcopenshell.open(props.csv_ifc_file)
        ifc_csv = ifccsv.IfcCsv()
        sep = props.csv_custom_delimiter if props.csv_delimiter == "CUSTOM" else props.csv_delimiter
-        ifc_csv.Import(ifc_file, self.filepath, delimiter=sep)
+        attributes = [a.name for a in props.csv_attributes]
+        ifc_csv.Import(
+            ifc_file,
+            self.filepath,
+            attributes=attributes,
+            delimiter=sep,
+            null=props.null_value,
+            empty=props.empty_value,
+            bool_true=props.true_value,
+            bool_false=props.false_value,
+        )
        if not props.should_load_from_memory:
            ifc_file.write(props.csv_ifc_file)
-        purge_module_data()
-        return {"FINISHED"}
-
-
-class EyedropIfcCsv(bpy.types.Operator):
-    bl_idname = "bim.eyedrop_ifccsv"
-    bl_label = "Query Selected Items"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        global_ids = []
-        self.file = IfcStore.get_file()
-        for obj in context.selected_objects:
-            if hasattr(obj, "BIMObjectProperties") and obj.BIMObjectProperties.ifc_definition_id:
-                global_ids.append("#" + self.file.by_id(obj.BIMObjectProperties.ifc_definition_id).GlobalId)
-        context.scene.CsvProperties.ifc_selector = "|".join(global_ids)
+        refresh_ui_data()
        return {"FINISHED"}


@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-from blenderbim.bim.prop import StrProperty
+from blenderbim.bim.prop import StrProperty, BIMFilterGroup
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -31,10 +31,48 @@ from bpy.props import (
 )


+class CsvAttribute(PropertyGroup):
+    name: StringProperty(name="Query", default="class")
+    header: StringProperty(name="Header Value", default="IFC Class")
+    sort: EnumProperty(items=[("NONE", "None", ""), ("ASC", "Ascending", ""), ("DESC", "Descending", "")])
+    group: EnumProperty(
+        items=[
+            ("NONE", "None", "Don't group any rows"),
+            ("GROUP", "Group", "All rows where this value is identical will be merged"),
+            ("CONCAT", "Concatenation", "Concatenate values if values vary within a group"),
+            ("VARIES", "Varies", "Show a custom value if values vary within a group"),
+            ("SUM", "Sum", "Sums the total value of rows in a group"),
+            ("AVERAGE", "Average", "Averages the total value of rows in a group"),
+            ("MIN", "Min", "Gets the minimum value of rows in a group"),
+            ("MAX", "Max", "Gets the maximum value of rows in a group"),
+        ]
+    )
+    varies_value: StringProperty(default="Varies", name="Varies Value")
+    summary: EnumProperty(
+        items=[
+            ("NONE", "None", "Don't provide a summary row"),
+            ("SUM", "Sum", "Sums the total value of all rows"),
+            ("AVERAGE", "Average", "Averages the total value of all rows"),
+            ("MIN", "Min", "Gets the minimum value of all rows"),
+            ("MAX", "Max", "Gets the maximum value of all rows"),
+        ]
+    )
+    formatting: StringProperty(default="{{value}}", name="Formatting")
+
+
 class CsvProperties(PropertyGroup):
    csv_ifc_file: StringProperty(default="", name="IFC File")
    ifc_selector: StringProperty(default="", name="IFC Selector")
-    csv_attributes: CollectionProperty(name="CSV Attributes", type=StrProperty)
+    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")
+    csv_attributes: CollectionProperty(name="CSV Attributes", type=CsvAttribute)
+    should_generate_svg: BoolProperty(default=False, name="Generate SVG")
+    should_preserve_existing: BoolProperty(default=False, name="Preserve Existing")
+    include_global_id: BoolProperty(default=True, name="Include GlobalId")
+    null_value: StringProperty(default="N/A", name="Null Value")
+    empty_value: StringProperty(default="-", name="Empty String Value")
+    true_value: StringProperty(default="YES", name="True Value")
+    false_value: StringProperty(default="NO", name="False Value")
+    concat_value: StringProperty(default=", ", name="Concat Value")
    csv_delimiter: EnumProperty(
        items=[
            (";", ";", ""),
@@ -55,4 +93,9 @@ class CsvProperties(PropertyGroup):
        default="csv",
    )
    csv_custom_delimiter: StringProperty(default="", name="Custom Delimiter")
+    should_show_settings: BoolProperty(default=False, name="Show Settings")
+    should_show_sort: BoolProperty(default=False, name="Show Sorting")
+    should_show_group: BoolProperty(default=False, name="Show Grouping")
+    should_show_summary: BoolProperty(default=False, name="Show Summary")
+    should_show_formatting: BoolProperty(default=False, name="Show Formatting")
    should_load_from_memory: BoolProperty(default=False, name="Load from Memory")
@@ -16,18 +16,20 @@
 # 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 blenderbim.bim.module.search.data import SearchData


 class BIM_PT_ifccsv(Panel):
-    bl_label = "IFC CSV Import/Export"
+    bl_label = "Spreadsheet Import/Export"
    bl_idname = "BIM_PT_ifccsv"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration"
+    bl_parent_id = "BIM_PT_tab_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -36,45 +38,88 @@ class BIM_PT_ifccsv(Panel):
        props = scene.CsvProperties

        if IfcStore.get_file():
-            row = layout.row()
+            row = layout.row(align=True)
            row.prop(props, "should_load_from_memory")
+            row.operator("bim.import_csv_attributes", icon="IMPORT", text="")
+            row.operator("bim.export_csv_attributes", icon="EXPORT", text="")
+        else:
+            row = layout.row(align=True)
+            row.alignment = "RIGHT"
+            row.operator("bim.import_csv_attributes", icon="IMPORT", text="")
+            row.operator("bim.export_csv_attributes", icon="EXPORT", text="")
+        row.prop(props, "should_show_settings", icon="PREFERENCES", text="")

        if not IfcStore.get_file() or not props.should_load_from_memory:
            row = layout.row(align=True)
            row.prop(props, "csv_ifc_file")
            row.operator("bim.select_csv_ifc_file", icon="FILE_FOLDER", text="")

-        row = layout.row(align=True)
-        row.prop(props, "ifc_selector")
-        row.operator("bim.eyedrop_ifccsv", icon="EYEDROPPER", text="")
-        layout.separator()
+        if props.should_show_settings:
+            layout.use_property_split = True
+            row = layout.row(align=True)
+            row.prop(props, "format")
+
+            if props.format == "csv":
+                row = layout.row(align=True)
+                row.prop(props, "csv_delimiter")
+
+                if props.csv_delimiter == "CUSTOM":
+                    row = layout.row(align=True)
+                    row.prop(props, "csv_custom_delimiter")
+
+            row = layout.row()
+            row.prop(props, "should_generate_svg")
+            row = layout.row()
+            row.prop(props, "should_preserve_existing")
+            row = layout.row()
+            row.prop(props, "include_global_id")
+            row = layout.row()
+            row.prop(props, "null_value")
+            row = layout.row()
+            row.prop(props, "empty_value")
+            row = layout.row()
+            row.prop(props, "true_value")
+            row = layout.row()
+            row.prop(props, "false_value")
+            row = layout.row()
+            row.prop(props, "concat_value")
+            layout.use_property_split = False
+
+        blenderbim.bim.helper.draw_filter(self.layout, props.filter_groups, SearchData, "csv")

        row = layout.row(align=True)
        row.operator("bim.add_csv_attribute", icon="ADD")
-        row.operator("bim.remove_all_csv_attributes", icon="CANCEL")
-        row = layout.row(align=True)
-        row.operator("bim.import_csv_attributes", icon="IMPORT")
-        row.operator("bim.export_csv_attributes", icon="EXPORT")
+        row.prop(props, "should_show_sort", icon="SORTSIZE", text="")
+        row.prop(props, "should_show_group", icon="OUTLINER_COLLECTION", text="")
+        row.prop(props, "should_show_summary", icon="SYNTAX_ON", text="")
+        row.prop(props, "should_show_formatting", icon="CON_TRANSLIKE", text="")

+        total = len(props.csv_attributes)
        for index, attribute in enumerate(props.csv_attributes):
            row = layout.row(align=True)
            row.prop(attribute, "name", text="")
+            row.prop(attribute, "header", text="")
+            if props.should_show_sort:
+                row.prop(attribute, "sort", text="")
+            if props.should_show_group:
+                row.prop(attribute, "group", text="")
+                if attribute.group == "VARIES":
+                    row.prop(attribute, "varies_value", text="")
+            if props.should_show_summary:
+                row.prop(attribute, "summary", text="")
+            if props.should_show_formatting:
+                row.prop(attribute, "formatting", text="")
+            if total > 1:
+                if index != 0:
+                    op = row.operator(f"bim.reorder_csv_attribute", icon="TRIA_UP", text="")
+                    op.old_index = index
+                    op.new_index = index - 1
+                if index + 1 != total:
+                    op = row.operator(f"bim.reorder_csv_attribute", icon="TRIA_DOWN", text="")
+                    op.old_index = index
+                    op.new_index = index + 1
            row.operator("bim.remove_csv_attribute", icon="X", text="").index = index
-        
+
        row = layout.row(align=True)
-        row.prop(props, "format")
-
-        if props.format == 'csv':
-            row = layout.row(align=True)
-            row.prop(props, "csv_delimiter")
-
-            if props.csv_delimiter == "CUSTOM":
-                row = layout.row(align=True)
-                row.prop(props, "csv_custom_delimiter")
-
-        row = layout.row()
-        split = row.split(factor=0.5)
-        c = split.column()
-        c.operator("bim.export_ifccsv", icon="EXPORT", text="Export IFC to " + props.format.upper())
-        c = split.column()
-        c.operator("bim.import_ifccsv", icon="IMPORT")
+        row.operator("bim.export_ifccsv", icon="EXPORT", text="Export IFC to " + props.format.upper())
+        row.operator("bim.import_ifccsv", icon="IMPORT")
@@ -20,23 +20,26 @@ import bpy
 from . import ui, prop, operator

 classes = (
+    operator.ConvertToBlender,
    operator.CopyDebugInformation,
    operator.CreateAllShapes,
    operator.CreateShapeFromStepId,
    operator.InspectFromObject,
    operator.InspectFromStepId,
+    operator.OverrideDisplayType,
    operator.ParseExpress,
    operator.PrintIfcFile,
    operator.PrintObjectPlacement,
    operator.ProfileImportIFC,
    operator.PurgeHdf5Cache,
    operator.PurgeIfcLinks,
-    operator.ConvertToBlender,
    operator.RewindInspector,
    operator.SelectExpressFile,
    operator.SelectHighPolygonMeshes,
    operator.SelectHighestPolygonMeshes,
    operator.ValidateIfcFile,
+    operator.PrintUnusedElementStats,
+    operator.PurgeUnusedElementsByClass,
    prop.BIMDebugProperties,
    ui.BIM_PT_debug,
 )
@@ -116,12 +116,12 @@ class PurgeIfcLinks(bpy.types.Operator):
        context.scene.BIMProperties.ifc_file = ""
        context.scene.BIMDebugProperties.attributes.clear()
        IfcStore.purge()
-        blenderbim.bim.handler.purge_module_data()
+        blenderbim.bim.handler.refresh_ui_data()
        return {"FINISHED"}


 class ConvertToBlender(bpy.types.Operator):
-    bl_idname = "bim.converttoblender"
+    bl_idname = "bim.convert_to_blender"
    bl_label = "Convert To Blender File"
    bl_description = "Removes all IFC data, and converts the file to a simple Blender file."
    bl_options = {"REGISTER", "UNDO"}
@@ -136,7 +136,7 @@ class ConvertToBlender(bpy.types.Operator):
            m.BIMMaterialProperties.ifc_style_id = False
        bpy.context.scene.BIMProperties.ifc_file = ""
        IfcStore.purge()
-        blenderbim.bim.handler.purge_module_data()
+        blenderbim.bim.handler.refresh_ui_data()
        return {"FINISHED"}


@@ -146,14 +146,33 @@ class ValidateIfcFile(bpy.types.Operator):

    @classmethod
    def poll(cls, context):
-        return IfcStore.get_file()
+        return tool.Ifc.get()

    def execute(self, context):
        import ifcopenshell.validate

+        class LogDetectionHandler(logging.Handler):
+            message_logged = False
+
+            def emit(self, record):
+                if not self.message_logged:
+                    self.message_logged = True
+
        logger = logging.getLogger("validate")
        logger.setLevel(logging.DEBUG)
-        ifcopenshell.validate.validate(IfcStore.get_file(), logger, express_rules=True)
+
+        # use LogDetectionHandler to check whether there were any validation errors
+        # during `ifcopenshell.validate.validate`
+        handler = LogDetectionHandler()
+        logger.addHandler(handler)
+        ifcopenshell.validate.validate(tool.Ifc.get(), logger, express_rules=True)
+        logger.removeHandler(handler)
+
+        if handler.message_logged:
+            self.report({"INFO"}, "Check validation results in the system console.")
+        else:
+            self.report({"INFO"}, "No validation issues found.")
+
        return {"FINISHED"}


@@ -216,7 +235,7 @@ class CreateAllShapes(bpy.types.Operator):
                    len(shape.geometry.edges),
                    len(shape.geometry.faces),
                )
-        print(f"Failures: {len(failures)}")
+        self.report({"INFO"}, f"Failed shapes: {len(failures)}, check the system console for details.")
        for failure in failures:
            print(failure)
        return {"FINISHED"}
@@ -228,6 +247,7 @@ class CreateShapeFromStepId(bpy.types.Operator):
    bl_description = "Recreate a mesh object from a STEP ID"
    bl_options = {"REGISTER", "UNDO"}
    should_include_curves: bpy.props.BoolProperty()
+    step_id: bpy.props.IntProperty(default=0)

    @classmethod
    def poll(cls, context):
@@ -240,7 +260,7 @@ class CreateShapeFromStepId(bpy.types.Operator):
        logger = logging.getLogger("ImportIFC")
        self.ifc_import_settings = import_ifc.IfcImportSettings.factory(context, IfcStore.path, logger)
        self.file = IfcStore.get_file()
-        element = self.file.by_id(int(context.scene.BIMDebugProperties.step_id))
+        element = self.file.by_id(self.step_id or int(context.scene.BIMDebugProperties.step_id))
        settings = ifcopenshell.geom.settings()
        if self.should_include_curves:
            settings.set(settings.INCLUDE_CURVES, True)
@@ -378,10 +398,30 @@ class InspectFromObject(bpy.types.Operator):
 class PrintObjectPlacement(bpy.types.Operator):
    bl_idname = "bim.print_object_placement"
    bl_label = "Print Object Placement"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = (
+        "Print object placement to the system console.\n\n" + "ALT+CLICK create an empty object at that position"
+    )
    step_id: bpy.props.IntProperty()
+    create_empty_object: bpy.props.BoolProperty(name="Create Empty Object", default=False, options={"SKIP_SAVE"})
+    arrow_size: bpy.props.FloatProperty(name="Arrow Size", default=0.2, subtype="DISTANCE")
+
+    def invoke(self, context, event):
+        # keep the viewport position on alt+click
+        # make sure to use SKIP_SAVE on property, otherwise it might get stuck
+        if event.type == "LEFTMOUSE" and event.alt:
+            self.create_empty_object = True
+        return self.execute(context)

    def execute(self, context):
-        print(ifcopenshell.util.placement.get_local_placement(IfcStore.get_file().by_id(self.step_id)))
+        placement = ifcopenshell.util.placement.get_local_placement(IfcStore.get_file().by_id(self.step_id))
+        if self.create_empty_object:
+            bpy.ops.object.empty_add(type="ARROWS")
+            si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+            context.active_object.matrix_world = placement.transpose()
+            context.active_object.matrix_world.translation *= si_conversion
+            context.active_object.empty_display_size = self.arrow_size
+        print(placement)
        return {"FINISHED"}


@@ -420,3 +460,58 @@ class PurgeHdf5Cache(bpy.types.Operator):
    def execute(self, context):
        core.purge_hdf5_cache(tool.Debug)
        return {"FINISHED"}
+
+
+class OverrideDisplayType(bpy.types.Operator):
+    bl_idname = "bim.override_display_type"
+    bl_label = "Override Display Type"
+    display: bpy.props.StringProperty()
+
+    def execute(self, context):
+        for obj in context.selected_objects:
+            obj.display_type = self.display
+        return {"FINISHED"}
+
+
+class PrintUnusedElementStats(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.print_unused_elements_stats"
+    bl_label = "Print Unused Elements Stats"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = (
+        "Print all unused elements in current IFC project in system console, not limited to the selected class"
+    )
+
+    ignore_contexts: bpy.props.BoolProperty(name="Ignore Contexts", default=True)
+    ignore_relationships: bpy.props.BoolProperty(name="Ignore Relationships", default=True)
+    ignore_types: bpy.props.BoolProperty(name="Ignore Types", default=True)
+    ignore_styled_items: bpy.props.BoolProperty(name="Ignoer Styled Items", default=True)
+
+    def _execute(self, context):
+        props = context.scene.BIMDebugProperties
+        # ignore some classes that could have zero 0 inverse references by their nature
+        ignore_classes = []
+        if self.ignore_contexts:
+            ignore_classes += ["IfcRepresentationContext"]
+        if self.ignore_relationships:
+            ignore_classes += ["IfcRelationship"]
+        if self.ignore_types:
+            ignore_classes += ["IfcTypeProduct"]
+        if self.ignore_styled_items:
+            ignore_classes += ["IfcStyledItem"]
+
+        unused_elements = tool.Debug.print_unused_elements_stats(props.ifc_class_purge, ignore_classes)
+        self.report({"INFO"}, f"{unused_elements} unused elements found, check the system console for the details.")
+
+
+class PurgeUnusedElementsByClass(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.purge_unused_elements_by_class"
+    bl_label = "Purge Unused Elements By Class"
+    bl_description = (
+        "Will find all elements of class that have no inverse refernces and will remove them, use very carefully"
+    )
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMDebugProperties
+        purged_elements = core.purge_unused_elements(tool.Ifc, tool.Debug, props.ifc_class_purge)
+        self.report({"INFO"}, f"{purged_elements} unused elements found and removed.")
@@ -40,3 +40,14 @@ class BIMDebugProperties(PropertyGroup):
    inverse_attributes: CollectionProperty(name="Inverse Attributes", type=Attribute)
    inverse_references: CollectionProperty(name="Inverse References", type=Attribute)
    express_file: StringProperty(name="Express File")
+    display_type: EnumProperty(
+        items=[
+            ("BOUNDS", "Bounds", ""),
+            ("WIRE", "Wire", ""),
+            ("SOLID", "Solid", ""),
+            ("TEXTURED", "Textured", ""),
+        ],
+        name="Display Type",
+        default="BOUNDS",
+    )
+    ifc_class_purge: StringProperty(name="Unused Elements IFC Class", default="")
@@ -21,13 +21,13 @@ from bpy.types import Panel


 class BIM_PT_debug(Panel):
-    bl_label = "IFC Debug"
+    bl_label = "Debug"
    bl_idname = "BIM_PT_debug"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_quality_control"
+    bl_parent_id = "BIM_PT_tab_quality_control"

    def draw(self, context):
        layout = self.layout
@@ -58,7 +58,10 @@ class BIM_PT_debug(Panel):
        row.operator("bim.purge_ifc_links")

        row = layout.row()
-        row.operator("bim.converttoblender")
+        row.operator("bim.update_representation", text="Manually Save Representation")
+
+        row = layout.row()
+        row.operator("bim.convert_to_blender")

        row = layout.row()
        row.operator("bim.create_all_shapes")
@@ -80,6 +83,20 @@ class BIM_PT_debug(Panel):
        ).percentile = context.scene.BIMDebugProperties.percentile_of_polygons
        row.prop(props, "percentile_of_polygons", text="")

+        row = layout.split(factor=0.5, align=True)
+        row.prop(props, "display_type", text="")
+        row.operator("bim.override_display_type").display = context.scene.BIMDebugProperties.display_type
+
+        if context.active_object and context.active_object.data:
+            mprops = context.active_object.data.BIMMeshProperties
+            row = layout.row()
+            row.operator("bim.get_representation_ifc_parameters")
+            for index, ifc_parameter in enumerate(mprops.ifc_parameters):
+                row = layout.row(align=True)
+                row.prop(ifc_parameter, "name", text="")
+                row.prop(ifc_parameter, "value", text="")
+                row.operator("bim.update_parametric_representation", icon="FILE_REFRESH", text="").index = index
+
        layout.label(text="Inspector:")

        row = layout.row(align=True)
@@ -20,11 +20,12 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.SelectDiffJsonFile,
-    operator.VisualiseDiff,
-    operator.SelectDiffOldFile,
-    operator.SelectDiffNewFile,
    operator.ExecuteIfcDiff,
+    operator.SelectDiffJsonFile,
+    operator.SelectDiffNewFile,
+    operator.SelectDiffObjects,
+    operator.SelectDiffOldFile,
+    operator.VisualiseDiff,
    prop.Relationships,
    prop.DiffProperties,
    ui.BIM_PT_diff,
--- a/Show More
+++ b/Show More