diff --git a/sites/dev/components/layouts/docs.js b/sites/dev/components/layouts/docs.js
index f1a2d7c0516..dbe9719454b 100644
--- a/sites/dev/components/layouts/docs.js
+++ b/sites/dev/components/layouts/docs.js
@@ -1,19 +1,17 @@
 import { useRouter } from 'next/router'
 // Shared components
-import Aside from 'shared/components/navigation/aside'
+import Aside from 'site/components/navigation/aside.js'
 import Breadcrumbs from 'shared/components/breadcrumbs.js'
 import { getCrumbs } from 'shared/utils'
 
-const DefaultLayout = ({ app, title=false, crumbs=false, children=[] }) => {
+const DefaultLayout = ({ app, title = false, crumbs = false, children = [] }) => {
   const router = useRouter()
   const slug = router.asPath.slice(1)
-  const breadcrumbs = crumbs
-    ? crumbs
-    : getCrumbs(app, slug, title)
+  const breadcrumbs = crumbs ? crumbs : getCrumbs(app, slug, title)
 
   return (
     <div className="m-auto flex flex-row justify-center">
-      <Aside app={app} slug={slug}/>
+      <Aside app={app} slug={slug} />
       <section className="py-28 md:py-36 max-w-7xl px-6 xl:pl-8 2xl:pl-16">
         <div>
           {title && (
diff --git a/sites/dev/components/navigation/aside.js b/sites/dev/components/navigation/aside.js
new file mode 100644
index 00000000000..84385f8be67
--- /dev/null
+++ b/sites/dev/components/navigation/aside.js
@@ -0,0 +1,31 @@
+import { MainSections, ActiveSection } from './primary'
+
+const Aside = ({ app, slug, mobileOnly = false, before = [], after = [] }) => (
+  <aside
+    className={`
+    fixed top-0 right-0 h-screen w-screen
+    overflow-y-auto z-20
+    bg-base-100 text-base-content md:bg-base-50
+    transition-all
+    ${app.primaryMenu ? '' : 'translate-x-[-120%]'} transition-transform
+    md:flex md:sticky md:flex-row-reverse
+    md:relative md:transform-none
+    px-6 py-24
+    shrink-0
+    md:w-24 md:px-2 md:justify-center
+    lg:w-96 lg:pr-2 lg:border-r-2
+    xl:w-lg xl:border-0
+    2xl:pr-8
+    ${mobileOnly ? 'block md:hidden' : ''}
+  `}
+  >
+    <div>
+      {before}
+      <MainSections app={app} active={slug} />
+      <ActiveSection app={app} active={slug} />
+      {after}
+    </div>
+  </aside>
+)
+
+export default Aside
diff --git a/sites/dev/components/navigation/primary.js b/sites/dev/components/navigation/primary.js
new file mode 100644
index 00000000000..338627feabb
--- /dev/null
+++ b/sites/dev/components/navigation/primary.js
@@ -0,0 +1,288 @@
+import Link from 'next/link'
+import orderBy from 'lodash.orderby'
+import TutorialIcon from 'shared/components/icons/tutorial.js'
+import GuideIcon from 'shared/components/icons/guide.js'
+import HelpIcon from 'shared/components/icons/help.js'
+import DocsIcon from 'shared/components/icons/docs.js'
+
+// List of icons matched to top-level slug
+const icons = {
+  guides: (className = '') => <GuideIcon className={className} />,
+  howtos: (className = '') => <HelpIcon className={className} />,
+  reference: (className = '') => <DocsIcon className={className} />,
+  tutorials: (className = '') => <TutorialIcon className={className} />,
+}
+
+/* helper method to order nav entries */
+const order = (obj) => orderBy(obj, ['__order', '__title'], ['asc', 'asc'])
+
+// Component for the collapse toggle
+// Exported for re-use
+export const Chevron = ({ w = 8, m = 2 }) => (
+  <svg
+    className={`
+    fill-current opacity-75 w-${w} h-${w} mr-${m}
+    details-toggle hover:text-secondary sm:hover:text-secondary
+  `}
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 20 20"
+  >
+    <path d="M12.95 10.707l.707-.707L8 4.343 6.586 5.757 10.828 10l-4.242 4.243L8 15.657l4.95-4.95z" />
+  </svg>
+)
+
+// Helper method to filter out the real children
+const currentChildren = (current) =>
+  Object.values(order(current)).filter((entry) => typeof entry === 'object')
+
+// Shared classes for links
+// Exported for re-use
+export const linkClasses = `text-lg lg:text-xl
+  py-1
+  text-base-content sm:text-base-content
+  hover:text-secondary
+  sm:hover:text-secondary
+`
+
+// Figure out whether a page is on the path to the active page
+const isActive = (slug, active) => {
+  if (slug === active) return true
+  let result = true
+  const slugParts = slug.split('/')
+  const activeParts = active.split('/')
+  for (const i in slugParts) {
+    if (slugParts[i] !== activeParts[i]) result = false
+  }
+
+  return result
+}
+
+// Component that renders a sublevel of navigation
+const SubLevel = ({ nodes = {}, active }) => (
+  <ul className="pl-5 list-inside">
+    {currentChildren(nodes).map((child) =>
+      Object.keys(child).length > 4 ? (
+        <li key={child.__slug} className="flex flex-row">
+          <details className="grow" open={isActive(child.__slug, active)}>
+            <summary
+              className={`
+              flex flex-row
+              px-2
+              text-base-content
+              sm:text-base-content
+              hover:cursor-row-resize
+              items-center
+            `}
+            >
+              <Link href={`${child.__slug}`}>
+                <a
+                  title={child.__title}
+                  className={`
+                  grow pl-2 border-l-2
+                  ${linkClasses}
+                  hover:cursor-pointer
+                  hover:border-secondary
+                  sm:hover:border-secondary
+                  ${
+                    child.__slug === active
+                      ? 'text-secondary border-secondary sm:text-secondary sm:border-secondary'
+                      : 'text-base-content sm:text-base-content'
+                  }
+                `}
+                >
+                  <span
+                    className={`
+                    text-3xl mr-2 inline-block p-0 leading-3
+                    ${
+                      child.__slug === active
+                        ? 'text-secondary sm:text-secondary translate-y-1'
+                        : 'translate-y-3'
+                    }
+                  `}
+                  >
+                    {child.__slug === active ? <>&bull;</> : <>&deg;</>}
+                  </span>
+                  <span className={child.__slug === active ? 'font-bold' : ''}>
+                    {child.__linktitle || child.__title}
+                  </span>
+                </a>
+              </Link>
+              <Chevron w={6} m={3} />
+            </summary>
+            <SubLevel nodes={child} active={active} />
+          </details>
+        </li>
+      ) : (
+        <li className="pl-2 flex flex-row items-center" key={child.__slug}>
+          <Link href={`${child.__slug}`} title={child.__title}>
+            <a
+              className={`
+              pl-2 border-l-2
+              grow
+              ${linkClasses}
+              hover:cursor-pointer
+              hover:border-secondary
+              sm:hover:border-secondary
+              ${
+                child.__slug === active
+                  ? 'text-secondary border-secondary sm:text-secondary sm:border-secondary'
+                  : 'text-base-content sm:text-base-content'
+              }`}
+            >
+              <span
+                className={`
+                text-3xl mr-2 inline-block p-0 leading-3
+                ${
+                  child.__slug === active
+                    ? 'text-secondary sm:text-secondary translate-y-1'
+                    : 'translate-y-3'
+                }
+              `}
+              >
+                {child.__slug === active ? <>&bull;</> : <>&deg;</>}
+              </span>
+              <span className={child.__slug === active ? 'font-bold' : ''}>
+                {child.__linktitle || child.__title}
+              </span>
+            </a>
+          </Link>
+        </li>
+      )
+    )}
+  </ul>
+)
+
+// Component that renders a toplevel of navigation
+/*
+const TopLevel = ({ icon, title, nav, current, slug, hasChildren=false, active }) => (
+  <details className='py-1' open={0}>
+    <summary className={`
+      flex flex-row uppercase gap-4 font-bold text-lg
+      hover:cursor-row-resize
+      p-2
+      text-base-content
+      sm:text-base-content
+      items-center
+    `}>
+      <span className="text-secondary">{icon}</span>
+      <Link href={`${slug}`}>
+        <a className={`
+          grow ${linkClasses} hover:cursor-pointer
+          ${slug === active
+            ? 'text-secondary sm:text-secondary'
+            : ''
+          }`}
+        >
+          {title}
+        </a>
+      </Link>
+    {hasChildren && <Chevron />}
+    </summary>
+    {hasChildren && <SubLevel nodes={current} active={active} />}
+  </details>
+)
+
+const Navigation = ({ app, active, className='' }) => {
+  if (!app.navigation) return null
+  const output = []
+  for (const page of order(app.navigation)) output.push(<TopLevel
+    key={page.__slug}
+    icon={icons[page.__slug]
+      ? icons[page.__slug]('w-6 h-6')
+      : <span className="text-3xl mr-2 translate-y-3 inline-block p-0 leading-3">&deg;</span>
+    }
+    title={page.__title}
+    slug={page.__slug}
+    hasChildren={1}
+    nav={app.navigation}
+    current={order(app.navigation[page.__slug])}
+    active={active}
+  />)
+
+  return <div className={`pb-20 ${className}`}>{output}</div>
+}
+*/
+export const Icons = ({
+  app,
+  active,
+  ulClasses = '',
+  liClasses = '',
+  linkClasses = `grow text-lg lg:text-xl py-1 text-base-content sm:text-base-content
+  hover:text-secondary sm:hover:text-secondary hover:cursor-pointer
+  flex flex-col items-center`,
+  linkStyle = {},
+}) => {
+  if (!app.navigation) return null
+  const output = []
+  for (const page of order(app.navigation)) {
+    output.push(
+      <li key={page.__slug}>
+        <Link href={`${page.__slug}`}>
+          <a className={linkClasses} title={page.__title} style={linkStyle}>
+            {icons[page.__slug] ? icons[page.__slug]('w-14 h-14') : <HelpIcon />}
+            <span className="font-bold">{page.__title}</span>
+          </a>
+        </Link>
+      </li>
+    )
+  }
+
+  return <ul className={ulClasses}>{output}</ul>
+}
+/*
+const PrimaryMenu = ({ app, active, before=[], after=[] }) => (
+  <nav className="mb-12">
+    {before}
+    <Icons app={app} ulClasses="hidden md:block lg:hidden flex flex-col items-center"/>
+    <Navigation app={app} active={active} className="md:hidden lg:block"/>
+    {after}
+  </nav>
+)
+*/
+export const MainSections = ({ app, active }) => {
+  if (!app.navigation) return null
+  const output = []
+  let last
+  for (const page of order(app.navigation)) {
+    const act = isActive(page.__slug, active)
+    const item = (
+      <li key={page.__slug} className={act ? 'mt-4 uppercase' : ''}>
+        <Link href={`${page.__slug}`}>
+          <a
+            className={`${linkClasses}
+            flex flex-row gap-4 items-center
+            hover:bg-secondary hover:bg-opacity-10
+            p-2 rounded
+          `}
+            title={page.__title}
+          >
+            {icons[page.__slug] ? (
+              icons[page.__slug](`w-8 h-8 ${act ? 'text-accent' : ''}`)
+            ) : (
+              <HelpIcon />
+            )}
+            <span className="font-bold">{page.__title}</span>
+          </a>
+        </Link>
+      </li>
+    )
+    if (act) last = item
+    else output.push(item)
+  }
+  output.push(last)
+
+  return <ul>{output}</ul>
+}
+
+export const ActiveSection = ({ app, active }) => (
+  <div className="-ml-5 mt-2">
+    <SubLevel
+      hasChildren={1}
+      nav={app.navigation}
+      active={active}
+      nodes={order(app.navigation[active.split('/')[0]])}
+    />
+  </div>
+)
+
+//export default PrimaryMenu