diff --git a/README.md b/README.md
index 451fb42..97dcf5c 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,12 @@ The tutorials where not really designed to be done in the same repo, so the base
 
 Part of this tutorial was to deploy it out to vercel. It was very slick.I took the liberty of putting it on a custom domain and you can find it there 👉 [next-js-dashboard.curle.io](https://next-js-dashboard.curle.io)
 
+To login, use
+```
+user@nextmail.com
+123456
+```
+
 
 1. [Getting Started ♻️][2-1]  
 2. [CSS Styling ♻️][2-2]
@@ -43,9 +49,9 @@ Part of this tutorial was to deploy it out to vercel. It was very slick.I took t
 11. [Adding Search and Pagination ♻️][2-11]
 12. [Mutating Data️ ♻️][2-12]
 13. [Handling Errors ♻️][2-13]
-14. Improving Accessibility 🚧 
-15. Adding Authentication 🚧  
-16. Adding Metadata 🚧️ 
+14. [Improving Accessibility ♻️][2-14]
+15. [Adding Authentication ♻️][2-15] 
+16. [Adding Metadata ♻️][2-16] 
 
 
 [2-1]: https://github.com/treejamie/next-js-learn/pull/7
@@ -59,4 +65,7 @@ Part of this tutorial was to deploy it out to vercel. It was very slick.I took t
 [2-9]: https://github.com/treejamie/next-js-learn/pull/17
 [2-11]: https://github.com/treejamie/next-js-learn/pull/19
 [2-12]: https://github.com/treejamie/next-js-learn/pull/20
-[2-13]: https://github.com/treejamie/next-js-learn/pull/23
\ No newline at end of file
+[2-13]: https://github.com/treejamie/next-js-learn/pull/23
+[2-14]: https://github.com/treejamie/next-js-learn/pull/25
+[2-15]: https://github.com/treejamie/next-js-learn/pull/28
+[2-16]: https://github.com/treejamie/next-js-learn/pull/29
\ No newline at end of file
diff --git a/app-router/nextjs-dashboard/README.md b/app-router/nextjs-dashboard/README.md
index 8f56013..f2bc153 100644
--- a/app-router/nextjs-dashboard/README.md
+++ b/app-router/nextjs-dashboard/README.md
@@ -6,6 +6,12 @@
 
 Part of this tutorial was to deploy it out to vercel. It was very slick.I took the liberty of putting it on a custom domain and you can find it there 👉 [next-js-dashboard.curle.io](https://next-js-dashboard.curle.io)
 
+To login, use
+```
+user@nextmail.com
+123456
+```
+
 
 1. [Getting Started ♻️][2-1]  
 2. [CSS Styling ♻️][2-2]
@@ -22,7 +28,7 @@ Part of this tutorial was to deploy it out to vercel. It was very slick.I took t
 13. [Handling Errors ♻️][2-13]
 14. [Improving Accessibility ♻️][2-14]
 15. [Adding Authentication ♻️][2-15] 
-16. Adding Metadata 🚧️ 
+16. [Adding Metadata ♻️][2-16] 
 
 
 [2-1]: https://github.com/treejamie/next-js-learn/pull/7
@@ -38,4 +44,5 @@ Part of this tutorial was to deploy it out to vercel. It was very slick.I took t
 [2-12]: https://github.com/treejamie/next-js-learn/pull/20
 [2-13]: https://github.com/treejamie/next-js-learn/pull/23
 [2-14]: https://github.com/treejamie/next-js-learn/pull/25
-[2-15]: https://github.com/treejamie/next-js-learn/pull/28
\ No newline at end of file
+[2-15]: https://github.com/treejamie/next-js-learn/pull/28
+[2-16]: https://github.com/treejamie/next-js-learn/pull/29
\ No newline at end of file
diff --git a/app-router/nextjs-dashboard/app/dashboard/(overview)/page.tsx b/app-router/nextjs-dashboard/app/dashboard/(overview)/page.tsx
index a850576..0480669 100644
--- a/app-router/nextjs-dashboard/app/dashboard/(overview)/page.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/(overview)/page.tsx
@@ -5,6 +5,14 @@ import { lusitana } from '@/app/ui/fonts';
 import { fetchLatestInvoices, fetchCardData } from '@/app/lib/data';
 import { Suspense } from 'react';
 import { RevenueChartSkeleton } from '@/app/ui/skeletons';
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'It\'s the dashboard!',
+};
+
+
 
 export default async function Page() {
   const latestInvoices = await fetchLatestInvoices();
diff --git a/app-router/nextjs-dashboard/app/dashboard/customers/page.tsx b/app-router/nextjs-dashboard/app/dashboard/customers/page.tsx
index 05badaf..902e961 100644
--- a/app-router/nextjs-dashboard/app/dashboard/customers/page.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/customers/page.tsx
@@ -1,3 +1,12 @@
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'Customers',
+};
+
+
+
 export default function Page() {
     return <p>Customers Page</p>;
   }
\ No newline at end of file
diff --git a/app-router/nextjs-dashboard/app/dashboard/invoices/[id]/edit/page.tsx b/app-router/nextjs-dashboard/app/dashboard/invoices/[id]/edit/page.tsx
index 882a4c0..c345f47 100644
--- a/app-router/nextjs-dashboard/app/dashboard/invoices/[id]/edit/page.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/invoices/[id]/edit/page.tsx
@@ -2,6 +2,12 @@ import Form from '@/app/ui/invoices/edit-form';
 import Breadcrumbs from '@/app/ui/invoices/breadcrumbs';
 import { fetchInvoiceById, fetchCustomers } from '@/app/lib/data';
 import { notFound } from 'next/navigation';
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'Edit Invoice',
+};
 
 
 export default async function Page(props: { params: Promise<{ id: string }> }) {
diff --git a/app-router/nextjs-dashboard/app/dashboard/invoices/create/page.tsx b/app-router/nextjs-dashboard/app/dashboard/invoices/create/page.tsx
index 902415d..b12c110 100644
--- a/app-router/nextjs-dashboard/app/dashboard/invoices/create/page.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/invoices/create/page.tsx
@@ -1,7 +1,16 @@
 import Form from '@/app/ui/invoices/create-form';
 import Breadcrumbs from '@/app/ui/invoices/breadcrumbs';
 import { fetchCustomers } from '@/app/lib/data';
- 
+
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'Create Invoice',
+};
+
+
+
 export default async function Page() {
   const customers = await fetchCustomers();
  
@@ -9,7 +18,7 @@ export default async function Page() {
     <main>
       <Breadcrumbs
         breadcrumbs={[
-          { label: 'Invoices', href: '/dashboard/invoices' }, // that's going to break at somepoint
+          { label: 'Invoices', href: '/dashboard/invoices' }, // that's going to break at some
           {
             label: 'Create Invoice',
             href: '/dashboard/invoices/create',  // this smells a bit - is there a way to not do this?
diff --git a/app-router/nextjs-dashboard/app/dashboard/invoices/page.tsx b/app-router/nextjs-dashboard/app/dashboard/invoices/page.tsx
index 97c90ea..45fbf90 100644
--- a/app-router/nextjs-dashboard/app/dashboard/invoices/page.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/invoices/page.tsx
@@ -7,7 +7,14 @@ import { InvoicesTableSkeleton } from '@/app/ui/skeletons';
 import { Suspense } from 'react';
 
 import { fetchInvoicesPages } from '@/app/lib/data';
- 
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'Invoices',
+};
+
+
 export default async function Page(props: {
   searchParams?: Promise<{
     query?: string;
diff --git a/app-router/nextjs-dashboard/app/dashboard/layout.tsx b/app-router/nextjs-dashboard/app/dashboard/layout.tsx
index 86177d0..51f4e1c 100644
--- a/app-router/nextjs-dashboard/app/dashboard/layout.tsx
+++ b/app-router/nextjs-dashboard/app/dashboard/layout.tsx
@@ -1,4 +1,8 @@
 import SideNav from "@/app/ui/dashboard/sidenav";
+import { Metadata } from 'next';
+ 
+
+
 
 export default function Layout({children}: {children: React.ReactNode}){
     return (
diff --git a/app-router/nextjs-dashboard/public/favicon.ico b/app-router/nextjs-dashboard/app/favicon.ico
similarity index 100%
rename from app-router/nextjs-dashboard/public/favicon.ico
rename to app-router/nextjs-dashboard/app/favicon.ico
diff --git a/app-router/nextjs-dashboard/app/layout.tsx b/app-router/nextjs-dashboard/app/layout.tsx
index bc3a4c8..2453184 100644
--- a/app-router/nextjs-dashboard/app/layout.tsx
+++ b/app-router/nextjs-dashboard/app/layout.tsx
@@ -1,5 +1,16 @@
 import '@/app/ui/global.css';
 import { inter } from '@/app/ui/fonts';
+import { Metadata } from 'next';
+ 
+export const metadata: Metadata = {
+  title: {
+    template: '%s | Acme Dashboard',
+    default: 'Acme Dashboard',
+  },
+  description: 'The official Next.js Learn Dashboard built with App Router.',
+  metadataBase: new URL('https://next-learn-dashboard.vercel.sh'),
+};
+
 
 export default function RootLayout({
   children,
diff --git a/app-router/nextjs-dashboard/app/login/page.tsx b/app-router/nextjs-dashboard/app/login/page.tsx
index 8794a59..382276e 100644
--- a/app-router/nextjs-dashboard/app/login/page.tsx
+++ b/app-router/nextjs-dashboard/app/login/page.tsx
@@ -1,7 +1,15 @@
 import AcmeLogo from '@/app/ui/acme-logo';
 import LoginForm from '@/app/ui/login-form';
 import { Suspense } from 'react';
- 
+import { Metadata } from 'next';
+
+
+export const metadata: Metadata = {
+  title: 'Login',
+};
+
+
+
 export default function LoginPage() {
   return (
     <main className="flex items-center justify-center md:h-screen">
diff --git a/app-router/nextjs-dashboard/public/opengraph-image.png b/app-router/nextjs-dashboard/app/opengraph-image.png
similarity index 100%
rename from app-router/nextjs-dashboard/public/opengraph-image.png
rename to app-router/nextjs-dashboard/app/opengraph-image.png