diff --git a/web/src/components/BlogPost/BlogPost.js b/web/src/components/BlogPost/BlogPost.js
new file mode 100644
index 0000000..524ee4b
--- /dev/null
+++ b/web/src/components/BlogPost/BlogPost.js
@@ -0,0 +1,16 @@
+import { Link, routes } from '@redwoodjs/router'
+
+const BlogPost = ({ post }) => {
+  return (
+    <article>
+      <header>
+        <h2>
+          <Link to={routes.blogPost({ id: post.id })}>{post.title}</Link>
+        </h2>
+      </header>
+      <div>{post.body}</div>
+    </article>
+  )
+}
+
+export default BlogPost
\ No newline at end of file
diff --git a/web/src/components/BlogPost/BlogPost.stories.js b/web/src/components/BlogPost/BlogPost.stories.js
new file mode 100644
index 0000000..03e9f5f
--- /dev/null
+++ b/web/src/components/BlogPost/BlogPost.stories.js
@@ -0,0 +1,7 @@
+import BlogPost from './BlogPost'
+
+export const generated = () => {
+  return <BlogPost />
+}
+
+export default { title: 'Components/BlogPost' }
diff --git a/web/src/components/BlogPost/BlogPost.test.js b/web/src/components/BlogPost/BlogPost.test.js
new file mode 100644
index 0000000..87f976f
--- /dev/null
+++ b/web/src/components/BlogPost/BlogPost.test.js
@@ -0,0 +1,11 @@
+import { render } from '@redwoodjs/testing'
+
+import BlogPost from './BlogPost'
+
+describe('BlogPost', () => {
+  it('renders successfully', () => {
+    expect(() => {
+      render(<BlogPost />)
+    }).not.toThrow()
+  })
+})
diff --git a/web/src/components/BlogPostCell/BlogPostCell.js b/web/src/components/BlogPostCell/BlogPostCell.js
index f3a0cb4..fd7987f 100644
--- a/web/src/components/BlogPostCell/BlogPostCell.js
+++ b/web/src/components/BlogPostCell/BlogPostCell.js
@@ -1,3 +1,5 @@
+import BlogPost from 'src/components/BlogPost'
+
 export const QUERY = gql`
   query BlogPostQuery($id: Int!) {
     post(id: $id) {
@@ -16,5 +18,5 @@ export const Empty = () => <div>Empty</div>
 export const Failure = ({ error }) => <div>Error: {error.message}</div>
 
 export const Success = ({ post }) => {
-  return JSON.stringify(post)
+  return <BlogPost post={post} />
 }
diff --git a/web/src/components/BlogPostsCell/BlogPostsCell.js b/web/src/components/BlogPostsCell/BlogPostsCell.js
index 6c48cae..9c9cf19 100644
--- a/web/src/components/BlogPostsCell/BlogPostsCell.js
+++ b/web/src/components/BlogPostsCell/BlogPostsCell.js
@@ -1,4 +1,5 @@
 import { Link, routes } from '@redwoodjs/router'
+import BlogPost from 'src/components/BlogPost'
 
 export const QUERY = gql`
   query BlogPostsQuery {
@@ -18,15 +19,5 @@ export const Empty = () => <div>Empty</div>
 export const Failure = ({ error }) => <div>Error: {error.message}</div>
 
 export const Success = ({ posts }) => {
-  return posts.map((post) => (
-    <article key={post.id}>
-      <header>
-        <h2>
-          <Link to={routes.blogPost({id: post.id})}>{post.title}</Link>
-        </h2>
-      </header>
-      <p>{post.body}</p>
-      <div>Posted on: {post.createdAt.split('T')[0]}</div>
-    </article>
-  ))
+  return posts.map((post) => <BlogPost post={post} />)
 }
\ No newline at end of file