diff --git a/web/src/components/CommentForm/CommentForm.stories.tsx b/web/src/components/CommentForm/CommentForm.stories.tsx
new file mode 100644
index 000000000..8f505528e
--- /dev/null
+++ b/web/src/components/CommentForm/CommentForm.stories.tsx
@@ -0,0 +1,25 @@
+// When you've added props to your component,
+// pass Storybook's `args` through this story to control it from the addons panel:
+//
+// ```tsx
+// import type { ComponentStory } from '@storybook/react'
+//
+// export const generated: ComponentStory<typeof CommentForm> = (args) => {
+//   return <CommentForm {...args} />
+// }
+// ```
+//
+// See https://storybook.js.org/docs/react/writing-stories/args.
+
+import type { ComponentMeta } from '@storybook/react'
+
+import CommentForm from './CommentForm'
+
+export const generated = () => {
+  return <CommentForm />
+}
+
+export default {
+  title: 'Components/CommentForm',
+  component: CommentForm,
+} as ComponentMeta<typeof CommentForm>
diff --git a/web/src/components/CommentForm/CommentForm.test.tsx b/web/src/components/CommentForm/CommentForm.test.tsx
new file mode 100644
index 000000000..8ad167b8b
--- /dev/null
+++ b/web/src/components/CommentForm/CommentForm.test.tsx
@@ -0,0 +1,14 @@
+import { render } from '@redwoodjs/testing/web'
+
+import CommentForm from './CommentForm'
+
+//   Improve this test with help from the Redwood Testing Doc:
+//    https://redwoodjs.com/docs/testing#testing-components
+
+describe('CommentForm', () => {
+  it('renders successfully', () => {
+    expect(() => {
+      render(<CommentForm />)
+    }).not.toThrow()
+  })
+})
diff --git a/web/src/components/CommentForm/CommentForm.tsx b/web/src/components/CommentForm/CommentForm.tsx
new file mode 100644
index 000000000..d819059ba
--- /dev/null
+++ b/web/src/components/CommentForm/CommentForm.tsx
@@ -0,0 +1,10 @@
+const CommentForm = () => {
+  return (
+    <div>
+      <h2>{'CommentForm'}</h2>
+      <p>{'Find me in ./web/src/components/CommentForm/CommentForm.tsx'}</p>
+    </div>
+  )
+}
+
+export default CommentForm