diff --git a/app/app.js b/app/app.js
index 5e8405f..3931ca1 100644
--- a/app/app.js
+++ b/app/app.js
@@ -25,15 +25,3 @@ export const bootstrap = emberLifecycles.bootstrap;
 export const mount = emberLifecycles.mount;
 export const unmount = emberLifecycles.unmount;
 
-/*
-export const unmount = () => {
-
-  return emberLifecycles.unmount().then(() => {
-
-  const app = Array.from(document.querySelectorAll('script')).filter(s => s.src.endsWith('/navbar/assets/navbar.js'))
-  document.head.removeChild(app[0]);
-  const vendor = Array.from(document.querySelectorAll('script')).filter(s => s.src.endsWith('/navbar/assets/vendor.js'))
-  document.head.removeChild(vendor[0]);
-  });
-}
-*/
diff --git a/app/styles/app.css b/app/styles/app.css
index e69de29..8b13789 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -0,0 +1 @@
+
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 651680a..aadee0a 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -1,5 +1,6 @@
  <div class="h-16 flex items-center justify-between px-6 bg-burnt-ember text-white">
       <div class="flex items-center justify-between">
+        <span class="px-6 font-bold">Ember Micro-Frontends</span>
         <LinkTo @route="index" class="p-6">Home</LinkTo> 
         <LinkTo @route="people" class="p-6">People</LinkTo> 
         <LinkTo @route="planets" class="p-6">Planets</LinkTo> 
diff --git a/app/templates/loading.hbs b/app/templates/loading.hbs
new file mode 100644
index 0000000..f415d55
--- /dev/null
+++ b/app/templates/loading.hbs
@@ -0,0 +1 @@
+<h1>Loading...</h1>
diff --git a/package.json b/package.json
index 7cb35e6..ab820f3 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "start": "ember serve --port 4200",
     "test": "npm-run-all lint:* test:*",
     "test:ember": "ember test",
-    "deploy": "npm run build && gh-pages -d dist"
+    "deploy": "git push && npm run build && gh-pages -d dist"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
@@ -59,6 +59,7 @@
     "edition": "octane"
   },
   "dependencies": {
+    "csz": "^1.2.0",
     "single-spa": "^5.8.0",
     "single-spa-ember": "^0.2.0"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 70773d2..c12f8f5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,5 @@
 dependencies:
+  csz: 1.2.0
   single-spa: 5.8.0
   single-spa-ember: 0.2.0
 devDependencies:
@@ -16,7 +17,6 @@ devDependencies:
   ember-cli-inject-live-reload: 2.0.2
   ember-cli-sri: 2.1.1
   ember-cli-uglify: 3.0.0
-  ember-data: 3.19.0
   ember-export-application-global: 2.0.1
   ember-fetch: 8.0.2
   ember-load-initializers: 2.1.1
@@ -1133,134 +1133,10 @@ packages:
     hasBin: true
     resolution:
       integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
-  /@ember-data/adapter/3.19.0:
-    dependencies:
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember-data/store': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      ember-cli-babel: 7.23.0
-      ember-cli-test-info: 1.0.0
-      ember-cli-typescript: 3.1.4
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-XELDnxcp6ZOxBrr5abebWeHrEbapSvszolQhuGVoCvl7EAr0IEWeJ8JGrAd6IhTt+XAHNzQ7rr28XVw7FA4Vtw==
-  /@ember-data/canary-features/3.19.0:
-    dependencies:
-      ember-cli-babel: 7.23.0
-      ember-cli-typescript: 3.1.4
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-AVrWEP4fARk2ee/CWGOEjLJwK2h+Un37CNIkxEFK9JG5tQh7yzBnbw74ZqDK7Ue9qqjF1fMwDOQUmvstm8SokA==
-  /@ember-data/debug/3.19.0:
-    dependencies:
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      ember-cli-babel: 7.23.0
-      ember-cli-test-info: 1.0.0
-      ember-cli-typescript: 3.1.4
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-cTWKMuOiNa9rPAeY/iB4XznVL5Hs11MwLLJ8LgFP3ksZiveo2PQ4XnpxKmNj+p/QVMHRsdWaydg5MsFM7NH/ZQ==
-  /@ember-data/model/3.19.0:
-    dependencies:
-      '@ember-data/canary-features': 3.19.0
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember-data/store': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      ember-cli-babel: 7.23.0
-      ember-cli-string-utils: 1.1.0
-      ember-cli-test-info: 1.0.0
-      ember-cli-typescript: 3.1.4
-      ember-compatibility-helpers: 1.2.1
-      inflection: 1.12.0
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-OzQwzqk0NQRqHnGT1ZjSQBESfRJdqRFGTXIImxmGv4Mwb3I+3dpVETt/E2wPKP0GyhZqEUCg8X6Z4itY5ATKtw==
-  /@ember-data/private-build-infra/3.19.0:
-    dependencies:
-      '@babel/plugin-transform-block-scoping': 7.12.1
-      '@ember-data/canary-features': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      babel-plugin-debug-macros: 0.3.3
-      babel-plugin-filter-imports: 4.0.0
-      babel6-plugin-strip-class-callcheck: 6.0.0
-      broccoli-debug: 0.6.5
-      broccoli-file-creator: 2.1.1
-      broccoli-funnel: 2.0.2
-      broccoli-merge-trees: 4.2.0
-      broccoli-rollup: 4.1.1
-      calculate-cache-key-for-tree: 2.0.0
-      chalk: 4.1.0
-      ember-cli-babel: 7.23.0
-      ember-cli-path-utils: 1.0.0
-      ember-cli-string-utils: 1.1.0
-      ember-cli-typescript: 3.1.4
-      ember-cli-version-checker: 5.1.1
-      esm: 3.2.25
-      git-repo-info: 2.1.1
-      glob: 7.1.6
-      npm-git-info: 1.0.3
-      rimraf: 3.0.2
-      rsvp: 4.8.5
-      semver: 7.3.2
-      silent-error: 1.1.1
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-uyXsW7x7ZJSxS1n69llvClfR9uUJ/AgWbghzo7oB7nHUML105W5E+Fp9JmBO/X2w3O7jk2NxNDM4/8xV5wPZVA==
-  /@ember-data/record-data/3.19.0:
-    dependencies:
-      '@ember-data/canary-features': 3.19.0
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember-data/store': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      '@ember/ordered-set': 2.0.3
-      ember-cli-babel: 7.23.0
-      ember-cli-test-info: 1.0.0
-      ember-cli-typescript: 3.1.4
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-2tjhtJ+SSjzIF2UngSS8BAwxC1j53gxR2ewB9T4W530rqZ/pxLv5JkjLRlbtstFwFq34/okQY6MPCjapgY1k7Q==
   /@ember-data/rfc395-data/0.0.4:
     dev: true
     resolution:
       integrity: sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
-  /@ember-data/serializer/3.19.0:
-    dependencies:
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember-data/store': 3.19.0
-      ember-cli-babel: 7.23.0
-      ember-cli-test-info: 1.0.0
-      ember-cli-typescript: 3.1.4
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-eyUODXfuGWRcDxo37JNsWYnxWGf1uv7oTlC+m0DJHSCZpql24Dc0VfIJ8JtSmi4G7wq3EtCfVx1vni/HKJinfg==
-  /@ember-data/store/3.19.0:
-    dependencies:
-      '@ember-data/canary-features': 3.19.0
-      '@ember-data/private-build-infra': 3.19.0
-      ember-cli-babel: 7.23.0
-      ember-cli-path-utils: 1.0.0
-      ember-cli-typescript: 3.1.4
-      heimdalljs: 0.3.3
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-4/sOvUd4oeAzB+k57qkbBy9ssUU7MjyNiQZwqYxmlPU9k/1T2/gUKZVmZtDIab1zInIFzLsFpS0PYv9Gt1mz3Q==
   /@ember/edition-utils/1.2.0:
     dev: true
     resolution:
@@ -1279,15 +1155,6 @@ packages:
       node: 8.* || >= 10.*
     resolution:
       integrity: sha512-Lrfojy4xKwTX+J4EAylmxZY2TO6bQtP4Lg5C8/z2priVqiT0X5fVB1+4WQCJbRBetctO1lMDnqjmhWCVKB8bmQ==
-  /@ember/ordered-set/2.0.3:
-    dependencies:
-      ember-cli-babel: 6.18.0
-      ember-compatibility-helpers: 1.2.1
-    dev: true
-    engines:
-      node: 6.* || 8.* || >= 10.*
-    resolution:
-      integrity: sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA==
   /@ember/test-helpers/1.7.2:
     dependencies:
       broccoli-debug: 0.6.5
@@ -1480,10 +1347,6 @@ packages:
     dev: true
     resolution:
       integrity: sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
-  /@types/broccoli-plugin/1.3.0:
-    dev: true
-    resolution:
-      integrity: sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==
   /@types/chai-as-promised/7.1.3:
     dependencies:
       '@types/chai': 4.2.14
@@ -2350,6 +2213,17 @@ packages:
       '@babel/core': ^7.0.0-beta.42
     resolution:
       integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  /babel-plugin-debug-macros/0.2.0_@babel+core@7.12.3:
+    dependencies:
+      '@babel/core': 7.12.3
+      semver: 5.7.1
+    dev: true
+    engines:
+      node: '>=4'
+    peerDependencies:
+      '@babel/core': ^7.0.0-beta.42
+    resolution:
+      integrity: sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
   /babel-plugin-debug-macros/0.3.3:
     dependencies:
       semver: 5.7.1
@@ -2754,10 +2628,6 @@ packages:
     dev: true
     resolution:
       integrity: sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  /babel6-plugin-strip-class-callcheck/6.0.0:
-    dev: true
-    resolution:
-      integrity: sha1-3oQcGr6705943gr/ssmlLuIo/d8=
   /babylon/6.18.0:
     dev: true
     hasBin: true
@@ -3421,22 +3291,6 @@ packages:
       node: '>=4.0'
     resolution:
       integrity: sha512-aky/Ovg5DbsrsJEx2QCXxHLA6ZR+9u1TNVTf85soP4gL8CjGGKQ/JU8R3BZ2ntkWzo6/83RCKzX6O+nlNKR5MQ==
-  /broccoli-rollup/4.1.1:
-    dependencies:
-      '@types/broccoli-plugin': 1.3.0
-      broccoli-plugin: 2.1.0
-      fs-tree-diff: 2.0.1
-      heimdalljs: 0.2.6
-      node-modules-path: 1.0.2
-      rollup: 1.32.1
-      rollup-pluginutils: 2.8.2
-      symlink-or-copy: 1.3.1
-      walk-sync: 1.1.4
-    dev: true
-    engines:
-      node: '>=8.0'
-    resolution:
-      integrity: sha512-hkp0dB5chiemi32t6hLe5bJvxuTOm1TU+SryFlZIs95KT9+94uj0C8w6k6CsZ2HuIdIZg6D252t4gwOlcTXrpA==
   /broccoli-slow-trees/3.1.0:
     dependencies:
       heimdalljs: 0.2.6
@@ -4374,6 +4228,10 @@ packages:
     dev: true
     resolution:
       integrity: sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  /csz/1.2.0:
+    dev: false
+    resolution:
+      integrity: sha512-ogD+AujFtLbqAtM/sornlZMruH0LJ/tcPsnGvt/mfqYOhVKtLHBcuLWUToK3oKLKLDjRgLBN3MTqG4vPhN2SCQ==
   /cyclist/1.0.1:
     dev: true
     resolution:
@@ -4700,7 +4558,7 @@ packages:
       broccoli-debug: 0.6.5
       broccoli-plugin: 1.3.1
       debug: 3.2.6
-      ember-cli-babel: 6.18.0
+      ember-cli-babel: 6.18.0_@babel+core@7.12.3
       enhanced-resolve: 4.3.0
       fs-extra: 6.0.1
       fs-tree-diff: 1.0.2
@@ -4755,6 +4613,28 @@ packages:
       node: ^4.5 || 6.* || >= 7.*
     resolution:
       integrity: sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
+  /ember-cli-babel/6.18.0_@babel+core@7.12.3:
+    dependencies:
+      amd-name-resolver: 1.2.0
+      babel-plugin-debug-macros: 0.2.0_@babel+core@7.12.3
+      babel-plugin-ember-modules-api-polyfill: 2.13.4
+      babel-plugin-transform-es2015-modules-amd: 6.24.1
+      babel-polyfill: 6.26.0
+      babel-preset-env: 1.7.0
+      broccoli-babel-transpiler: 6.5.1
+      broccoli-debug: 0.6.5
+      broccoli-funnel: 2.0.2
+      broccoli-source: 1.1.0
+      clone: 2.1.2
+      ember-cli-version-checker: 2.2.0
+      semver: 5.7.1
+    dev: true
+    engines:
+      node: ^4.5 || 6.* || >= 7.*
+    peerDependencies:
+      '@babel/core': '*'
+    resolution:
+      integrity: sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
   /ember-cli-babel/7.23.0:
     dependencies:
       '@babel/core': 7.12.3
@@ -4891,12 +4771,6 @@ packages:
     dev: true
     resolution:
       integrity: sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
-  /ember-cli-test-info/1.0.0:
-    dependencies:
-      ember-cli-string-utils: 1.1.0
-    dev: true
-    resolution:
-      integrity: sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q=
   /ember-cli-test-loader/2.2.0:
     dependencies:
       ember-cli-babel: 6.18.0
@@ -5117,27 +4991,6 @@ packages:
       node: ^4.5 || 6.* || >= 7.*
     resolution:
       integrity: sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
-  /ember-data/3.19.0:
-    dependencies:
-      '@ember-data/adapter': 3.19.0
-      '@ember-data/debug': 3.19.0
-      '@ember-data/model': 3.19.0
-      '@ember-data/private-build-infra': 3.19.0
-      '@ember-data/record-data': 3.19.0
-      '@ember-data/serializer': 3.19.0
-      '@ember-data/store': 3.19.0
-      '@ember/edition-utils': 1.2.0
-      '@ember/ordered-set': 2.0.3
-      '@glimmer/env': 0.1.7
-      broccoli-merge-trees: 4.2.0
-      ember-cli-babel: 7.23.0
-      ember-cli-typescript: 3.1.4
-      ember-inflector: 3.0.1
-    dev: true
-    engines:
-      node: 10.* || >= 12.*
-    resolution:
-      integrity: sha512-dZwJNevHXOOzeokOnzgmrxPPFjGwNgPidGECuNYjjHxg4CaumbNpbxj6GgfBq4gyF7zHkMAQeHmph56935kR6g==
   /ember-export-application-global/2.0.1:
     dev: true
     engines:
@@ -5164,14 +5017,6 @@ packages:
       node: '>= 10'
     resolution:
       integrity: sha512-BMwm8jLP5LCeT8Jbgz0jA04RsRyt06ZGMaC3Tx2DbHgoWOPlLMfkEKlCFE0dZVW8ZhuICKuyRZTzt4e8GrnnNA==
-  /ember-inflector/3.0.1:
-    dependencies:
-      ember-cli-babel: 6.18.0
-    dev: true
-    engines:
-      node: ^4.5 || 6.* || >= 7.*
-    resolution:
-      integrity: sha512-fngrwMsnhkBt51KZgwNwQYxgURwV4lxtoHdjxf7RueGZ5zM7frJLevhHw7pbQNGqXZ3N+MRkhfNOLkdDK9kFdA==
   /ember-load-initializers/2.1.1:
     dependencies:
       ember-cli-babel: 7.23.0
@@ -6918,12 +6763,6 @@ packages:
     dev: true
     resolution:
       integrity: sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
-  /heimdalljs/0.3.3:
-    dependencies:
-      rsvp: 3.2.1
-    dev: true
-    resolution:
-      integrity: sha1-6S0sb3f9RtW/ULYQ0orTF1UFTQs=
   /hmac-drbg/1.0.1:
     dependencies:
       hash.js: 1.1.7
@@ -8618,10 +8457,6 @@ packages:
       node: '>=4'
     resolution:
       integrity: sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
-  /npm-git-info/1.0.3:
-    dev: true
-    resolution:
-      integrity: sha1-qTPELsMh6A02RuDW6ESv6UYw4dU=
   /npm-package-arg/8.1.0:
     dependencies:
       hosted-git-info: 3.0.7
@@ -9952,15 +9787,6 @@ packages:
     hasBin: true
     resolution:
       integrity: sha512-I18GBqP0qJoJC1K1osYjreqA8VAKovxuI3I81RSk0Dmr4TgloI0tAULjZaox8OsJ+n7XRrhH6i0G2By/pj1LCA==
-  /rollup/1.32.1:
-    dependencies:
-      '@types/estree': 0.0.45
-      '@types/node': 14.14.5
-      acorn: 7.4.1
-    dev: true
-    hasBin: true
-    resolution:
-      integrity: sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
   /rsvp/3.2.1:
     dev: true
     resolution:
@@ -11811,6 +11637,7 @@ specifiers:
   '@glimmer/tracking': ^1.0.0
   babel-eslint: ^10.1.0
   broccoli-asset-rev: ^3.0.0
+  csz: ^1.2.0
   ember-auto-import: ^1.5.3
   ember-cli: ~3.19.0
   ember-cli-app-version: ^3.2.0
@@ -11820,7 +11647,6 @@ specifiers:
   ember-cli-inject-live-reload: ^2.0.2
   ember-cli-sri: ^2.1.1
   ember-cli-uglify: ^3.0.0
-  ember-data: ~3.19.0
   ember-export-application-global: ^2.0.1
   ember-fetch: ^8.0.1
   ember-load-initializers: ^2.1.1