diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f6455690..c0de5bc6c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,17 @@ jobs:
         run: |
           brew install libsodium openssl
           rustup target add wasm32-unknown-unknown
+      - name: Build Holochain
+        env:
+          SQLCIPHER_STATIC: 1
+          LDFLAGS: "-L/usr/local/opt/openssl/lib"
+          CPPFLAGS: "-I/usr/local/opt/openssl/include"
+          PKG_CONFIG_PATH: "/usr/local/opt/openssl/lib/pkgconfig"
+        run: |
+          cargo install lair_keystore --git https://github.com/holochain/lair --rev bd92b76ad9cc18bc0c0db215e4bea9767c9003cf
+          cargo install holochain --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
+          cargo install holochain_cli --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
+          ./scripts/copy-hc.sh
       - name: Cache cargo registry
         uses: actions/cache@v1
         with:
@@ -45,17 +56,6 @@ jobs:
         with:
           path: ~/.cargo/bin
           key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
-      - name: Build Holochain
-        env:
-          SQLCIPHER_STATIC: 1
-          LDFLAGS: "-L/usr/local/opt/openssl/lib"
-          CPPFLAGS: "-I/usr/local/opt/openssl/include"
-          PKG_CONFIG_PATH: "/usr/local/opt/openssl/lib/pkgconfig"
-        run: |
-          cargo install lair_keystore --git https://github.com/holochain/lair --rev bd92b76ad9cc18bc0c0db215e4bea9767c9003cf
-          cargo install holochain --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
-          cargo install holochain_cli --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
-          ./scripts/copy-hc.sh
       - name: Install Node.js, NPM & Yarn
         uses: actions/setup-node@v2
         with:
@@ -78,8 +78,8 @@ jobs:
       - name: Cache macOS release (x64)
         uses: actions/upload-artifact@v1
         with:
-          name: Junto-${{steps.ref.outputs.version}}.dmg
-          path: ./dist_electron/Junto-${{steps.ref.outputs.version}}.dmg
+          name: Flux-${{steps.ref.outputs.version}}.dmg
+          path: ./dist_electron/Flux-${{steps.ref.outputs.version}}.dmg
       - name: Cache latest-mac.yml
         uses: actions/upload-artifact@v1
         with:
@@ -124,8 +124,8 @@ jobs:
   #     - name: Cache nsis release
   #       uses: actions/upload-artifact@v1
   #       with:
-  #         name: Junto Setup ${{steps.ref.outputs.version}}.exe
-  #         path: ./dist_electron/Junto Setup ${{steps.ref.outputs.version}}.exe
+  #         name: Flux Setup ${{steps.ref.outputs.version}}.exe
+  #         path: ./dist_electron/Flux Setup ${{steps.ref.outputs.version}}.exe
   #     - name: Cache latest-windows.yml
   #       uses: actions/upload-artifact@v1
   #       with:
@@ -150,6 +150,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev
           rustup target add wasm32-unknown-unknown
+      - name: Build Holochain
+        env:
+          SQLCIPHER_STATIC: 1
+        run: |
+          cargo install lair_keystore --git https://github.com/holochain/lair --rev bd92b76ad9cc18bc0c0db215e4bea9767c9003cf
+          cargo install holochain --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
+          cargo install holochain_cli --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
+          ./scripts/copy-hc.sh
       - name: Cache cargo registry
         uses: actions/cache@v1
         with:
@@ -165,14 +173,6 @@ jobs:
         with:
           path: ~/.cargo/bin
           key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
-      - name: Build Holochain
-        env:
-          SQLCIPHER_STATIC: 1
-        run: |
-          cargo install lair_keystore --git https://github.com/holochain/lair --rev bd92b76ad9cc18bc0c0db215e4bea9767c9003cf
-          cargo install holochain --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
-          cargo install holochain_cli --git https://github.com/holochain/holochain --rev af7de6eca55d8dd3d22bbfccee738fd11f2a2e12
-          ./scripts/copy-hc.sh
       - name: Install Node.js, NPM & Yarn
         uses: actions/setup-node@v2
         with:
@@ -193,13 +193,13 @@ jobs:
       - name: Cache AppImage
         uses: actions/upload-artifact@v1
         with:
-          name: Junto-${{steps.ref.outputs.version}}.AppImage
-          path: ./dist_electron/Junto-${{steps.ref.outputs.version}}.AppImage
+          name: Flux-${{steps.ref.outputs.version}}.AppImage
+          path: ./dist_electron/Flux-${{steps.ref.outputs.version}}.AppImage
       - name: Cache .deb release (x64)
         uses: actions/upload-artifact@v1
         with:
-          name: junto_${{steps.ref.outputs.version}}_amd64.deb
-          path: ./dist_electron/junto_${{steps.ref.outputs.version}}_amd64.deb
+          name: flux_${{steps.ref.outputs.version}}_amd64.deb
+          path: ./dist_electron/flux_${{steps.ref.outputs.version}}_amd64.deb
       - name: Cache latest-linux.yml
         uses: actions/upload-artifact@v1
         with:
@@ -225,22 +225,22 @@ jobs:
       - name: Download AppImage
         uses: actions/download-artifact@v1
         with:
-          name: Junto-${{steps.ref.outputs.version}}.AppImage
+          name: Flux-${{steps.ref.outputs.version}}.AppImage
           path: .
       - name: Download deb
         uses: actions/download-artifact@v1
         with:
-          name: junto_${{steps.ref.outputs.version}}_amd64.deb
+          name: flux_${{steps.ref.outputs.version}}_amd64.deb
           path: .
       - name: Download macOS image
         uses: actions/download-artifact@v1
         with:
-          name: Junto-${{steps.ref.outputs.version}}.dmg
+          name: Flux-${{steps.ref.outputs.version}}.dmg
           path: .
       # - name: Download Windows Exe
       #   uses: actions/download-artifact@v1
       #   with:
-      #     name: Junto Setup ${{steps.ref.outputs.version}}.exe
+      #     name: Flux Setup ${{steps.ref.outputs.version}}.exe
       #     path: .
       # - name: Download latest-windows.yml
       #   uses: actions/download-artifact@v1
@@ -259,9 +259,9 @@ jobs:
           path: .
       - name: Generate SHA256 checksums
         run: |
-          sha256sum "junto_${{steps.ref.outputs.version}}_amd64.deb" >> "SHA256SUMS.txt"
-          sha256sum "Junto-${{steps.ref.outputs.version}}.AppImage" >> "SHA256SUMS.txt"
-          sha256sum "Junto-${{steps.ref.outputs.version}}.dmg" >> "SHA256SUMS.txt"
+          sha256sum "flux_${{steps.ref.outputs.version}}_amd64.deb" >> "SHA256SUMS.txt"
+          sha256sum "Flux-${{steps.ref.outputs.version}}.AppImage" >> "SHA256SUMS.txt"
+          sha256sum "Flux-${{steps.ref.outputs.version}}.dmg" >> "SHA256SUMS.txt"
           sha256sum "latest-linux.yml" >> "SHA256SUMS.txt"
           sha256sum "latest-mac.yml" >> "SHA256SUMS.txt"
       - name: Verify checksums
@@ -282,8 +282,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.github_token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./junto_${{steps.ref.outputs.version}}_amd64.deb
-          asset_name: junto_${{steps.ref.outputs.version}}_amd64.deb
+          asset_path: ./flux_${{steps.ref.outputs.version}}_amd64.deb
+          asset_name: flux_${{steps.ref.outputs.version}}_amd64.deb
           asset_content_type: application/octet-stream
       - name: Upload AppImage binary (arm64)
         uses: actions/upload-release-asset@v1.0.1
@@ -291,8 +291,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.github_token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Junto-${{steps.ref.outputs.version}}.AppImage
-          asset_name: Junto-${{steps.ref.outputs.version}}.AppImage
+          asset_path: ./Flux-${{steps.ref.outputs.version}}.AppImage
+          asset_name: Flux-${{steps.ref.outputs.version}}.AppImage
           asset_content_type: application/octet-stream
       - name: Upload macOS image
         uses: actions/upload-release-asset@v1.0.1
@@ -300,8 +300,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Junto-${{steps.ref.outputs.version}}.dmg
-          asset_name: Junto-${{steps.ref.outputs.version}}.dmg
+          asset_path: ./Flux-${{steps.ref.outputs.version}}.dmg
+          asset_name: Flux-${{steps.ref.outputs.version}}.dmg
           asset_content_type: application/octet-stream
       # - name: Upload Windows exe
       #   uses: actions/upload-release-asset@v1.0.1
@@ -309,8 +309,8 @@ jobs:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       #   with:
       #     upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ./Junto Setup ${{steps.ref.outputs.version}}.exe
-      #     asset_name: Junto Setup ${{steps.ref.outputs.version}}.exe
+      #     asset_path: ./Flux Setup ${{steps.ref.outputs.version}}.exe
+      #     asset_name: Flux Setup ${{steps.ref.outputs.version}}.exe
       #     asset_content_type: application/octet-stream
       - name: Upload latest-linux.yml
         uses: actions/upload-release-asset@v1.0.1
diff --git a/.gitignore b/.gitignore
index b33cb6367..b515241a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,6 @@ pnpm-debug.log*
 #Electron-builder output
 /dist_electron
 
-coverage
\ No newline at end of file
+coverage
+
+cachedb
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7c0342f0..b893d58db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,38 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).  
 This project *loosely* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). More specifically:
 
+## [0.2.8] - 15/10/2021
+
+### Added
+ - Added button to copy log file to desktop when global error is shown
+ - Members on community now also added by signals
+
+### Changed
+ - New Flux logo's!
+ - Renamed application name from Junto -> Flux where applicable
+ - Loading screen now uses flux wordmark
+ - Cache service now uses levelDB
+ - Store now only saves array of did's for user instead of entire profile data to save bloating the store
+ - Logo's and animations now use flux design 
+
+### Deprecated
+
+### Removed
+ - Old files & images
+ - Member & group expression workers removed and replaced with single gql call on community route change
+ - Logout option
+
+### Fixed
+ - Global variables now used for all places where worker polling happens and poll delay used
+ - MessageView now only tries to load unique did profiles for expression messages and not duplicate agents
+ - Now correctly using thumbnail for rendering profile images on messages
+ - Added id to expression worker loops to avoid duplicate getExpression calls when resolving signals / links 
+ - Home channel now shows correct name in Channel header information
+
+### Security
+
+---
+
 ## [0.2.7] - 11/10/2021
 
 ### Added
diff --git a/build/icon.png b/build/icon.png
index 950f0902d..211495903 100644
Binary files a/build/icon.png and b/build/icon.png differ
diff --git a/dna-rollup.js b/dna-rollup.js
deleted file mode 100644
index 8b7c91445..000000000
--- a/dna-rollup.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import fs from "fs";
-
-export default function dna() {
-  return {
-    name: "dna",
-    load: function load(id) {
-      if (!id.endsWith(".dna")) return null;
-      var base64 = fs.readFileSync(id, "base64").replace(/[\r\n]+/gm, "");
-      var code = `var dna = "${base64}"; \nexport default dna;`;
-      return code.trim();
-    },
-  };
-}
diff --git a/index.html b/index.html
deleted file mode 100644
index 3276e5d47..000000000
--- a/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body style="background: white;">
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index 6a02856b8..f8fab562f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -4,10 +4,7 @@ const { pathsToModuleNameMapper } = require("ts-jest/utils");
 const { compilerOptions } = require("./tsconfig");
 
 const esModules = [
-  // "@junto-foundation/junto-elements",
   "runtime-dom",
-  "register-service-worker",
-  // "vue-advanced-cropper",
   "vue3-observe-visibility2",
   "vue3-virtual-scroller",
 ].join("|");
diff --git a/package.json b/package.json
index 483224850..4f1ebe4c2 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "junto",
-  "version": "0.2.7",
+  "name": "flux",
+  "version": "0.2.8",
   "private": true,
-  "description": "Junto ad4m chat application leveraging distributed & decentralized technologies",
+  "description": "A social web3 tool kit for communities",
   "author": "josh@junto.foundation",
   "repository": {
     "type": "git",
-    "url": "https://github.com/juntofoundation/communities.git"
+    "url": "https://github.com/juntofoundation/flux.git"
   },
   "scripts": {
     "lint": "vue-cli-service lint",
@@ -29,16 +29,15 @@
     "@perspect3vism/ad4m": "0.1.18",
     "@perspect3vism/ad4m-executor": "0.1.18",
     "@tiptap/vue-3": "^2.0.0-beta.45",
-    "@vue/apollo-util": "^4.0.0-alpha.11",
     "core-js": "^3.15.2",
     "date-fns": "^2.22.1",
     "datocms-structured-text-utils": "^1.2.0",
     "electron-updater": "^4.3.9",
     "graphql": "^15.5.0",
+    "idb": "^6.1.4",
+    "level": "^7.0.1",
     "patch-package": "^6.4.7",
     "pinia": "^2.0.0-rc.4",
-    "register-service-worker": "^1.7.1",
-    "subscriptions-transport-ws": "^0.9.19",
     "uuid": "^8.3.2",
     "vue": "^3.0.0",
     "vue-advanced-cropper": "^2.3.1",
@@ -53,6 +52,7 @@
     "@testing-library/vue": "^6.4.2",
     "@types/electron-devtools-installer": "^2.2.0",
     "@types/jest": "^26.0.20",
+    "@types/level": "^6.0.0",
     "@types/mocha": "^8.2.1",
     "@types/object-hash": "^2.1.1",
     "@types/uuid": "^8.3.0",
@@ -73,6 +73,7 @@
     "babel-jest": "^26.0.0",
     "babel-plugin-parameter-decorator": "^1.0.16",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
+    "canvas": "^2.8.0",
     "easygraphql-tester": "^6.0.1",
     "electron": "15.1.1",
     "electron-devtools-installer": "^3.1.0",
@@ -97,6 +98,7 @@
     "webpack-node-externals": "^2.5.2"
   },
   "contributors": [
-    "eric@junto.foundation"
+    "eric@junto.foundation",
+    "kaichaosuna@gmail.com"
   ]
 }
diff --git a/public/img/icons/favicon-128x128@5x.png b/public/img/icons/favicon-128x128@5x.png
deleted file mode 100644
index fae245e19..000000000
Binary files a/public/img/icons/favicon-128x128@5x.png and /dev/null differ
diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png
deleted file mode 100644
index 30ce3fe1b..000000000
Binary files a/public/img/icons/favicon-16x16.png and /dev/null differ
diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png
index 49a80bee6..73cd0e115 100644
Binary files a/public/img/icons/favicon-32x32.png and b/public/img/icons/favicon-32x32.png differ
diff --git a/public/img/icons/favicon-white-16x16.png b/public/img/icons/favicon-white-16x16.png
deleted file mode 100644
index 6d9b0eaf7..000000000
Binary files a/public/img/icons/favicon-white-16x16.png and /dev/null differ
diff --git a/public/img/icons/favicon-white-32x32@2x.png b/public/img/icons/favicon-white-32x32@2x.png
deleted file mode 100644
index 461dbe720..000000000
Binary files a/public/img/icons/favicon-white-32x32@2x.png and /dev/null differ
diff --git a/public/img/icons/icon.png b/public/img/icons/icon.png
new file mode 100644
index 000000000..87e68db2d
Binary files /dev/null and b/public/img/icons/icon.png differ
diff --git a/public/img/icons/junto-white.png b/public/img/icons/junto-white.png
deleted file mode 100644
index 65d8d58c4..000000000
Binary files a/public/img/icons/junto-white.png and /dev/null differ
diff --git a/public/img/icons/junto_web_logo--rainbow.png b/public/img/icons/junto_web_logo--rainbow.png
deleted file mode 100644
index ba90e6afa..000000000
Binary files a/public/img/icons/junto_web_logo--rainbow.png and /dev/null differ
diff --git a/public/img/icons/logo.svg b/public/img/icons/logo.svg
new file mode 100644
index 000000000..2d089692e
--- /dev/null
+++ b/public/img/icons/logo.svg
@@ -0,0 +1,6 @@
+<svg width="1332" height="344" viewBox="0 0 1332 344" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 0H283.786V62.6259H75.387V133.073H260.825V194.833H75.387V337.913H0V0Z" fill="var(--j-color-black)"/>
+<path d="M307.592 0H382.545V275.287H579.68V337.913H307.592V0Z" fill="var(--j-color-black)"/>
+<path d="M664.373 -0.000449566V35.7361C664.373 112.578 635.04 118.432 635.04 152.822C635.04 202.015 690.535 275.287 754.929 275.287C768.742 275.665 782.444 272.703 794.877 266.648C807.31 260.593 818.109 251.624 826.362 240.499C856.604 203.536 809.082 179.854 809.082 135.819C809.082 104.413 845.478 93.59 845.478 51.3306V-0.00634766H920.841V58.0176C920.841 73.7685 917.153 89.2979 910.077 103.356L898.578 126.211C891.307 140.691 889.771 157.399 894.282 172.97C906.28 214.505 924.367 249.317 885.798 292.627C858.535 323.26 818.811 343.994 754.905 343.994C690.998 343.994 640.756 310.057 622.176 269.138C586.706 191.04 495.65 202.751 495.65 159.453C495.65 134.388 513.172 122.491 547.397 100.416C576.188 81.8622 588.944 65.3245 588.944 1.81764V0.00692305H664.331L664.373 -0.000449566Z" fill="var(--j-color-black)"/>
+<path d="M1135.73 213.967L1031.75 337.913H936.862L1089.8 164.393L942.927 0H1043.01L1135.3 116.983L1225.41 0H1325.5L1181.66 166.562L1332 337.913H1237.11L1135.73 213.967Z" fill="var(--j-color-black)"/>
+</svg>
diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg
deleted file mode 100644
index e44c0d5b0..000000000
--- a/public/img/icons/safari-pinned-tab.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/>
-</svg>
diff --git a/public/loading.html b/public/loading.html
index 986924e16..4985c34ae 100644
--- a/public/loading.html
+++ b/public/loading.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <title>Communities</title>
+    <title>Flux</title>
     <link
       rel="stylesheet"
       href="https://cdn.jsdelivr.net/npm/@junto-foundation/junto-elements@0.0.9/dist/main.css"
@@ -29,11 +29,29 @@
   </style>
   <body>
     <div class="main">
-      <img 
-      width="150rem"
-      style="margin-bottom: 30px;"
-      src="./img/icons/junto_web_logo--rainbow.png" />
-      <j-text size="1000">Junto</j-text>
+      <svg
+        width="300px"
+        viewBox="0 0 1332 344"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M0 0H283.786V62.6259H75.387V133.073H260.825V194.833H75.387V337.913H0V0Z"
+          fill="var(--j-color-black)"
+        />
+        <path
+          d="M307.592 0H382.545V275.287H579.68V337.913H307.592V0Z"
+          fill="var(--j-color-black)"
+        />
+        <path
+          d="M664.373 -0.000449566V35.7361C664.373 112.578 635.04 118.432 635.04 152.822C635.04 202.015 690.535 275.287 754.929 275.287C768.742 275.665 782.444 272.703 794.877 266.648C807.31 260.593 818.109 251.624 826.362 240.499C856.604 203.536 809.082 179.854 809.082 135.819C809.082 104.413 845.478 93.59 845.478 51.3306V-0.00634766H920.841V58.0176C920.841 73.7685 917.153 89.2979 910.077 103.356L898.578 126.211C891.307 140.691 889.771 157.399 894.282 172.97C906.28 214.505 924.367 249.317 885.798 292.627C858.535 323.26 818.811 343.994 754.905 343.994C690.998 343.994 640.756 310.057 622.176 269.138C586.706 191.04 495.65 202.751 495.65 159.453C495.65 134.388 513.172 122.491 547.397 100.416C576.188 81.8622 588.944 65.3245 588.944 1.81764V0.00692305H664.331L664.373 -0.000449566Z"
+          fill="var(--j-color-black)"
+        />
+        <path
+          d="M1135.73 213.967L1031.75 337.913H936.862L1089.8 164.393L942.927 0H1043.01L1135.3 116.983L1225.41 0H1325.5L1181.66 166.562L1332 337.913H1237.11L1135.73 213.967Z"
+          fill="var(--j-color-black)"
+        />
+      </svg>
     </div>
   </body>
 </html>
diff --git a/scripts/clean-state.command b/scripts/clean-state.command
index ceda93a47..dc602b801 100755
--- a/scripts/clean-state.command
+++ b/scripts/clean-state.command
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    path="$HOME/.config/junto"
+    path="$HOME/.config/flux"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    path="$HOME/Library/Application Support/junto"
+    path="$HOME/Library/Application Support/flux"
 fi
 
 echo "Will delete path: $path"
diff --git a/scripts/clean-state.js b/scripts/clean-state.js
index 6e3438ea7..ab798e59a 100644
--- a/scripts/clean-state.js
+++ b/scripts/clean-state.js
@@ -30,16 +30,16 @@ async function main() {
         process.env.HOME,
         "Library",
         "Application Support",
-        "junto"
+        "flux"
       );
       break;
     }
     case "win32": {
-      configPath = path.join(process.env.APPDATA, "junto");
+      configPath = path.join(process.env.APPDATA, "flux");
       break;
     }
     case "linux": {
-      configPath = path.join(process.env.HOME, ".config", "junto");
+      configPath = path.join(process.env.HOME, ".config", "flux");
       break;
     }
   }
diff --git a/src/App.vue b/src/App.vue
index fe715965f..bb47fc847 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,6 +30,11 @@
         <div class="global-error__message">
           {{ globalError.message }}
         </div>
+        <j-text nomargin variant="heading">
+          If you have also been asked to include a log file with your report,
+          click the button below to copy a log file to your desktop:
+        </j-text>
+        <j-button @click="copyLogFile" variant="primary">Copy</j-button>
       </j-flex>
     </div>
   </div>
@@ -40,8 +45,7 @@ import { useRoute, useRouter } from "vue-router";
 import { gql } from "@apollo/client/core";
 import { defineComponent, computed, watch } from "vue";
 import { onError } from "@apollo/client/link/error";
-import { logErrorMessages } from "@vue/apollo-util";
-import { expressionGetDelayMs, expressionGetRetries } from "@/core/juntoTypes";
+import { expressionGetDelayMs, expressionGetRetries } from "@/constants/config";
 import { GET_EXPRESSION } from "@/core/graphql_queries";
 import {
   ApplicationState,
@@ -56,8 +60,9 @@ import { useUserStore } from "./store/user";
 import { useAppStore } from "./store/app";
 import { useDataStore } from "./store/data";
 import { addTrustedAgents } from "@/core/mutations/addTrustedAgents";
-import { JUNTO_AGENT, AD4M_AGENT } from "@/ad4m-globals";
+import { JUNTO_AGENT, AD4M_AGENT } from "@/constants/agents";
 import { ad4mClient } from "./app";
+import { MEMBER } from "./constants/neighbourhoodMeta";
 
 declare global {
   interface Window {
@@ -77,9 +82,6 @@ export default defineComponent({
     onError((error) => {
       console.log("Got global graphql error, logging with error", error);
       if (process.env.NODE_ENV !== "production") {
-        // can use error.operation.operationName to single out a query type.
-        logErrorMessages(error);
-
         appStore.showDangerToast({
           message: JSON.stringify(error),
         });
@@ -109,6 +111,7 @@ export default defineComponent({
         const expressionWorker = new Worker("pollingWorker.js");
 
         expressionWorker.postMessage({
+          id: link.data!.target!,
           retry: expressionGetRetries,
           interval: expressionGetDelayMs,
           query: print(GET_EXPRESSION),
@@ -147,6 +150,15 @@ export default defineComponent({
             value: true,
           });
         });
+      } else if (link.data!.predicate! === MEMBER) {
+        const did = link.data!.target!.split("://")[1];
+        console.log("Got new member in signal! Parsed out did: ", did);
+        if (did) {
+          dataStore.setNeighbourhoodMember({
+            member: did,
+            perspectiveUuid: perspective,
+          });
+        }
       }
     };
 
@@ -275,6 +287,15 @@ export default defineComponent({
       this.userStore.updateAgentStatus(status);
     });
   },
+  methods: {
+    copyLogFile() {
+      window.api.send("copyLogs");
+      this.appStore.showSuccessToast({
+        message:
+          "Log file called debug.log been copied to your desktop, please upload to Junto Discord, thanks <3",
+      });
+    },
+  },
 });
 </script>
 
diff --git a/src/__tests__/graphql.ts b/src/__tests__/graphql.ts
index f96fccd7b..f1ffef46f 100644
--- a/src/__tests__/graphql.ts
+++ b/src/__tests__/graphql.ts
@@ -33,7 +33,7 @@ import {
 } from "../core/graphql_queries";
 import EasyGraphQLTester from "easygraphql-tester";
 import { DocumentNode } from "graphql";
-import { SOCIAL_CONTEXT_OFFICIAL } from "@/ad4m-globals";
+import { SOCIAL_CONTEXT_OFFICIAL } from "@/constants/languages";
 
 const tester = new EasyGraphQLTester(typeDefsString);
 
diff --git a/src/__tests__/store/data/actions/createCommunity.ts b/src/__tests__/store/data/actions/createCommunity.ts
index 1ca4f1e53..893d1b4dc 100644
--- a/src/__tests__/store/data/actions/createCommunity.ts
+++ b/src/__tests__/store/data/actions/createCommunity.ts
@@ -1,4 +1,3 @@
-import community from "../../../fixtures/community.json";
 import createCommunityPerspective from "../../../fixtures/createCommunityPerspective.json";
 import createCommunityUniqueHolochainLanguage from "../../../fixtures/createCommunityUniqueHolochainLanguage.json";
 import createCommunityLinkType from "../../../fixtures/createCommunityLinkType.json";
@@ -19,7 +18,11 @@ import * as createChannel from "@/core/methods/createChannel";
 import * as getLanguage from "@/core/queries/getLanguage";
 import { createPinia, Pinia, setActivePinia } from "pinia";
 import { useDataStore } from "@/store/data";
-import { GROUP_EXPRESSION_OFFICIAL, SHORTFORM_EXPRESSION_OFFICIAL, SOCIAL_CONTEXT_OFFICIAL } from "@/ad4m-globals";
+import {
+  GROUP_EXPRESSION_OFFICIAL,
+  SHORTFORM_EXPRESSION_OFFICIAL,
+  SOCIAL_CONTEXT_OFFICIAL,
+} from "@/constants/languages";
 
 describe("Create Community", () => {
   let store: Pinia;
diff --git a/src/__tests__/store/data/actions/showMessageNotifications.ts b/src/__tests__/store/data/actions/showMessageNotifications.ts
index eb9a095e8..3a6e0b56c 100644
--- a/src/__tests__/store/data/actions/showMessageNotifications.ts
+++ b/src/__tests__/store/data/actions/showMessageNotifications.ts
@@ -5,26 +5,47 @@ import getProfileFixture from "../../../fixtures/getProfile.json";
 import * as agentUnlock from "../../../../core/mutations/agentUnlock";
 import lockAgentFixture from "../../../fixtures/lockAgent.json";
 import { AgentStatus, Expression } from "@perspect3vism/ad4m";
-import { TimeoutCache } from "@/utils/timeoutCache";
-import { ExpressionTypes } from "@/store/types";
+import { ExpressionTypes, ProfileExpression } from "@/store/types";
 import * as getExpressionNoCache from "@/core/queries/getExpression";
 import { createPinia, Pinia, setActivePinia } from "pinia";
 import { useUserStore } from "@/store/user";
 import { useDataStore } from "@/store/data";
 
+const testProfile = {
+  did: initAgentFixture.did,
+  data: JSON.parse(getProfileFixture.data!)
+} as ProfileExpression;
+
+
+jest.mock('@/utils/timeoutCache', () => {
+  return {
+    TimeoutCache: jest.fn().mockImplementation(() => {
+      return {
+        set: jest.fn(),
+        get: (link: string) => {
+          if (link.includes('101')) {
+            return undefined
+          } else {
+            return testProfile;
+          }
+        },
+        remove: jest.fn(),
+      };
+    })
+  };
+});
+
 describe("Show Message Notification", () => {
   let store: Pinia;
   let profileLangAddress: string;
   let did: string;
   let profileLink: string;
 
-  beforeAll(() => {
+  beforeAll(async () => {
     Object.defineProperty(global, "Notification", {
       value: jest.fn(),
     });
 
-    const cache = new TimeoutCache<any>(10);
-
     profileLangAddress = community.neighbourhood.typedExpressionLanguages.find(
       (t: any) => t.expressionType === ExpressionTypes.ProfileExpression
     )!.languageAddress!;
@@ -32,8 +53,6 @@ describe("Show Message Notification", () => {
     did = initAgentFixture.did;
 
     profileLink = `${profileLangAddress}://${did}`;
-
-    cache.remove(profileLink);
   });
 
   beforeEach(() => {
diff --git a/src/__tests__/utils/profileHelpers.ts b/src/__tests__/utils/profileHelpers.ts
index d082935af..a58a6f16a 100644
--- a/src/__tests__/utils/profileHelpers.ts
+++ b/src/__tests__/utils/profileHelpers.ts
@@ -1,18 +1,44 @@
-import { ExpressionTypes } from "@/store/types";
-import { getProfile } from "@/utils/profileHelpers";
-import { TimeoutCache } from "@/utils/timeoutCache";
+import { ExpressionTypes, ProfileExpression } from "@/store/types";
+import { getProfile, parseProfile } from "@/utils/profileHelpers";
+import {TimeoutCache} from "@/utils/timeoutCache";
 import community from "../fixtures/community.json";
 import initAgentFixture from "../fixtures/initAgent.json";
 import getProfileFixture from "../fixtures/getProfile.json";
 import * as getExpressionNoCache from "@/core/queries/getExpression";
 import { Expression } from "@perspect3vism/ad4m";
+import { mocked } from 'ts-jest/utils';
+
+const testProfile = {
+  did: initAgentFixture.did,
+  data: JSON.parse(getProfileFixture.data!)
+} as ProfileExpression;
+
+jest.mock('@/utils/timeoutCache', () => {
+  return {
+    TimeoutCache: jest.fn().mockImplementation(() => {
+      return {
+        set: jest.fn(),
+        get: (link: string) => {
+          if (link.includes('101')) {
+            return undefined
+          } else {
+            return testProfile;
+          }
+        },
+        remove: jest.fn(),
+      };
+    })
+  };
+});
 
 describe("ProfileHelpers", () => {
+  const MockedSoundPlayer = mocked(TimeoutCache, true);
+  
   let profileLangAddress: string;
   let did: string;
   let profileLink: string;
 
-  beforeAll(() => {
+  beforeAll(async () => {
     const cache = new TimeoutCache<any>(10);
 
     profileLangAddress = community.neighbourhood.typedExpressionLanguages.find(
@@ -23,11 +49,12 @@ describe("ProfileHelpers", () => {
 
     profileLink = `${profileLangAddress}://${did}`;
 
-    cache.remove(profileLink);
+    await cache.remove(profileLink);
   });
 
   beforeEach(() => {
-    // @ts-ignore
+    MockedSoundPlayer.mockClear();
+
     jest
       .spyOn(getExpressionNoCache, "getExpressionNoCache")
       .mockImplementation(async (url) => {
@@ -41,59 +68,20 @@ describe("ProfileHelpers", () => {
   });
 
   test("Test fetch profile with wrong did", async () => {
-    const cache = new TimeoutCache<any>(10);
-
-    expect(cache.get(profileLink)).toBeUndefined();
-
-    const testProfile = {
-      author: getProfileFixture.author!,
-      data: JSON.parse(getProfileFixture.data!),
-      timestamp: getProfileFixture.timestamp!,
-      proof: getProfileFixture.proof!,
-    };
-
     const profile = await getProfile(profileLangAddress, `${did}101`);
 
     expect(profile).toStrictEqual(null);
-    expect(cache.get(profileLink)).toBeUndefined();
   });
 
   test("Test fetch the correct profile", async () => {
-    const cache = new TimeoutCache<any>(10);
-
-    expect(cache.get(profileLink)).toBeUndefined();
-
-    const testProfile = {
-      author: getProfileFixture.author!,
-      data: JSON.parse(getProfileFixture.data!),
-      timestamp: getProfileFixture.timestamp!,
-      proof: getProfileFixture.proof!,
+    const newTestProfile = {
+      did: testProfile.did,
+      ...parseProfile(testProfile.data.profile)
     };
 
     const profile = await getProfile(profileLangAddress, did);
 
-    expect(profile).toStrictEqual(testProfile);
-    expect(cache.get(profileLink)).not.toBeUndefined();
-    expect(cache.get(profileLink)).toStrictEqual(testProfile);
-  });
-
-  test("Test fetch the correct profile from cache", async () => {
-    const cache = new TimeoutCache<any>(10);
-
-    const testProfile = {
-      author: getProfileFixture.author!,
-      data: JSON.parse(getProfileFixture.data!),
-      timestamp: getProfileFixture.timestamp!,
-      proof: getProfileFixture.proof!,
-    };
-
-    expect(cache.get(profileLink)).not.toBeUndefined();
-    expect(cache.get(profileLink)).toStrictEqual(testProfile);
-
-    const profile = await getProfile(profileLangAddress, did);
 
-    expect(profile).toStrictEqual(testProfile);
-    expect(cache.get(profileLink)).not.toBeUndefined();
-    expect(cache.get(profileLink)).toStrictEqual(testProfile);
+    expect(profile).toStrictEqual(newTestProfile);
   });
 });
diff --git a/src/__tests__/utils/timeoutCache.ts b/src/__tests__/utils/timeoutCache.ts
index 6076bfd11..ac7a1df2c 100644
--- a/src/__tests__/utils/timeoutCache.ts
+++ b/src/__tests__/utils/timeoutCache.ts
@@ -1,38 +1,59 @@
 import sleep from "@/utils/sleep";
 import { TimeoutCache } from "@/utils/timeoutCache";
+import { mocked } from "ts-jest/utils";
+
+jest.mock('@/utils/timeoutCache', () => {
+  return {
+    TimeoutCache: jest.fn().mockImplementation(() => {
+      return {
+        set: jest.fn(),
+        get: (key: string) => {
+          if (key === 'test') {
+            return undefined
+          } else {
+            return 'test';
+          }
+        },
+        remove: jest.fn(),
+      };
+    })
+  };
+});
 
 describe("Timeoutcache", () => {
-  beforeEach(() => {
+  mocked(TimeoutCache, true);
+  
+  beforeEach(async () => {
     const cache = new TimeoutCache<any>(10);
 
-    cache.remove("test");
+    await cache.remove("test");
   });
 
   test("timeout cache is empty", async () => {
     const cache = new TimeoutCache<string>(10);
 
-    expect(cache.get("test")).toBe(undefined);
+    expect(await cache.get("test")).toBe(undefined);
   });
 
   test("timeout cache is not empty", async () => {
     const cache = new TimeoutCache<string>(10);
 
-    expect(cache.get("test")).toBe(undefined);
+    expect(await cache.get("test")).toBe(undefined);
 
-    cache.set("test", "test");
+    await cache.set("test1", "test");
 
-    expect(cache.get("test")).toBe("test");
+    expect(await cache.get("test1")).toBe("test");
   });
 
   test("timeout cache is empty after 10 ms", async () => {
     const cache = new TimeoutCache<string>(10);
 
-    expect(cache.get("test")).toBe(undefined);
+    expect(await cache.get("test")).toBe(undefined);
 
-    cache.set("test", "test");
+    await cache.set("test", "test");
 
     await sleep(20);
 
-    expect(cache.get("test")).toBe(undefined);
+    expect(await cache.get("test")).toBe(undefined);
   });
 });
diff --git a/src/app.ts b/src/app.ts
index a03f47cf2..adc86e4c9 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -10,6 +10,8 @@ import { createPinia } from "pinia";
 import { ApolloClient, InMemoryCache } from "@apollo/client";
 import { WebSocketLink } from "@apollo/client/link/ws";
 import { Ad4mClient } from "@perspect3vism/ad4m";
+import { TimeoutCache } from "./utils/timeoutCache";
+import { ProfileExpression } from "./store/types";
 
 export const apolloClient = new ApolloClient({
   link: new WebSocketLink({
@@ -29,6 +31,7 @@ export const apolloClient = new ApolloClient({
   },
 });
 
+export const profileCache = new TimeoutCache<ProfileExpression>(1000 * 60 * 5);
 export const ad4mClient = new Ad4mClient(apolloClient);
 
 const pinia = createPinia();
diff --git a/src/assets/images/app-secure.png b/src/assets/images/app-secure.png
deleted file mode 100644
index adaa5d113..000000000
Binary files a/src/assets/images/app-secure.png and /dev/null differ
diff --git a/src/assets/images/junto_app_icon.png b/src/assets/images/junto_app_icon.png
deleted file mode 100644
index 8d9d22a4b..000000000
Binary files a/src/assets/images/junto_app_icon.png and /dev/null differ
diff --git a/src/assets/images/junto_web_logo--rainbow.png b/src/assets/images/junto_web_logo--rainbow.png
deleted file mode 100644
index ba90e6afa..000000000
Binary files a/src/assets/images/junto_web_logo--rainbow.png and /dev/null differ
diff --git a/src/assets/images/junto_web_rainbow.png b/src/assets/images/junto_web_rainbow.png
deleted file mode 100644
index 198797bcc..000000000
Binary files a/src/assets/images/junto_web_rainbow.png and /dev/null differ
diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg
new file mode 100644
index 000000000..2d089692e
--- /dev/null
+++ b/src/assets/images/logo.svg
@@ -0,0 +1,6 @@
+<svg width="1332" height="344" viewBox="0 0 1332 344" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 0H283.786V62.6259H75.387V133.073H260.825V194.833H75.387V337.913H0V0Z" fill="var(--j-color-black)"/>
+<path d="M307.592 0H382.545V275.287H579.68V337.913H307.592V0Z" fill="var(--j-color-black)"/>
+<path d="M664.373 -0.000449566V35.7361C664.373 112.578 635.04 118.432 635.04 152.822C635.04 202.015 690.535 275.287 754.929 275.287C768.742 275.665 782.444 272.703 794.877 266.648C807.31 260.593 818.109 251.624 826.362 240.499C856.604 203.536 809.082 179.854 809.082 135.819C809.082 104.413 845.478 93.59 845.478 51.3306V-0.00634766H920.841V58.0176C920.841 73.7685 917.153 89.2979 910.077 103.356L898.578 126.211C891.307 140.691 889.771 157.399 894.282 172.97C906.28 214.505 924.367 249.317 885.798 292.627C858.535 323.26 818.811 343.994 754.905 343.994C690.998 343.994 640.756 310.057 622.176 269.138C586.706 191.04 495.65 202.751 495.65 159.453C495.65 134.388 513.172 122.491 547.397 100.416C576.188 81.8622 588.944 65.3245 588.944 1.81764V0.00692305H664.331L664.373 -0.000449566Z" fill="var(--j-color-black)"/>
+<path d="M1135.73 213.967L1031.75 337.913H936.862L1089.8 164.393L942.927 0H1043.01L1135.3 116.983L1225.41 0H1325.5L1181.66 166.562L1332 337.913H1237.11L1135.73 213.967Z" fill="var(--j-color-black)"/>
+</svg>
diff --git a/src/components/avatar-group/AvatarGroup.vue b/src/components/avatar-group/AvatarGroup.vue
index 1112a7db4..1d01dd816 100644
--- a/src/components/avatar-group/AvatarGroup.vue
+++ b/src/components/avatar-group/AvatarGroup.vue
@@ -5,17 +5,11 @@
         <j-avatar
           class="avatar-group__avatar"
           v-for="(user, index) in firstUsers"
-          :data-testid="`avatar-group__avatar__${user.author.did}`"
+          :data-testid="`avatar-group__avatar__${user.did}`"
           :key="index"
-          :hash="user.author"
+          :hash="user.did"
           :size="size"
-          :src="
-            user.data.profile['schema:image']
-              ? JSON.parse(user.data.profile['schema:image'])[
-                  'schema:contentUrl'
-                ]
-              : null
-          "
+          :src="user.thumbnailPicture"
         ></j-avatar>
         <span v-if="users.length >= 4" class="avatar-group__see-all">
           +{{ users.length - 3 }}
@@ -26,14 +20,35 @@
 </template>
 
 <script lang="ts">
+import { ProfileWithDID } from "@/store/types";
+import { getProfile } from "@/utils/profileHelpers";
 import { defineComponent } from "vue";
 
 export default defineComponent({
   emits: ["click"],
-  props: ["users", "size"],
-  computed: {
-    firstUsers(): any {
-      return (Object.values(this.users) as any[]).slice(0, 3);
+  props: ["profileLanguage", "users", "size"],
+  data() {
+    return {
+      firstUsers: [] as ProfileWithDID[],
+    };
+  },
+  watch: {
+    users: {
+      handler: async function (users) {
+        const profiles = await Promise.all(
+          users
+            .slice(0, 3)
+            .map(
+              async (did: string): Promise<ProfileWithDID | null> =>
+                await getProfile(this.profileLanguage, did)
+            )
+        );
+
+        this.firstUsers = profiles.filter(
+          (profile) => profile !== null
+        ) as ProfileWithDID[];
+      },
+      immediate: true,
     },
   },
 });
diff --git a/src/components/avatar-upload/AvatarUpload.vue b/src/components/avatar-upload/AvatarUpload.vue
index 4caa17bb0..30163d5a9 100644
--- a/src/components/avatar-upload/AvatarUpload.vue
+++ b/src/components/avatar-upload/AvatarUpload.vue
@@ -10,7 +10,7 @@
           size="xl"
         ></j-icon>
       </div>
-      <j-button variant="subtle" v-if="!value" size="sm">Upload image</j-button>
+      <j-button variant="link" v-if="!value" size="sm">Upload image</j-button>
       <j-button v-if="value" @click.prevent="$emit('change', null)" size="sm">
         Remove image
       </j-button>
@@ -107,6 +107,7 @@ export default defineComponent({
   place-items: center;
   background: var(--j-color-ui-200);
   text-align: center;
+  cursor: pointer;
   width: 7rem;
   height: 7rem;
   border-radius: 50%;
diff --git a/src/components/logo/Logo.vue b/src/components/logo/Logo.vue
new file mode 100644
index 000000000..d0145eecb
--- /dev/null
+++ b/src/components/logo/Logo.vue
@@ -0,0 +1,20 @@
+<template>
+  <svg viewBox="0 0 1332 344" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M0 0H283.786V62.6259H75.387V133.073H260.825V194.833H75.387V337.913H0V0Z"
+      fill="var(--j-color-black)"
+    />
+    <path
+      d="M307.592 0H382.545V275.287H579.68V337.913H307.592V0Z"
+      fill="var(--j-color-black)"
+    />
+    <path
+      d="M664.373 -0.000449566V35.7361C664.373 112.578 635.04 118.432 635.04 152.822C635.04 202.015 690.535 275.287 754.929 275.287C768.742 275.665 782.444 272.703 794.877 266.648C807.31 260.593 818.109 251.624 826.362 240.499C856.604 203.536 809.082 179.854 809.082 135.819C809.082 104.413 845.478 93.59 845.478 51.3306V-0.00634766H920.841V58.0176C920.841 73.7685 917.153 89.2979 910.077 103.356L898.578 126.211C891.307 140.691 889.771 157.399 894.282 172.97C906.28 214.505 924.367 249.317 885.798 292.627C858.535 323.26 818.811 343.994 754.905 343.994C690.998 343.994 640.756 310.057 622.176 269.138C586.706 191.04 495.65 202.751 495.65 159.453C495.65 134.388 513.172 122.491 547.397 100.416C576.188 81.8622 588.944 65.3245 588.944 1.81764V0.00692305H664.331L664.373 -0.000449566Z"
+      fill="var(--j-color-black)"
+    />
+    <path
+      d="M1135.73 213.967L1031.75 337.913H936.862L1089.8 164.393L942.927 0H1043.01L1135.3 116.983L1225.41 0H1325.5L1181.66 166.562L1332 337.913H1237.11L1135.73 213.967Z"
+      fill="var(--j-color-black)"
+    />
+  </svg>
+</template>
diff --git a/src/components/orb/Orb.vue b/src/components/orb/Orb.vue
new file mode 100644
index 000000000..f9d3828c9
--- /dev/null
+++ b/src/components/orb/Orb.vue
@@ -0,0 +1,24 @@
+<template>
+  <svg viewBox="0 0 284 294" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M145.017 0.025063C171.517 0.929884 187.889 28.4329 209.488 43.8132C229.85 58.312 255.377 66.438 268.317 87.8239C281.925 110.314 286.137 137.867 282.116 163.845C278.117 189.675 262.289 211.197 246.048 231.677C229.16 252.971 211.718 275.1 186.286 284.683C159.943 294.609 128.948 297.504 103.545 285.372C79.0668 273.681 72.7007 242.688 55.1109 222.037C37.7266 201.627 6.16073 191.142 0.892192 164.855C-4.38252 138.537 14.8641 113.988 28.8656 91.0885C41.4913 70.4388 58.6047 54.2453 77.6524 39.3118C98.5321 22.9419 118.5 -0.880311 145.017 0.025063Z"
+      fill="url(#paint0_linear)"
+      fill-opacity="0.6"
+    />
+    <defs>
+      <linearGradient
+        id="paint0_linear"
+        x1="0"
+        y1="0"
+        x2="340.094"
+        y2="80.9644"
+        gradientUnits="userSpaceOnUse"
+      >
+        <stop offset="0.376642" stop-color="#D3CFFF" />
+        <stop offset="1" stop-color="#E4FFD6" />
+      </linearGradient>
+    </defs>
+  </svg>
+</template>
diff --git a/src/components/orb/Orb2.vue b/src/components/orb/Orb2.vue
new file mode 100644
index 000000000..fc69dd36d
--- /dev/null
+++ b/src/components/orb/Orb2.vue
@@ -0,0 +1,22 @@
+<template>
+  <svg viewBox="0 0 196 333" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M43.6081 290.682C6.50649 253.405 -10.1518 182.742 6.40079 132.85L35.4542 45.2787C52.0068 -4.61315 95.5021 -14.8399 132.604 22.4366L152.392 42.318C189.494 79.5945 206.152 150.258 189.599 200.15L160.546 287.721C143.993 337.613 100.498 347.84 63.3963 310.563L43.6081 290.682Z"
+      fill="url(#paint0_linear)"
+      fill-opacity="0.6"
+    />
+    <defs>
+      <linearGradient
+        id="paint0_linear"
+        x1="0"
+        y1="0"
+        x2="243.277"
+        y2="35.2643"
+        gradientUnits="userSpaceOnUse"
+      >
+        <stop offset="0.376642" stop-color="#D3CFFF" />
+        <stop offset="1" stop-color="#E4FFD6" />
+      </linearGradient>
+    </defs>
+  </svg>
+</template>
diff --git a/src/components/orb/Orb3.vue b/src/components/orb/Orb3.vue
new file mode 100644
index 000000000..84354befb
--- /dev/null
+++ b/src/components/orb/Orb3.vue
@@ -0,0 +1,24 @@
+<template>
+  <svg viewBox="0 0 294 291" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M145.264 0.00518872C173.158 0.477488 188.24 32.8974 209.622 50.8171C227.926 66.1575 248.373 78.0006 261.852 97.7158C277.312 120.328 297.083 145.122 292.566 172.138C288.052 199.138 258.524 212.952 239.323 232.462C221.496 250.575 207.663 273.53 183.902 282.548C159.293 291.887 130.827 292.994 106.536 282.854C83.1793 273.105 72.7309 247.269 55.3377 228.882C36.9426 209.435 7.30872 197.748 1.34624 171.652C-4.65811 145.373 10.5309 118.784 24.983 96.0291C38.1607 75.2807 60.2816 63.9487 79.4905 48.6137C101.236 31.2533 117.443 -0.465888 145.264 0.00518872Z"
+      fill="url(#paint0_linear)"
+      fill-opacity="0.6"
+    />
+    <defs>
+      <linearGradient
+        id="paint0_linear"
+        x1="0"
+        y1="0"
+        x2="349.902"
+        y2="87.1251"
+        gradientUnits="userSpaceOnUse"
+      >
+        <stop offset="0.376642" stop-color="#D3CFFF" />
+        <stop offset="1" stop-color="#E4FFD6" />
+      </linearGradient>
+    </defs>
+  </svg>
+</template>
diff --git a/src/constants/agents.ts b/src/constants/agents.ts
new file mode 100644
index 000000000..0e85bd3af
--- /dev/null
+++ b/src/constants/agents.ts
@@ -0,0 +1,5 @@
+export const JUNTO_AGENT =
+  "did:key:zQ3shpe32NARLJeuE3wwWLWLoy9NzkrD3oy1psPJNhbvkuMzK";
+
+export const AD4M_AGENT =
+  "did:key:zQ3shkkuZLvqeFgHdgZgFMUx8VGkgVWsLA83w2oekhZxoCW2n";
diff --git a/src/constants/config.ts b/src/constants/config.ts
new file mode 100644
index 000000000..f9efb7e8e
--- /dev/null
+++ b/src/constants/config.ts
@@ -0,0 +1,6 @@
+export const channelRefreshDurationMs = 10000;
+export const groupExpressionRefreshDurationMS = 10000;
+export const memberRefreshDurationMs = 60000;
+export const expressionGetRetries = 100;
+export const expressionGetDelayMs = 100;
+export const chatMessageRefreshDuration = 20000;
diff --git a/src/ad4m-globals.ts b/src/constants/languages.ts
similarity index 58%
rename from src/ad4m-globals.ts
rename to src/constants/languages.ts
index 5a938f178..79c6cbba1 100644
--- a/src/ad4m-globals.ts
+++ b/src/constants/languages.ts
@@ -8,10 +8,4 @@ export const PROFILE_EXPRESSION_OFFICIAL =
   "QmTTYB2E8tXRDt5ZHSMbVuZ71jZDzWJM6U9YcL86aheoz8";
 
 export const SHORTFORM_EXPRESSION_OFFICIAL =
-  "QmVDh4jd75BgPgiV6Lttjm7xQ8JQBkQJtqwBcPn4xZyXgP";
-
-export const JUNTO_AGENT =
-  "did:key:zQ3shpe32NARLJeuE3wwWLWLoy9NzkrD3oy1psPJNhbvkuMzK";
-
-export const AD4M_AGENT =
-  "did:key:zQ3shkkuZLvqeFgHdgZgFMUx8VGkgVWsLA83w2oekhZxoCW2n";
+  "QmVDh4jd75BgPgiV6Lttjm7xQ8JQBkQJtqwBcPn4xZyXgP";
\ No newline at end of file
diff --git a/src/constants/types.ts b/src/constants/types.ts
new file mode 100644
index 000000000..0a9269bca
--- /dev/null
+++ b/src/constants/types.ts
@@ -0,0 +1,4 @@
+export interface ShortForm {
+  body: string;
+  background: [string];
+}
diff --git a/src/containers/CommunityMembers.vue b/src/containers/CommunityMembers.vue
index 608dcf0dd..8c9e7b7e0 100644
--- a/src/containers/CommunityMembers.vue
+++ b/src/containers/CommunityMembers.vue
@@ -25,10 +25,10 @@
           <j-avatar
             size="lg"
             :hash="communityMember.did"
-            :src="communityMember.profile.profilePicture"
+            :src="communityMember.thumbnailPicture"
           />
           <j-text variant="body">
-            {{ communityMember.profile.username }}
+            {{ communityMember.username }}
           </j-text>
         </j-flex>
       </j-flex>
@@ -38,11 +38,15 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import type { Expression } from "@perspect3vism/ad4m";
-import { NeighbourhoodState, Profile } from "@/store/types";
+import {
+  NeighbourhoodState,
+  ExpressionTypes,
+  FluxExpressionReference,
+  ProfileWithDID,
+} from "@/store/types";
 import { useDataStore } from "@/store/data";
 
-import { parseProfile } from "@/utils/profileHelpers";
+import { getProfile } from "@/utils/profileHelpers";
 
 export default defineComponent({
   emits: ["cancel", "submit"],
@@ -51,37 +55,46 @@ export default defineComponent({
 
     return {
       dataStore,
-      profileLinksWorker: null as null | Worker,
     };
   },
-  async mounted() {
-    this.profileLinksWorker = await this.dataStore.getNeighbourhoodMembers(
-      this.community.perspective.uuid
-    );
-  },
-  unmounted() {
-    this.profileLinksWorker?.terminate();
-  },
   data() {
     return {
       searchValue: "",
+      memberList: [] as ProfileWithDID[],
     };
   },
+  watch: {
+    "community.members": {
+      handler: async function (users) {
+        const memberList = (await Promise.all(
+          users.map(
+            async (did: string): Promise<ProfileWithDID | null> =>
+              await getProfile(this.profileLanguageAddress, did)
+          )
+        )) as Array<ProfileWithDID | null>;
+
+        this.memberList = memberList.filter(
+          (profile) => profile !== null
+        ) as ProfileWithDID[];
+      },
+      immediate: true,
+    },
+  },
   computed: {
+    filteredCommunityMemberList() {
+      return this.memberList.filter((member) => {
+        return member.username.includes(this.searchValue);
+      });
+    },
     community(): NeighbourhoodState {
       const id = this.$route.params.communityId as string;
       return this.dataStore.getNeighbourhood(id);
     },
-    filteredCommunityMemberList(): { did: string; profile: Profile }[] {
-      const members: Expression[] = Object.values(this.community.members);
-      return members
-        .map((expression: Expression) => ({
-          did: expression.author,
-          profile: parseProfile(expression.data.profile),
-        }))
-        .filter((member: { did: string; profile: Profile }) =>
-          member.profile.username.includes(this.searchValue)
-        );
+    profileLanguageAddress(): string {
+      return this.community.typedExpressionLanguages.find(
+        (t: FluxExpressionReference) =>
+          t.expressionType === ExpressionTypes.ProfileExpression
+      )!.languageAddress;
     },
   },
 });
diff --git a/src/containers/CreateCommunity.vue b/src/containers/CreateCommunity.vue
index cc8fcce43..b23764cc0 100644
--- a/src/containers/CreateCommunity.vue
+++ b/src/containers/CreateCommunity.vue
@@ -20,9 +20,10 @@
     <j-flex direction="column" gap="700">
       <j-button
         :disabled="isCreatingCommunity || isJoiningCommunity"
-        variant="subtle"
+        variant="link"
         @click="tabView = ''"
       >
+        <j-icon name="arrow-left-short" />
         Back
       </j-button>
       <div v-if="tabView === 'Create'">
diff --git a/src/containers/EditProfile.vue b/src/containers/EditProfile.vue
index b7ac2e682..962983a78 100644
--- a/src/containers/EditProfile.vue
+++ b/src/containers/EditProfile.vue
@@ -74,7 +74,7 @@ export default defineComponent({
     async updateProfile() {
       this.isUpdatingProfile = true;
       const resizedImage = this.profilePicture
-        ? await resizeImage(dataURItoBlob(this.profilePicture as string), 400)
+        ? await resizeImage(dataURItoBlob(this.profilePicture as string), 100)
         : undefined;
       const thumbnail = this.profilePicture
         ? await blobToDataURL(resizedImage!)
@@ -84,7 +84,7 @@ export default defineComponent({
         .updateProfile({
           username: this.username,
           profilePicture: this.profilePicture,
-          thumbnail
+          thumbnail,
         })
         .then(() => {
           this.$emit("submit");
diff --git a/src/containers/Profile.vue b/src/containers/Profile.vue
index 72ebc6084..6ff2d7c70 100644
--- a/src/containers/Profile.vue
+++ b/src/containers/Profile.vue
@@ -13,7 +13,7 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import { getProfile, parseProfile } from "@/utils/profileHelpers";
+import { getProfile } from "@/utils/profileHelpers";
 import { Profile } from "@/store/types";
 
 export default defineComponent({
@@ -26,12 +26,7 @@ export default defineComponent({
   watch: {
     did: async function (did) {
       let profileLang = this.langAddress;
-      const dataExp = await getProfile(profileLang, did);
-
-      if (dataExp) {
-        const { data } = dataExp;
-        this.profile = parseProfile(data.profile);
-      }
+      this.profile = await getProfile(profileLang, did);
     },
   },
 });
diff --git a/src/core/juntoTypes.ts b/src/core/juntoTypes.ts
deleted file mode 100644
index 9ae6178b1..000000000
--- a/src/core/juntoTypes.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const channelRefreshDurationMs = 5000;
-export const expressionGetRetries = 100;
-export const expressionGetDelayMs = 20;
-export const chatMessageRefreshDuration = 15000;
-
-export interface JuntoShortForm {
-  body: string;
-  background: [string];
-}
diff --git a/src/core/methods/createChannel.ts b/src/core/methods/createChannel.ts
index d4efb2b07..194b4532c 100644
--- a/src/core/methods/createChannel.ts
+++ b/src/core/methods/createChannel.ts
@@ -3,7 +3,7 @@ import {
   ChannelState,
   FeedType,
   MembraneType,
-  JuntoExpressionReference,
+  FluxExpressionReference,
 } from "@/store/types";
 import { v4 } from "uuid";
 import { Perspective, Link } from "@perspect3vism/ad4m";
@@ -12,14 +12,14 @@ import { addPerspective } from "../mutations/addPerspective";
 import { templateLanguage } from "../mutations/templateLanguage";
 import { createNeighbourhood } from "../mutations/createNeighbourhood";
 import { createNeighbourhoodMeta } from "./createNeighbourhoodMeta";
-import { SOCIAL_CONTEXT_OFFICIAL } from "@/ad4m-globals";
+import { SOCIAL_CONTEXT_OFFICIAL } from "@/constants/languages";
 
 interface ChannelProps {
   channelName: string;
   creatorDid: string;
   sourcePerspective: PerspectiveHandle;
   membraneType: MembraneType;
-  typedExpressionLanguages: JuntoExpressionReference[];
+  typedExpressionLanguages: FluxExpressionReference[];
 }
 
 export async function createChannel({
@@ -96,7 +96,7 @@ export async function createChannel({
       membraneType: membraneType,
       linkedPerspectives: [],
       linkedNeighbourhoods: [],
-      members: {},
+      members: [],
       currentExpressionLinks: {},
       currentExpressionMessages: {},
       createdAt: new Date().toISOString(),
diff --git a/src/core/methods/createNeighbourhoodMeta.ts b/src/core/methods/createNeighbourhoodMeta.ts
index 156971ffb..dfc45e995 100644
--- a/src/core/methods/createNeighbourhoodMeta.ts
+++ b/src/core/methods/createNeighbourhoodMeta.ts
@@ -1,4 +1,4 @@
-import { JuntoExpressionReference } from "@/store/types";
+import { FluxExpressionReference } from "@/store/types";
 import { Link, LinkExpression } from "@perspect3vism/ad4m";
 import { addPerspective } from "../mutations/addPerspective";
 import { createLink } from "../mutations/createLink";
@@ -17,7 +17,7 @@ export async function createNeighbourhoodMeta(
   name: string,
   description: string,
   creatorDid: string,
-  expressionLanguages: JuntoExpressionReference[]
+  expressionLanguages: FluxExpressionReference[]
 ): Promise<LinkExpression[]> {
   //Create the perspective to hold our meta
   const perspective = await addPerspective(`${name}-meta`);
diff --git a/src/core/methods/getTypedExpressionLangs.ts b/src/core/methods/getTypedExpressionLangs.ts
index c92414f64..1f713cb05 100644
--- a/src/core/methods/getTypedExpressionLangs.ts
+++ b/src/core/methods/getTypedExpressionLangs.ts
@@ -1,10 +1,10 @@
 import { getLanguage } from "@/core/queries/getLanguage";
-import { JuntoExpressionReference, ExpressionTypes } from "@/store/types";
+import { FluxExpressionReference, ExpressionTypes } from "@/store/types";
 import { LinkExpression } from "@perspect3vism/ad4m";
 
 export async function getTypedExpressionLanguages(
   links: LinkExpression[]
-): Promise<JuntoExpressionReference[]> {
+): Promise<FluxExpressionReference[]> {
   const typedExpressionLanguages = [];
   //Get and cache the expression UI for each expression language
   //And used returned expression language names to populate typedExpressionLanguages field
@@ -29,7 +29,7 @@ export async function getTypedExpressionLanguages(
       typedExpressionLanguages.push({
         languageAddress: link.data.target!,
         expressionType: expressionType,
-      } as JuntoExpressionReference);
+      } as FluxExpressionReference);
     }
   }
   return typedExpressionLanguages;
diff --git a/src/core/methods/joinChannelFromSharedLink.ts b/src/core/methods/joinChannelFromSharedLink.ts
index b9ac6f22e..ff0558297 100644
--- a/src/core/methods/joinChannelFromSharedLink.ts
+++ b/src/core/methods/joinChannelFromSharedLink.ts
@@ -32,7 +32,7 @@ export async function joinChannelFromSharedLink(
       membraneType: MembraneType.Inherited,
       linkedPerspectives: [],
       linkedNeighbourhoods: [],
-      members: {},
+      members: [],
       currentExpressionLinks: {},
       currentExpressionMessages: {},
       createdAt: createdAt,
diff --git a/src/core/sync_worker.ts b/src/core/sync_worker.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/core/validate.ts b/src/core/validate.ts
deleted file mode 100644
index 560ad30c2..000000000
--- a/src/core/validate.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { JuntoLanguageTypes } from "./juntoTypes";
-
-/// Should take an input bundle file, remove var DNA from bundle and then check hash of that bundle vs default installed Junto languages
-export default function validateLanguage(
-  bundle: string,
-  languageType: JuntoLanguageTypes
-): boolean {
-  return true;
-}
diff --git a/src/main-thread/appHooks.ts b/src/main-thread/appHooks.ts
index 3bf02f2bc..5060471fe 100644
--- a/src/main-thread/appHooks.ts
+++ b/src/main-thread/appHooks.ts
@@ -76,6 +76,7 @@ export function registerAppHooks(mainThreadState: MainThreadGlobal): void {
           appBuiltInLangs: [],
           appLangAliases: null,
           mocks: false,
+          runDappServer: true
         })
         .then(async (ad4mCore: ad4m.PerspectivismCore) => {
           mainThreadState.ad4mCore = ad4mCore;
diff --git a/src/main-thread/createUI.ts b/src/main-thread/createUI.ts
index dba625981..dab9a09c9 100644
--- a/src/main-thread/createUI.ts
+++ b/src/main-thread/createUI.ts
@@ -104,12 +104,10 @@ export function createSplashScreen(mainThreadState: MainThreadGlobal): void {
 
 function createTray(mainThreadState: MainThreadGlobal): void {
   if (app.isPackaged) {
-    mainThreadState.tray = new Tray(
-      `${__dirname}/img/icons/favicon-white-32x32@2x.png`
-    );
+    mainThreadState.tray = new Tray(`${__dirname}/img/icons/favicon-32x32.png`);
   } else {
     mainThreadState.tray = new Tray(
-      `${process.env.PWD}/public/img/icons/favicon-white-32x32@2x.png`
+      `${process.env.PWD}/public/img/icons/favicon-32x32.png`
     );
   }
 
diff --git a/src/main-thread/globals.ts b/src/main-thread/globals.ts
index a94e6d09c..1cab10670 100644
--- a/src/main-thread/globals.ts
+++ b/src/main-thread/globals.ts
@@ -16,9 +16,9 @@ export class MainThreadGlobal {
   constructor() {
     let iconPath;
     if (process.env.WEBPACK_DEV_SERVER_URL) {
-      iconPath = `${process.env.PWD}/public/img/icons/favicon-32x32.png`;
+      iconPath = `${process.env.PWD}/public/img/icons/icon.png`;
     } else {
-      iconPath = `${__dirname}/img/icons/favicon-32x32.png`;
+      iconPath = `${__dirname}/img/icons/icon.png`;
     }
 
     let builtInLangPath;
diff --git a/src/main-thread/ipcHooks.ts b/src/main-thread/ipcHooks.ts
index 6f9d47b29..020142c81 100644
--- a/src/main-thread/ipcHooks.ts
+++ b/src/main-thread/ipcHooks.ts
@@ -41,7 +41,13 @@ export function registerIpcHooks(mainThreadState: MainThreadGlobal): void {
   ipcMain.on("copyLogs", () => {
     const logLocation = path.join(app.getPath("logs"), "debug.log");
     const desktopLocation = app.getPath("desktop");
-    fs.copyFileSync(logLocation, desktopLocation);
+    if (fs.existsSync(logLocation)) {
+      fs.copyFileSync(logLocation, desktopLocation);
+    } else {
+      console.error(
+        "Could not find log file, are you running the app in dev mode?"
+      );
+    }
   });
 
   ipcMain.on("quitApp", async () => {
diff --git a/src/main-thread/setup.ts b/src/main-thread/setup.ts
index 1bef44dc2..48b71baa1 100644
--- a/src/main-thread/setup.ts
+++ b/src/main-thread/setup.ts
@@ -84,12 +84,13 @@ export function setup(mainThreadState: MainThreadGlobal): void {
 
     //Set the app paths to the new dev directory
     app.setPath("userData", path.join(app.getPath("userData"), "dev"));
-    app.setPath("appData", path.join(app.getPath("appData"), "junto", "dev"));
-  }
-  const repoLockPath = path.join(app.getPath("appData"), ".jsipfs/repo.lock");
-  console.debug("repo lock path", repoLockPath);
-  if (fs.existsSync(repoLockPath)) {
-    console.log("\x1b[31m", "\n\nFound repo.lock, deleting!");
-    fs.rmSync(repoLockPath);
+    app.setPath("appData", path.join(app.getPath("appData"), "flux", "dev"));
+
+    const repoLockPath = path.join(app.getPath("appData"), ".jsipfs/repo.lock");
+    console.debug("repo lock path", repoLockPath);
+    if (fs.existsSync(repoLockPath)) {
+      console.log("\x1b[31m", "\n\nFound repo.lock, deleting!");
+      fs.rmSync(repoLockPath);
+    }
   }
 }
diff --git a/src/store/app/mutations/index.ts b/src/store/app/mutations/index.ts
index c88fb4ba6..166f7c23c 100644
--- a/src/store/app/mutations/index.ts
+++ b/src/store/app/mutations/index.ts
@@ -3,7 +3,6 @@ import {
   ToastState,
   ThemeState,
   CurrentThemeState,
-  ExpressionUIIcons,
 } from "@/store/types";
 import { useAppStore } from "..";
 
diff --git a/src/store/data/actions/createCommunity.ts b/src/store/data/actions/createCommunity.ts
index 055f160c1..34fcf3bc7 100644
--- a/src/store/data/actions/createCommunity.ts
+++ b/src/store/data/actions/createCommunity.ts
@@ -10,13 +10,13 @@ import {
   GROUP_EXPRESSION_OFFICIAL,
   PROFILE_EXPRESSION_OFFICIAL,
   SHORTFORM_EXPRESSION_OFFICIAL,
-} from "@/ad4m-globals";
+} from "@/constants/languages";
 
 import { MEMBER } from "@/constants/neighbourhoodMeta";
 
 import {
   MembraneType,
-  JuntoExpressionReference,
+  FluxExpressionReference,
   ExpressionTypes,
   CommunityState,
   FeedType,
@@ -96,15 +96,15 @@ export default async ({
       {
         languageAddress: shortFormExpressionLang.address!,
         expressionType: ExpressionTypes.ShortForm,
-      } as JuntoExpressionReference,
+      } as FluxExpressionReference,
       {
         languageAddress: groupExpressionLang.address!,
         expressionType: ExpressionTypes.GroupExpression,
-      } as JuntoExpressionReference,
+      } as FluxExpressionReference,
       {
         languageAddress: profileExpressionLang.address!,
         expressionType: ExpressionTypes.ProfileExpression,
-      } as JuntoExpressionReference,
+      } as FluxExpressionReference,
     ];
 
     //Publish perspective
@@ -170,6 +170,8 @@ export default async ({
     });
     console.log("Created profile expression link", addProfileLink);
 
+    const myDid = userStore.getUser!.agent.did!;
+
     const newCommunity = {
       neighbourhood: {
         name: perspectiveName,
@@ -184,7 +186,7 @@ export default async ({
         membraneType: MembraneType.Unique,
         linkedPerspectives: [createSourcePerspective.uuid],
         linkedNeighbourhoods: [createSourcePerspective.uuid],
-        members: {},
+        members: [myDid],
         membraneRoot: createSourcePerspective.uuid,
         currentExpressionLinks: {},
         currentExpressionMessages: {},
diff --git a/src/store/data/actions/fetchNeighbourhoodMembers.ts b/src/store/data/actions/fetchNeighbourhoodMembers.ts
new file mode 100644
index 000000000..11cdc9409
--- /dev/null
+++ b/src/store/data/actions/fetchNeighbourhoodMembers.ts
@@ -0,0 +1,25 @@
+import { LinkExpression, LinkQuery } from "@perspect3vism/ad4m";
+
+import { useDataStore } from "..";
+
+import { MEMBER } from "@/constants/neighbourhoodMeta";
+import { ad4mClient } from "@/app";
+
+export default async function (id: string): Promise<void> {
+  const dataStore = useDataStore();
+
+  const neighbourhood = dataStore.getNeighbourhood(id);
+  const memberLinks = await ad4mClient.perspective.queryLinks(
+    id,
+    new LinkQuery({
+      source: `${neighbourhood.neighbourhoodUrl!}://self`,
+      predicate: MEMBER,
+    })
+  );
+  const dids = memberLinks.map((link: LinkExpression) => {
+    return link.data.target.split("://")[1];
+  });
+  for (const did of dids) {
+    dataStore.setNeighbourhoodMember({ member: did, perspectiveUuid: id });
+  }
+}
diff --git a/src/store/data/actions/fetchNeighbourhoodMetadata.ts b/src/store/data/actions/fetchNeighbourhoodMetadata.ts
new file mode 100644
index 000000000..e7f4179de
--- /dev/null
+++ b/src/store/data/actions/fetchNeighbourhoodMetadata.ts
@@ -0,0 +1,69 @@
+import { print } from "graphql/language/printer";
+import { expressionGetRetries, expressionGetDelayMs } from "@/constants/config";
+import { GET_EXPRESSION } from "@/core/graphql_queries";
+import { LinkQuery } from "@perspect3vism/ad4m";
+
+import { useDataStore } from "@/store/data/index";
+import { ad4mClient } from "@/app";
+
+export interface Payload {
+  communityId: string;
+}
+
+const expressionWorker = new Worker("pollingWorker.js");
+
+/// Function that uses web workers to poll for channels and new group expressions on a community
+export default async (communityId: string): Promise<void> => {
+  const dataStore = useDataStore();
+  const community = dataStore.getCommunity(communityId);
+
+  const groupExpressionLinks = await ad4mClient.perspective.queryLinks(
+    community.neighbourhood.perspective.uuid,
+    new LinkQuery({
+      source: `${community.neighbourhood.neighbourhoodUrl}://self`,
+      predicate: "rdf://class",
+    })
+  );
+  let sortedLinks = [...groupExpressionLinks];
+  sortedLinks = sortedLinks.sort((a, b) => {
+    console.log(a.timestamp, b.timestamp);
+    return a.timestamp > b.timestamp ? 1 : b.timestamp > a.timestamp ? -1 : 0
+  });
+  //Check that the group expression ref is not in the store
+  if (
+    community.neighbourhood.groupExpressionRef !=
+    sortedLinks[sortedLinks.length - 1].data!.target!
+  ) {
+    //Start a worker polling to try and get the expression data
+    expressionWorker.postMessage({
+      retry: expressionGetRetries,
+      interval: expressionGetDelayMs,
+      query: print(GET_EXPRESSION),
+      variables: {
+        url: sortedLinks[sortedLinks.length - 1].data!.target!,
+      },
+      name: "Get group expression data",
+      dataKey: "expression",
+    });
+
+    expressionWorker.onerror = function (e) {
+      throw new Error(e.toString());
+    };
+
+    expressionWorker.addEventListener("message", (e) => {
+      const getExpRes = e.data.expression;
+      const groupExpData = JSON.parse(getExpRes.data!);
+      console.log("Got new group expression data for community", groupExpData);
+      //Update the community with the new group data
+      dataStore.updateCommunityMetadata({
+        communityId: community.neighbourhood.perspective.uuid,
+        name: groupExpData["name"],
+        description: groupExpData["description"],
+        image: groupExpData["image"],
+        thumbnail: groupExpData["thumnail"],
+        groupExpressionRef:
+          groupExpressionLinks[groupExpressionLinks.length - 1].data!.target,
+      });
+    });
+  }
+};
diff --git a/src/store/data/actions/getNeighbourhoodChannels.ts b/src/store/data/actions/getNeighbourhoodChannels.ts
index 6d8cecff7..754ca9c00 100644
--- a/src/store/data/actions/getNeighbourhoodChannels.ts
+++ b/src/store/data/actions/getNeighbourhoodChannels.ts
@@ -3,6 +3,7 @@ import { joinChannelFromSharedLink } from "@/core/methods/joinChannelFromSharedL
 import { PERSPECTIVE_LINK_QUERY } from "@/core/graphql_queries";
 import { LinkQuery } from "@perspect3vism/ad4m";
 import { useDataStore } from "..";
+import { channelRefreshDurationMs } from "@/constants/config";
 
 export interface Payload {
   communityId: string;
@@ -21,7 +22,7 @@ export default async ({ communityId }: Payload): Promise<Worker> => {
 
     //Start the worker looking for channels
     channelLinksWorker.postMessage({
-      interval: 10000,
+      interval: channelRefreshDurationMs,
       staticSleep: true,
       query: print(PERSPECTIVE_LINK_QUERY),
       variables: {
diff --git a/src/store/data/actions/getNeighbourhoodMembers.ts b/src/store/data/actions/getNeighbourhoodMembers.ts
index 4d3b6f789..525d73761 100644
--- a/src/store/data/actions/getNeighbourhoodMembers.ts
+++ b/src/store/data/actions/getNeighbourhoodMembers.ts
@@ -1,13 +1,14 @@
 import { print } from "graphql/language/printer";
 import { LinkQuery } from "@perspect3vism/ad4m";
-import { TimeoutCache } from "../../../utils/timeoutCache";
 
 import { ExpressionTypes, ProfileExpression } from "@/store/types";
 import { useDataStore } from "..";
 import { useAppStore } from "@/store/app";
 
 import { MEMBER } from "@/constants/neighbourhoodMeta";
+import { memberRefreshDurationMs } from "@/constants/config";
 import { GET_EXPRESSION, PERSPECTIVE_LINK_QUERY } from "@/core/graphql_queries";
+import { profileCache } from "@/app";
 
 const expressionWorker = new Worker("pollingWorker.js");
 
@@ -15,8 +16,6 @@ export default async function (id: string): Promise<Worker> {
   const dataStore = useDataStore();
   const appStore = useAppStore();
 
-  const cache = new TimeoutCache<ProfileExpression>(1000 * 60 * 5);
-
   try {
     const neighbourhood = dataStore.getNeighbourhood(id);
 
@@ -28,7 +27,8 @@ export default async function (id: string): Promise<Worker> {
       const profileLinksWorker = new Worker("pollingWorker.js");
 
       profileLinksWorker.postMessage({
-        interval: 5000,
+        interval: memberRefreshDurationMs,
+        staticSleep: true,
         query: print(PERSPECTIVE_LINK_QUERY),
         variables: {
           uuid: id,
@@ -49,15 +49,16 @@ export default async function (id: string): Promise<Worker> {
         const profileLinks = e.data.perspectiveQueryLinks;
 
         for (const profileLink of profileLinks) {
-          const profile = cache.get(profileLink.data.target);
+          const profile = await profileCache.get(profileLink.data.target);
 
           if (profile) {
             dataStore.setNeighbourhoodMember({
               perspectiveUuid: id,
-              member: profile,
+              member: profile.author,
             });
           } else {
             expressionWorker.postMessage({
+              id: profileLink.data.target,
               retry: 50,
               interval: 5000,
               query: print(GET_EXPRESSION),
@@ -74,10 +75,10 @@ export default async function (id: string): Promise<Worker> {
         throw new Error(e.toString());
       };
 
-      expressionWorker.addEventListener("message", (e: any) => {
+      expressionWorker.addEventListener("message", async (e: any) => {
         const profileGqlExp = e.data.expression;
         const link = e.data.callbackData.link;
-        const did = `${profileLang!.languageAddress}://${link.author}`;
+        const profileRef = `${profileLang!.languageAddress}://${link.author}`;
 
         const profileExp = {
           author: profileGqlExp.author!,
@@ -89,10 +90,10 @@ export default async function (id: string): Promise<Worker> {
         if (profileGqlExp) {
           dataStore.setNeighbourhoodMember({
             perspectiveUuid: id,
-            member: profileExp,
+            member: profileExp.author,
           });
 
-          cache.set(did, profileExp);
+          await profileCache.set(profileRef, profileExp);
         }
       });
 
diff --git a/src/store/data/actions/getNeighbourhoodMetadata.ts b/src/store/data/actions/getNeighbourhoodMetadata.ts
index 0a9408726..93199bfaa 100644
--- a/src/store/data/actions/getNeighbourhoodMetadata.ts
+++ b/src/store/data/actions/getNeighbourhoodMetadata.ts
@@ -1,5 +1,9 @@
 import { print } from "graphql/language/printer";
-import { expressionGetRetries, expressionGetDelayMs } from "@/core/juntoTypes";
+import {
+  expressionGetRetries,
+  expressionGetDelayMs,
+  groupExpressionRefreshDurationMS,
+} from "@/constants/config";
 import { GET_EXPRESSION, PERSPECTIVE_LINK_QUERY } from "@/core/graphql_queries";
 import { LinkQuery } from "@perspect3vism/ad4m";
 
@@ -22,7 +26,8 @@ export default async ({ communityId }: Payload): Promise<Worker> => {
     const groupExpressionWorker = new Worker("pollingWorker.js");
     // Start worker looking for group expression links
     groupExpressionWorker.postMessage({
-      interval: 5000,
+      interval: groupExpressionRefreshDurationMS,
+      staticSleep: true,
       query: print(PERSPECTIVE_LINK_QUERY),
       variables: {
         uuid: community.neighbourhood.perspective.uuid,
@@ -49,19 +54,18 @@ export default async ({ communityId }: Payload): Promise<Worker> => {
             (a, b) =>
               a.timestamp > b.timestamp ? 1 : b.timestamp > a.timestamp ? -1 : 0
           );
+          const latestExpression =
+            groupExpressionLinks[groupExpressionLinks.length - 1].data!.target!;
           //Check that the group expression ref is not in the store
-          if (
-            community.neighbourhood.groupExpressionRef !=
-            groupExpressionLinks[groupExpressionLinks.length - 1].data!.target!
-          ) {
+          if (community.neighbourhood.groupExpressionRef != latestExpression) {
             //Start a worker polling to try and get the expression data
             expressionWorker.postMessage({
+              id: latestExpression,
               retry: expressionGetRetries,
               interval: expressionGetDelayMs,
               query: print(GET_EXPRESSION),
               variables: {
-                url: groupExpressionLinks[groupExpressionLinks.length - 1].data!
-                  .target!,
+                url: latestExpression,
               },
               name: "Get group expression data",
               dataKey: "expression",
diff --git a/src/store/data/actions/index.ts b/src/store/data/actions/index.ts
index 080497ed5..080fce2be 100644
--- a/src/store/data/actions/index.ts
+++ b/src/store/data/actions/index.ts
@@ -8,6 +8,8 @@ import joinCommunity from "./joinCommunity";
 import loadExpressions from "./loadExpressions";
 import updateCommunity from "./updateCommunity";
 import showMessageNotification from "./showMessageNotification";
+import fetchNeighbourhoodMembers from "./fetchNeighbourhoodMembers"
+import fetchNeighbourhoodMetadata from "./fetchNeighbourhoodMetadata";
 
 export default {
   createChannel,
@@ -20,4 +22,6 @@ export default {
   loadExpressions,
   updateCommunity,
   showMessageNotification,
+  fetchNeighbourhoodMembers,
+  fetchNeighbourhoodMetadata,
 };
diff --git a/src/store/data/actions/joinCommunity.ts b/src/store/data/actions/joinCommunity.ts
index 4411b3e35..bedef7b53 100644
--- a/src/store/data/actions/joinCommunity.ts
+++ b/src/store/data/actions/joinCommunity.ts
@@ -84,7 +84,7 @@ export default async ({ joiningLink }: Payload): Promise<void> => {
           membraneType: MembraneType.Unique,
           linkedNeighbourhoods: [neighbourhood.uuid],
           linkedPerspectives: [neighbourhood.uuid],
-          members: {},
+          members: [userStore.getUser!.agent.did!],
           membraneRoot: neighbourhood.uuid,
           currentExpressionLinks: {},
           currentExpressionMessages: {},
diff --git a/src/store/data/actions/loadExpressions.ts b/src/store/data/actions/loadExpressions.ts
index 6821e3ce9..44dac8a00 100644
--- a/src/store/data/actions/loadExpressions.ts
+++ b/src/store/data/actions/loadExpressions.ts
@@ -6,6 +6,7 @@ import {
 import { LinkQuery } from "@perspect3vism/ad4m";
 import { useDataStore } from "..";
 import { useAppStore } from "@/store/app";
+import { chatMessageRefreshDuration } from "@/constants/config";
 
 export interface Payload {
   channelId: string;
@@ -43,7 +44,7 @@ export default async function ({
     //Current view location could be now if application has just started or from some previous post if user is scrolling
     console.log("Posting for links between", fromDate, untilDate);
     linksWorker.postMessage({
-      interval: 10000,
+      interval: chatMessageRefreshDuration,
       staticSleep: true,
       query: print(PERSPECTIVE_LINK_QUERY),
       variables: {
@@ -62,7 +63,7 @@ export default async function ({
     //Forward looking link worker that looks from current view location -> now()
     console.log("Posting for links between", fromDate, new Date());
     linksWorker.postMessage({
-      interval: 10000,
+      interval: chatMessageRefreshDuration,
       staticSleep: true,
       query: print(PERSPECTIVE_LINK_QUERY),
       variables: {
diff --git a/src/store/data/actions/showMessageNotification.ts b/src/store/data/actions/showMessageNotification.ts
index 41e16b9eb..70f5fb2b9 100644
--- a/src/store/data/actions/showMessageNotification.ts
+++ b/src/store/data/actions/showMessageNotification.ts
@@ -2,7 +2,6 @@ import { useAppStore } from "@/store/app";
 import { ExpressionTypes } from "@/store/types";
 import { useUserStore } from "@/store/user";
 import { RouteLocationNormalizedLoaded, Router } from "vue-router";
-import { ACCOUNT_NAME } from "@/constants/profile";
 import { useDataStore } from "..";
 import { getProfile } from "@/utils/profileHelpers";
 
@@ -64,8 +63,7 @@ export default async ({
         profileLanguage!.languageAddress,
         authorDid
       );
-      //@ts-ignore
-      const name = profile.data.profile[ACCOUNT_NAME];
+      const name = profile ? profile.username : "Someone";
 
       title = `${name} mentioned you in #${channel?.neighbourhood.name}}`;
       body = escapedMessage;
diff --git a/src/store/data/getters/index.ts b/src/store/data/getters/index.ts
index 9cda44b03..2b67598eb 100644
--- a/src/store/data/getters/index.ts
+++ b/src/store/data/getters/index.ts
@@ -101,9 +101,9 @@ export default {
 
   getCommunityMembers:
     (state: DataState) =>
-    (communityId: string): { [x: string]: Expression } => {
+    (communityId: string): string[] => {
       if (!state.communities[communityId]) {
-        return {};
+        return [];
       }
       return state.neighbourhoods[communityId].members;
     },
diff --git a/src/store/data/mutations/index.ts b/src/store/data/mutations/index.ts
index 4ce337ff8..cf1a338ae 100644
--- a/src/store/data/mutations/index.ts
+++ b/src/store/data/mutations/index.ts
@@ -1,7 +1,6 @@
 import {
   ExpressionAndRef,
   LinkExpressionAndLang,
-  ProfileExpression,
   CommunityState,
   ChannelState,
   ThemeState,
@@ -132,38 +131,21 @@ export default {
     channel.notifications.mute = !channel.notifications.mute;
   },
 
-  setNeighbourhoodMembers({
-    members,
-    perspectiveUuid,
-  }: {
-    members: { [x: string]: ProfileExpression };
-    perspectiveUuid: string;
-  }): void {
-    const state = useDataStore();
-    const neighbourhood = state.neighbourhoods[perspectiveUuid];
-
-    console.log("setting member", { neighbourhood, members });
-
-    if (neighbourhood) {
-      neighbourhood.members = members;
-    }
-  },
-
   setNeighbourhoodMember({
     member,
     perspectiveUuid,
   }: {
-    member: ProfileExpression;
+    member: string;
     perspectiveUuid: string;
   }): void {
     const state = useDataStore();
     const neighbourhood = state.neighbourhoods[perspectiveUuid];
 
-    if (neighbourhood) {
-      neighbourhood.members = {
-        ...neighbourhood.members,
-        [member.author]: member,
-      };
+    if (
+      neighbourhood &&
+      !neighbourhood.members.find((existingMember) => existingMember === member)
+    ) {
+      neighbourhood.members.push(member);
     }
   },
 
diff --git a/src/store/index.ts b/src/store/index.ts
deleted file mode 100644
index 20dfd8352..000000000
--- a/src/store/index.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// import VuexPersistence from "vuex-persist";
-// import { createDirectStore } from "direct-vuex";
-// import user from "./user";
-// import data from "./data";
-// import app from "./app";
-
-// const vuexLocal = new VuexPersistence({
-//   storage: window.localStorage,
-// });
-
-// const {
-//   store,
-//   rootActionContext,
-//   moduleActionContext,
-//   rootGetterContext,
-//   moduleGetterContext,
-// } = createDirectStore({
-//   modules: {
-//     user,
-//     data,
-//     app,
-//   },
-//   plugins: [vuexLocal.plugin],
-// });
-
-// export default store;
-
-// export {
-//   rootActionContext,
-//   moduleActionContext,
-//   rootGetterContext,
-//   moduleGetterContext,
-// };
-
-// // The following lines enable types in the injected store '$store'.
-// export type AppStore = typeof store;
-
-// declare module "vuex" {
-//   interface Store<S> {
-//     direct: AppStore;
-//   }
-// }
diff --git a/src/store/types/expression.ts b/src/store/types/expression.ts
index 96abcbf80..fe293c7f3 100644
--- a/src/store/types/expression.ts
+++ b/src/store/types/expression.ts
@@ -1,7 +1,7 @@
 import type { Expression, LinkExpression } from "@perspect3vism/ad4m";
 import { ExpressionRef } from "@perspect3vism/ad4m";
 
-export interface JuntoExpressionReference {
+export interface FluxExpressionReference {
   languageAddress: string;
   expressionType: ExpressionTypes;
 }
@@ -13,13 +13,6 @@ export enum ExpressionTypes {
   Other,
 }
 
-export interface ExpressionUIIcons {
-  languageAddress: string;
-  createIcon: string;
-  viewIcon: string;
-  name: string;
-}
-
 export interface ExpressionAndRef {
   expression: Expression;
   url: ExpressionRef;
diff --git a/src/store/types/neighbourhood.ts b/src/store/types/neighbourhood.ts
index 71d035228..e96e87ba3 100644
--- a/src/store/types/neighbourhood.ts
+++ b/src/store/types/neighbourhood.ts
@@ -1,7 +1,6 @@
 import type { LinkExpression } from "@perspect3vism/ad4m";
 import { PerspectiveHandle } from "@perspect3vism/ad4m";
-import { JuntoExpressionReference, ExpressionAndRef } from "./expression";
-import { ProfileExpression } from "./userprofile";
+import { FluxExpressionReference, ExpressionAndRef } from "./expression";
 
 export interface NeighbourhoodState {
   createdAt?: string;
@@ -11,14 +10,14 @@ export interface NeighbourhoodState {
   image?: string;
   thumbnail?: string;
   perspective: PerspectiveHandle;
-  typedExpressionLanguages: JuntoExpressionReference[];
+  typedExpressionLanguages: FluxExpressionReference[];
   groupExpressionRef?: string;
   neighbourhoodUrl: string;
   membraneType: MembraneType;
   membraneRoot: string;
   linkedPerspectives: string[];
   linkedNeighbourhoods: string[];
-  members: { [x: string]: ProfileExpression };
+  members: string[];
   currentExpressionLinks: { [x: string]: LinkExpression };
   currentExpressionMessages: { [x: string]: ExpressionAndRef };
 }
diff --git a/src/store/types/state.ts b/src/store/types/state.ts
index 4d4c6fa01..abfc8a8ad 100644
--- a/src/store/types/state.ts
+++ b/src/store/types/state.ts
@@ -1,5 +1,4 @@
 import { UserState } from "./userprofile";
-import { ExpressionUIIcons } from "./expression";
 import { LocalCommunityState } from "./community";
 import { LocalChannelState } from "./channel";
 import { NeighbourhoodState } from "./neighbourhood";
diff --git a/src/store/types/userprofile.ts b/src/store/types/userprofile.ts
index 1070c82b1..25927013a 100644
--- a/src/store/types/userprofile.ts
+++ b/src/store/types/userprofile.ts
@@ -10,6 +10,10 @@ export class Profile {
   thumbnailPicture?: string;
 }
 
+export class ProfileWithDID extends Profile {
+  did: string;
+}
+
 export class ProfileExpression extends ExpressionGeneric(Profile) {}
 
 export interface UserState {
diff --git a/src/store/user/actions/updateProfile.ts b/src/store/user/actions/updateProfile.ts
index c26e37d39..08f57c7c1 100644
--- a/src/store/user/actions/updateProfile.ts
+++ b/src/store/user/actions/updateProfile.ts
@@ -1,11 +1,11 @@
 import { createProfile } from "@/core/methods/createProfile";
-import { TimeoutCache } from "@/utils/timeoutCache";
 import { getExpression } from "@/core/queries/getExpression";
 
 import { ExpressionTypes, Profile, ProfileExpression } from "@/store/types";
 import { useAppStore } from "@/store/app";
 import { useUserStore } from "..";
 import { useDataStore } from "@/store/data";
+import { profileCache } from "@/app";
 
 export interface Payload {
   username?: string;
@@ -31,23 +31,22 @@ export default async (payload: Payload): Promise<void> => {
 
   try {
     const neighbourhoods = Object.values(dataStore.getCommunityNeighbourhoods);
-    const cache = new TimeoutCache<ProfileExpression>(1000 * 60 * 5);
 
     for (const neighbourhood of neighbourhoods) {
-      const profileExpression = (
+      const profileLanguage = (
         neighbourhood as any
       ).typedExpressionLanguages.find(
         (t: any) => t.expressionType == ExpressionTypes.ProfileExpression
       );
-      const didExpression = `${
-        profileExpression!.languageAddress
+      const profileRef = `${
+        profileLanguage!.languageAddress
       }://${userStore.getUser!.agent.did!}`;
 
-      console.log("profileExpression: ", profileExpression);
+      console.log("profileLanguage: ", profileLanguage);
 
-      if (profileExpression) {
+      if (profileLanguage) {
         const exp = await createProfile(
-          profileExpression.languageAddress,
+          profileLanguage.languageAddress,
           newProfile
         );
 
@@ -60,7 +59,7 @@ export default async (payload: Payload): Promise<void> => {
           timestamp: expressionGql.timestamp!,
           proof: expressionGql.proof!,
         } as ProfileExpression;
-        cache.set(didExpression, profileExp);
+        await profileCache.set(profileRef, profileExp);
       } else {
         const errorMessage =
           "Expected to find profile expression language for this community";
diff --git a/src/storeDb.ts b/src/storeDb.ts
new file mode 100644
index 000000000..9ebfbc768
--- /dev/null
+++ b/src/storeDb.ts
@@ -0,0 +1,36 @@
+import level from "level";
+
+const DB_NAME = "cachedb";
+let DB: level.LevelDB | undefined;
+
+export default {
+  async getDb(): Promise<level.LevelDB> {
+    if (!DB) {
+      DB = await level(DB_NAME);
+    }
+    return DB!;
+  },
+  async deleteItemByKey(key: string): Promise<void> {
+    const db = await this.getDb();
+
+    await db.del(key);
+  },
+  async getItem(id: string): Promise<any | undefined> {
+    const db = await this.getDb();
+
+    try {
+      return await db.get(id);
+    } catch (e) {
+      if (e.type == "NotFoundError") {
+        return undefined;
+      } else {
+        throw new Error(e);
+      }
+    }
+  },
+  async setItem(key: string, item: any): Promise<void> {
+    const db = await this.getDb();
+
+    await db.put(key, JSON.stringify(item));
+  },
+};
diff --git a/src/utils/profileHelpers.ts b/src/utils/profileHelpers.ts
index 3782cc98e..5d6bbb7c2 100644
--- a/src/utils/profileHelpers.ts
+++ b/src/utils/profileHelpers.ts
@@ -1,6 +1,5 @@
 import { getExpressionNoCache } from "@/core/queries/getExpression";
-import { ProfileExpression } from "@/store/types";
-import { TimeoutCache } from "./timeoutCache";
+import { ProfileExpression, ProfileWithDID } from "@/store/types";
 import { Profile } from "@/store/types";
 import {
   ACCOUNT_NAME,
@@ -9,6 +8,7 @@ import {
   GIVEN_NAME,
 } from "@/constants/profile";
 import { IMAGE, CONTENT_SIZE, CONTENT_URL, THUMBNAIL } from "@/constants/image";
+import { profileCache } from "@/app";
 
 interface Image {
   contentUrl: string;
@@ -40,15 +40,14 @@ export function parseImage(data: string): ImageWithThumbnail {
   };
 }
 
-export function parseProfile(data: any): Profile {
-  const profile = shouldParse(data) ? JSON.parse(data) : data;
-  const image = profile[IMAGE] && parseImage(profile[IMAGE]);
+export function parseProfile(data: ProfileExpression): Profile {
+  const image = data[IMAGE] && parseImage(data[IMAGE]);
 
   return {
-    username: profile[ACCOUNT_NAME],
-    email: profile[EMAIL],
-    givenName: profile[GIVEN_NAME],
-    familyName: profile[FAMILY_NAME],
+    username: data[ACCOUNT_NAME],
+    email: data[EMAIL],
+    givenName: data[GIVEN_NAME],
+    familyName: data[FAMILY_NAME],
     thumbnailPicture: image?.thumbnail?.contentUrl,
     profilePicture: image?.contentUrl,
   };
@@ -57,34 +56,37 @@ export function parseProfile(data: any): Profile {
 export async function getProfile(
   profileLangAddress: string,
   did: string
-): Promise<ProfileExpression | null> {
-  const cache = new TimeoutCache<ProfileExpression>(1000 * 60 * 5);
+): Promise<ProfileWithDID | null> {
+  const profileRef = `${profileLangAddress}://${did}`;
 
-  const profileLink = `${profileLangAddress}://${did}`;
+  const profileExp = await profileCache.get(profileRef);
 
-  const profile = cache.get(profileLink);
-
-  if (!profile) {
+  if (!profileExp) {
     console.warn(
       "Did not get profile expression from cache, calling holochain"
     );
-    const profileGqlExp = await getExpressionNoCache(profileLink);
+    const profileGqlExp = await getExpressionNoCache(profileRef);
 
     if (profileGqlExp) {
-      const profileExp = {
+      const exp = {
         author: profileGqlExp.author!,
-        data: JSON.parse(profileGqlExp.data!),
+        data: JSON.parse(profileGqlExp.data),
         timestamp: profileGqlExp.timestamp!,
         proof: profileGqlExp.proof!,
       } as ProfileExpression;
 
-      cache.set(profileLink, profileExp);
-
-      return profileExp;
+      await profileCache.set(profileRef, exp);
+      return {
+        did,
+        ...parseProfile(exp.data.profile),
+      };
     } else {
       return null;
     }
+  } else {
+    return {
+      did,
+      ...parseProfile(profileExp.data.profile),
+    };
   }
-
-  return profile;
 }
diff --git a/src/utils/timeoutCache.ts b/src/utils/timeoutCache.ts
index dbb5c9420..f4a1da69f 100644
--- a/src/utils/timeoutCache.ts
+++ b/src/utils/timeoutCache.ts
@@ -1,4 +1,6 @@
-interface TimeoutCacheItem {
+import storeDb from "@/storeDb";
+
+export interface TimeoutCacheItem {
   value: any;
   expiry: number;
 }
@@ -10,7 +12,7 @@ export class TimeoutCache<T> {
     this.ttl = ttl;
   }
 
-  set(key: string, value: T) {
+  async set(key: string, value: T): Promise<void> {
     const now = new Date();
 
     const item: TimeoutCacheItem = {
@@ -18,13 +20,12 @@ export class TimeoutCache<T> {
       expiry: now.getTime() + this.ttl,
     };
 
-    localStorage.setItem(key, JSON.stringify(item));
+    await storeDb.setItem(key, item);
   }
 
-  get(key: string): T | undefined {
+  async get(key: string): Promise<T | undefined> {
     const now = new Date();
-    const item = localStorage.getItem(key);
-
+    const item = await storeDb.getItem(key);
     if (!item) {
       return undefined;
     }
@@ -32,7 +33,7 @@ export class TimeoutCache<T> {
     const parseditem: TimeoutCacheItem = JSON.parse(item);
 
     if (now.getTime() > parseditem.expiry) {
-      localStorage.removeItem(key);
+      await storeDb.deleteItemByKey(key);
 
       return undefined;
     }
@@ -40,7 +41,9 @@ export class TimeoutCache<T> {
     return parseditem.value;
   }
 
-  remove(key: string) {
-    localStorage.removeItem(key);
+  async remove(key: string): Promise<void> {
+    await storeDb.deleteItemByKey(key);
   }
 }
+
+export default TimeoutCache;
\ No newline at end of file
diff --git a/src/views/channel-view/ChannelFooter.vue b/src/views/channel-view/ChannelFooter.vue
index d64633cc0..932c19523 100644
--- a/src/views/channel-view/ChannelFooter.vue
+++ b/src/views/channel-view/ChannelFooter.vue
@@ -14,15 +14,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
-import { ExpressionTypes, ProfileExpression } from "@/store/types";
+import { defineComponent, PropType } from "vue";
+import { ExpressionTypes, ProfileWithDID } from "@/store/types";
 import { Editor } from "@tiptap/vue-3";
-import { ACCOUNT_NAME } from "@/constants/profile";
 import { useDataStore } from "@/store/data";
-
-interface UserMap {
-  [key: string]: ProfileExpression;
-}
+import { getProfile } from "@/utils/profileHelpers";
+import { ChannelState, CommunityState } from "@/store/types";
 
 interface MentionTrigger {
   name: string;
@@ -32,7 +29,16 @@ interface MentionTrigger {
 
 export default defineComponent({
   name: "ChannelFooter",
-  props: ["channel", "community"],
+  props: {
+    channel: {
+      type: Object as PropType<ChannelState>,
+      required: true,
+    },
+    community: {
+      type: Object as PropType<CommunityState>,
+      required: true,
+    },
+  },
   setup() {
     const dataStore = useDataStore();
 
@@ -45,35 +51,62 @@ export default defineComponent({
       showNewMessagesButton: false,
       noDelayRef: 0,
       currentExpressionPost: "",
-      users: {} as UserMap,
-      linksWorker: null as null | Worker,
       editor: null as Editor | null,
       showList: false,
       showProfile: false,
       activeProfile: {} as any,
+      memberMentions: [] as MentionTrigger[],
     };
   },
-  computed: {
-    memberMentions(): MentionTrigger[] {
-      return Object.values(this.community.neighbourhood.members).map(
-        (m: any) =>
-          ({
-            name: m.data.profile[ACCOUNT_NAME],
+  watch: {
+    channel: {
+      handler: async function () {
+        const profiles = await Promise.all(
+          this.community.neighbourhood.members.map(
+            async (did: string): Promise<ProfileWithDID | null> =>
+              await getProfile(this.profileLanguage, did)
+          )
+        );
+
+        const filteredProfiles = profiles.filter(
+          (profile) => profile !== null
+        ) as ProfileWithDID[];
+
+        const mentions = filteredProfiles.map((user: ProfileWithDID) => {
+          return {
+            name: user.username,
             //todo: this should not be replaced, we want the full did identifier in the mentions in case message is consumed by another application
-            id: m.author,
+            id: user.did,
             trigger: "@",
-          } as MentionTrigger)
-      );
+          } as MentionTrigger;
+        });
+
+        this.memberMentions = mentions;
+      },
+      immediate: true,
     },
+  },
+  computed: {
     channelMentions(): MentionTrigger[] {
       return this.dataStore
         .getChannelNeighbourhoods(this.community.neighbourhood.perspective.uuid)
         .map((channel) => {
-          return {
-            name: channel.name,
-            id: channel.neighbourhoodUrl,
-            trigger: "#",
-          } as MentionTrigger;
+          if (
+            channel.neighbourhoodUrl ===
+            this.community.neighbourhood.neighbourhoodUrl
+          ) {
+            return {
+              name: "Home",
+              id: channel.neighbourhoodUrl,
+              trigger: "#",
+            } as MentionTrigger;
+          } else {
+            return {
+              name: channel.name,
+              id: channel.neighbourhoodUrl,
+              trigger: "#",
+            } as MentionTrigger;
+          }
         });
     },
     profileLanguage(): string {
diff --git a/src/views/channel-view/ChannelHeader.vue b/src/views/channel-view/ChannelHeader.vue
index 620cdb913..df6521990 100644
--- a/src/views/channel-view/ChannelHeader.vue
+++ b/src/views/channel-view/ChannelHeader.vue
@@ -2,9 +2,7 @@
   <header class="channel-header">
     <j-flex a="center" gap="200">
       <j-icon color="ui-500" name="hash" />
-      <j-text nomargin weight="500" size="500">
-        {{ channel.neighbourhood.name }}</j-text
-      >
+      <j-text nomargin weight="500" size="500"> {{ this.channelName }}</j-text>
     </j-flex>
     <j-flex a="center" gap="300">
       <j-button
@@ -35,6 +33,18 @@ export default defineComponent({
   methods: {
     ...mapActions(useDataStore, ["setChannelNotificationState"]),
   },
+  computed: {
+    channelName() {
+      if (
+        this.community.neighbourhood.neighbourhoodUrl ==
+        this.channel.neighbourhood.neighbourhoodUrl
+      ) {
+        return "Home";
+      } else {
+        return this.channel.neighbourhood.name;
+      }
+    },
+  },
 });
 </script>
 
diff --git a/src/views/channel-view/ChannelMessages.vue b/src/views/channel-view/ChannelMessages.vue
index 526f9b572..9b8e9529a 100644
--- a/src/views/channel-view/ChannelMessages.vue
+++ b/src/views/channel-view/ChannelMessages.vue
@@ -51,7 +51,7 @@
             :message="item.expression.data.body"
             :timestamp="item.expression.timestamp"
             :username="users[item.expression.author]?.username"
-            :profileImg="users[item.expression.author]?.profilePicture"
+            :profileImg="users[item.expression.author]?.thumbnailPicture"
             @profileClick="(did) => $emit('profileClick', did)"
             @mentionClick="(dataset) => $emit('mentionClick', dataset)"
           />
@@ -64,7 +64,7 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 import { ExpressionAndRef, Profile } from "@/store/types";
-import { getProfile, parseProfile } from "@/utils/profileHelpers";
+import { getProfile } from "@/utils/profileHelpers";
 import { differenceInMinutes, parseISO } from "date-fns";
 import MessageItem from "@/components/message-item/MessageItem.vue";
 import { Editor } from "@tiptap/vue-3";
@@ -167,9 +167,13 @@ export default defineComponent({
           // TODO: Debounce this
           this.scrollToBottom("smooth");
         }
-        messages.forEach((msg: ExpressionAndRef) => {
-          if (!this.users[msg.expression.author]) {
-            this.loadUser(msg.expression.author);
+        //Get an array of unique did's that we need to load
+        const uniqueDids = Array.from(
+          new Set(messages.map((a) => a.expression.author))
+        );
+        uniqueDids.forEach(async (did: string) => {
+          if (!this.users[did]) {
+            this.loadUser(did);
           }
         });
       },
@@ -239,10 +243,9 @@ export default defineComponent({
     },
     async loadUser(did: string) {
       let profileLang = this.profileLanguage;
-      const dataExp = await getProfile(profileLang, did);
-      if (dataExp) {
-        const { data } = dataExp;
-        this.users[did] = parseProfile(data.profile);
+      const profile = await getProfile(profileLang, did);
+      if (profile) {
+        this.users[did] = profile;
       }
     },
   },
diff --git a/src/views/community-view/CommunityView.vue b/src/views/community-view/CommunityView.vue
index c950f3067..ed62f8142 100644
--- a/src/views/community-view/CommunityView.vue
+++ b/src/views/community-view/CommunityView.vue
@@ -105,13 +105,15 @@ export default defineComponent({
     return {
       hasCopied: false,
       channelWorkerLoop: null as null | Worker,
-      groupExpWorkerLoop: null as null | Worker,
-      memberExpressionLoop: null as null | Worker,
     };
   },
   watch: {
     "$route.params.communityId": {
       handler: function (id: string) {
+        if (id != undefined) {
+          this.dataStore.fetchNeighbourhoodMembers(id);
+          this.dataStore.fetchNeighbourhoodMetadata(id);
+        }
         this.handleWorker(id);
         this.handleThemeChange(id);
         this.goToActiveChannel(id);
@@ -155,24 +157,13 @@ export default defineComponent({
     },
     async handleWorker(id: string): Promise<void> {
       this.channelWorkerLoop?.terminate();
-      this.groupExpWorkerLoop?.terminate();
-      this.memberExpressionLoop?.terminate();
 
       if (id) {
         const channelLinksWorker =
           await this.dataStore.getNeighbourhoodChannels({
             communityId: id,
           });
-        const groupExpressionWorker =
-          await this.dataStore.getNeighbourhoodMetadata({
-            communityId: id,
-          });
-        const memberExpressionWorker =
-          await this.dataStore.getNeighbourhoodMembers(id);
-
         this.channelWorkerLoop = channelLinksWorker;
-        this.groupExpWorkerLoop = groupExpressionWorker;
-        this.memberExpressionLoop = memberExpressionWorker;
       }
     },
     getInviteCode() {
diff --git a/src/views/community-view/community-sidebar/CommunitySidebar.vue b/src/views/community-view/community-sidebar/CommunitySidebar.vue
index 47044cd7e..3eb8c1417 100644
--- a/src/views/community-view/community-sidebar/CommunitySidebar.vue
+++ b/src/views/community-view/community-sidebar/CommunitySidebar.vue
@@ -42,9 +42,7 @@
   <j-box pt="500">
     <j-menu-group-item
       open
-      :title="`Members (${
-        Object.keys(community.neighbourhood.members).length
-      })`"
+      :title="`Members (${community.neighbourhood.members.length})`"
     >
       <j-button
         @click.prevent="() => setShowInviteCode(true)"
@@ -58,6 +56,7 @@
         <avatar-group
           @click="() => setShowCommunityMembers(true)"
           :users="community.neighbourhood.members"
+          :profileLanguage="profileLanguage"
         />
       </j-box>
     </j-menu-group-item>
@@ -152,7 +151,11 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 import AvatarGroup from "@/components/avatar-group/AvatarGroup.vue";
-import { ChannelState } from "@/store/types";
+import {
+  ChannelState,
+  ExpressionTypes,
+  FluxExpressionReference,
+} from "@/store/types";
 import { mapActions, mapState } from "pinia";
 import { useDataStore } from "@/store/data";
 import { useAppStore } from "@/store/app";
@@ -182,6 +185,12 @@ export default defineComponent({
         this.userStore.getUser?.agent.did
       );
     },
+    profileLanguage(): string {
+      return this.community.neighbourhood.typedExpressionLanguages.find(
+        (t: FluxExpressionReference) =>
+          t.expressionType === ExpressionTypes.ProfileExpression
+      ).languageAddress;
+    },
   },
   methods: {
     ...mapActions(useDataStore, ["setChannelNotificationState"]),
diff --git a/src/views/main-view/MainView.vue b/src/views/main-view/MainView.vue
index 02e368a3f..cacdff5ad 100644
--- a/src/views/main-view/MainView.vue
+++ b/src/views/main-view/MainView.vue
@@ -40,7 +40,7 @@
         </j-flex>
       </j-box>
       <j-text variant="ingress">
-        This is an early version of Junto. Don't use this for essential
+        This is an early version of Flux. Don't use this for essential
         communication.
       </j-text>
       <ul>
diff --git a/src/views/main-view/main-sidebar/BottomSection.vue b/src/views/main-view/main-sidebar/BottomSection.vue
index 7e9eeee38..db0d3c91a 100644
--- a/src/views/main-view/main-sidebar/BottomSection.vue
+++ b/src/views/main-view/main-sidebar/BottomSection.vue
@@ -43,10 +43,12 @@
             <j-icon size="sm" slot="start" name="gear"></j-icon>
             Settings
           </j-menu-item>
-          <j-menu-item @click="() => $router.replace({ name: 'login' })">
+          <!-- TODO: Wee need to lock the user first
+          <j-menu-item @click="logOut">
             <j-icon size="sm" slot="start" name="door-closed"></j-icon>
             Log out
           </j-menu-item>
+          -->
         </j-menu>
       </j-popover>
     </j-tooltip>
@@ -85,6 +87,9 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useAppStore, ["setShowEditProfile", "setShowSettings"]),
+    logOut(): void {
+      this.$router.replace({ name: "login" });
+    },
     checkForUpdates() {
       window.api.send("check-update");
       this.appStore.setUpdateState({ updateState: "checking" });
diff --git a/src/views/signup/SignUp.vue b/src/views/signup/SignUp.vue
index bafd3dcdd..7c21a4569 100644
--- a/src/views/signup/SignUp.vue
+++ b/src/views/signup/SignUp.vue
@@ -3,18 +3,16 @@
     <div class="signup-view__flow">
       <j-flex direction="column" gap="400" v-if="step === 1">
         <j-box class="signup-view__flow-back" pb="500">
-          <j-button @click="showSignup = false" variant="link"
-            ><j-icon name="arrow-left-short" />Back</j-button
-          >
+          <j-button @click="showSignup = false" variant="link">
+            <j-icon name="arrow-left-short" />
+            Back
+          </j-button>
         </j-box>
-        <j-box pb="500">
-          <j-flex gap="400" a="center">
-            <img src="@/assets/images/junto_web_logo--rainbow.png" width="25" />
-            <j-text size="800" color="ui-800" uppercase nomargin>
-              Junto
-            </j-text>
-          </j-flex>
+
+        <j-box pb="800">
+          <Logo width="150px" />
         </j-box>
+
         <j-text variant="heading"> Create a user </j-text>
         <j-input
           label="Username"
@@ -58,23 +56,27 @@
           <j-icon slot="end" name="arrow-right-short" />
         </j-button>
       </j-flex>
-      <j-flex direction="column" gap="400" v-if="step === 2">
+      <j-flex direction="column" gap="500" v-if="step === 2">
         <avatar-upload
+          icon="camera"
           :value="profilePicture"
           @change="(url) => (profilePicture = url)"
         >
         </avatar-upload>
         <j-input
+          size="lg"
           label="First Name (optional)"
           :value="name"
           @input="(e) => (name = e.target.value)"
         ></j-input>
         <j-input
+          size="lg"
           label="Last Name (optional)"
           :value="familyName"
           @input="(e) => (familyName = e.target.value)"
         ></j-input>
         <j-input
+          size="lg"
           type="email"
           label="Email (optional)"
           :value="email"
@@ -127,11 +129,14 @@ import {
 import { useValidation } from "@/utils/validation";
 import { useUserStore } from "@/store/user";
 
+import Logo from "@/components/logo/Logo.vue";
+
 export default defineComponent({
   name: "Welcome",
   components: {
     AvatarUpload,
     Carousel,
+    Logo,
   },
   setup() {
     const showSignup = ref(false);
@@ -227,7 +232,7 @@ export default defineComponent({
   methods: {
     async createUser() {
       const resizedImage = this.profilePicture
-        ? await resizeImage(dataURItoBlob(this.profilePicture as string), 400)
+        ? await resizeImage(dataURItoBlob(this.profilePicture as string), 100)
         : undefined;
       const thumbnail = this.profilePicture
         ? await blobToDataURL(resizedImage!)
diff --git a/src/views/signup/SignUpCarousel.vue b/src/views/signup/SignUpCarousel.vue
index 619d6e7b8..a1902caac 100644
--- a/src/views/signup/SignUpCarousel.vue
+++ b/src/views/signup/SignUpCarousel.vue
@@ -3,7 +3,7 @@
     <div class="slider__slide">
       <div class="slider__slide-content">
         <j-box pt="500" pb="800">
-          <img width="500" src="@/assets/images/app-secure.png" />
+          <Orb3 height="35vh"></Orb3>
         </j-box>
         <j-text variant="heading">Communicate Privately and Freely</j-text>
         <j-text variant="ingress">
@@ -15,7 +15,7 @@
     <div class="slider__slide">
       <div class="slider__slide-content">
         <j-box pt="500" pb="800">
-          <img width="500" src="@/assets/images/app-secure.png" />
+          <Orb height="35vh"></Orb>
         </j-box>
         <j-text variant="heading">
           Create Groups, Communities and Networks
@@ -29,7 +29,7 @@
     <div class="slider__slide">
       <div class="slider__slide-content">
         <j-box pt="500" pb="800">
-          <img width="500" src="@/assets/images/app-secure.png" />
+          <Orb2 height="35vh"></Orb2>
         </j-box>
         <j-text variant="heading">Take Back the Internet</j-text>
         <j-text variant="ingress">
@@ -44,8 +44,16 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
+import Orb from "@/components/orb/Orb.vue";
+import Orb2 from "@/components/orb/Orb2.vue";
+import Orb3 from "@/components/orb/Orb3.vue";
 
 export default defineComponent({
+  components: {
+    Orb,
+    Orb2,
+    Orb3,
+  },
   data() {
     return {
       currentIndex: 0,
diff --git a/vue.config.js b/vue.config.js
index f27d186e9..f78056a62 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
       preload: "src/preload.js",
       externals: ["@perspect3vism/ad4m-executor", "fs"],
       builderOptions: {
-        productName: "Junto",
-        appId: "junto.foundation.communities",
+        productName: "Flux",
+        appId: "junto.foundation.flux",
         mac: {
           target: "default",
           binaries: [