diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 339c415..5e7a68a 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,9 +1,10 @@
 import type { Metadata } from "next";
-import React from "react";
+import React, { Suspense } from "react";
 
 import "./globals.css";
 import Form from "next/form";
-import Link from "next/link";
+import ContactList from "@/app/sidebar-contacts";
+import { getContacts } from "@/app/data";
 
 export const metadata: Metadata = {
   title: "Next.js Address Book",
@@ -15,6 +16,8 @@ export default function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  const contacts = getContacts();
+
   return (
     <html lang="en">
     <body>
@@ -40,14 +43,9 @@ export default function RootLayout({
         </Form>
       </div>
       <nav>
-        <ul>
-          <li>
-            <Link href={`/contacts/1`}>Your Name</Link>
-          </li>
-          <li>
-            <Link href={`/contacts/2`}>Your Friend</Link>
-          </li>
-        </ul>
+        <Suspense fallback={<div>Loading...</div>}>
+          <ContactList contacts={contacts}/>
+        </Suspense>
       </nav>
     </div>
     <div id={'detail'}>
diff --git a/src/app/sidebar-contacts.tsx b/src/app/sidebar-contacts.tsx
new file mode 100644
index 0000000..eb0cebe
--- /dev/null
+++ b/src/app/sidebar-contacts.tsx
@@ -0,0 +1,27 @@
+import { ContactRecord } from "@/app/data";
+import React, { use } from "react";
+import Link from "next/link";
+
+export default function ContactList({ contacts }: { contacts: Promise<ContactRecord[]> }) {
+  const allContacts = use(contacts);
+  return (
+    <ul>
+      {allContacts.map((c) => (
+        <li key={c.id}>
+          <Link href={`/contacts/${c.id}`}>
+            {c.first || c.last ? (
+              <>
+                {c.first} {c.last}
+              </>
+            ) : (
+              <i>No Name</i>
+            )}
+            {c.favorite ? (
+              <span>★</span>
+            ) : null}
+          </Link>
+        </li>
+      ))}
+    </ul>
+  );
+}
\ No newline at end of file
