diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts
index e590d73e44..1a26b85809 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts
@@ -11,6 +11,7 @@ export class UmbBackofficeMain extends LitElement {
         flex: 1 1 auto;
       }
 
+      // TODO: not call this editor, I would like to reserve that name for the view of editing data, like what goes in the router-outlet or in infinite editors (or inside Nested Content)
       #editor {
         background-color: var(--uui-color-background);
         width: 100%;
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice-header.element.ts
index 2cbc24371f..9225679438 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice-header.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice-header.element.ts
@@ -9,6 +9,8 @@ import { UmbContextInjectMixin } from '../core/context';
 import { UmbExtensionManifest, UmbExtensionRegistry, UmbManifestSectionMeta } from '../core/extension';
 import { UmbRouter } from '../core/router';
 
+// TODO: umb or not umb in file name?
+
 @customElement('umb-backoffice-header')
 export class UmbBackofficeHeader extends UmbContextInjectMixin(LitElement) {
   static styles: CSSResultGroup = [
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice.element.ts
index acd3cf6929..dc44160592 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/umb-backoffice.element.ts
@@ -29,6 +29,9 @@ export class UmbBackoffice extends LitElement {
     `,
   ];
 
+  // TODO: main div and then side and main again within? I propose the backoffice-main begin renamed to something less main-ish.
+  // TODO: I would think umb-backoffice-header would be outside the router outlet? so its always present.
+
   render() {
     return html`
       <umb-backoffice-header></umb-backoffice-header>
diff --git a/src/Umbraco.Web.UI.Client/src/core/context/context-provide.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/context/context-provide.mixin.ts
index ced9d58051..ee4994ce01 100644
--- a/src/Umbraco.Web.UI.Client/src/core/context/context-provide.mixin.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/context/context-provide.mixin.ts
@@ -13,6 +13,7 @@ export function UmbContextProvideMixin<TBase extends Constructor>(Base: TBase) {
     provide(contextKey: string, instance: any) {
       if (this._providers.has(contextKey)) return;
       this._providers.set(contextKey, new UmbContextProvider(this, contextKey, instance));
+      // TODO: if already connected then attach the new one.
     }
 
     connectedCallback() {