diff --git a/README.md b/README.md
index 71843a6..cfa2ed5 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
    npm install
    npm run dev
    ```
-6. Create a new branch: git checkout -b `<firstName-lastName>`. Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
+6. Create a new branch: . Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
 7. Push commits: git push origin `<firstName-lastName>`.
 
 ### Task 2: MVP
diff --git a/server/notes.db b/server/notes.db
index 9fb91df..58e9716 100644
Binary files a/server/notes.db and b/server/notes.db differ
diff --git a/src/components/CreateNoteForm.jsx b/src/components/CreateNoteForm.jsx
index ffb1252..9bf8fdf 100644
--- a/src/components/CreateNoteForm.jsx
+++ b/src/components/CreateNoteForm.jsx
@@ -1,25 +1,143 @@
 // TODO: Import useForm, zodResolver, axios, useNavigate, useState, and noteSchema
 
+import React, { useState } from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import axios from "axios";
+import { useNavigate } from "react-router-dom";
+
+import { noteSchema } from "../schema/notes";
 
 import { Save } from "lucide-react";
 
-const CreateNoteForm = () => {
-  // TODO: Setup isSubmitting state with useState
-  // TODO: create navigate variable and set to useNavigate()
+// TODO: Setup isSubmitting state with useState
+// TODO: create navigate variable and set to useNavigate()
 
+const CreateNoteForm = ({ onSubmitSuccess }) => {
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [submitSuccess, setSubmitSuccess] = useState(false);
+  const [submitError, setSubmitError] = useState("");
 
   // TODO: Set up the form with useForm from react-hook-form and zodResolver from @hookform/resolvers/zod
 
+  const {
+    register,
+    handleSubmit,
+    formState: { errors, isValid, isDirty },
+    reset,
+  } = useForm({
+    mode: "onChange",
+    resolver: zodResolver(noteSchema),
+    defaultValues: {
+      title: "",
+      content: "",
+    },
+  });
+
   const sendToTheServer = async (data) => {
     // TODO: Send the data to the server
     // TODO: Use axios to create a new note in the server using the endpoint http://localhost:3001/api/notes
+
+    setIsSubmitting(true);
+    setSubmitSuccess(false);
+    setSubmitError("");
+
+    try {
+      await axios.post("http://localhost:3001/api/notes", data, {
+        headers: { "Content-Type": "application/json" },
+      });
+      setSubmitSuccess(true);
+      reset();
+      onSubmitSuccess?.();
+      setTimeout(() => {
+        setSubmitSuccess(false);
+      }, 5000);
+    } catch (error) {
+      setSubmitError(
+        "There was an error submitting your form. Please try again."
+      );
+      console.error("Form submission error:", error);
+    } finally {
+      setIsSubmitting(false);
+    }
   };
 
   return (
-    <>
-    <h1>Create Note</h1>
-    {/* TODO: Setup the form with TailwindCSS, create a form with the following fields: title, content, and submit button */}
-    </>
+    /* TODO: Setup the form with TailwindCSS, create a form with the following fields: title, content, and submit button */
+    <div className="bg-white rounded-xl shadow-md p-6 md:p-8 max-w-4xl mx-auto">
+      <h1 className="text-2xl font-bold mb-2">Create a New Note</h1>
+
+      {submitSuccess && (
+        <div className="bg-green-50 border border-green-200 text-green-800 rounded-md p-1 mb-6">
+          Note created successfully!
+        </div>
+      )}
+
+      {submitError && (
+        <div className="bg-red-50 border border-red-200 text-red-800 rounded-md p-4 mb-6">
+          {submitError}
+        </div>
+      )}
+
+      <form onSubmit={handleSubmit(sendToTheServer)} className="space-y-6">
+        <div>
+          <label
+            htmlFor="title"
+            className="form-label block mb-1 font-semibold"
+          >
+            Note Title
+          </label>
+          <input
+            id="title"
+            type="text"
+            className={`input-field w-full border p-2 rounded ${
+              errors.title ? "border-red-500" : "border-gray-300"
+            }`}
+            {...register("title")}
+          />
+          {errors.title && (
+            <p className="text-red-500 text-sm mt-1">{errors.title.message}</p>
+          )}
+        </div>
+
+        <div>
+          <label
+            htmlFor="content"
+            className="form-label block mb-1 font-semibold"
+          >
+            content
+          </label>
+          <textarea
+            id="content"
+            rows={5}
+            className={`input-field w-full border p-2 rounded ${
+              errors.content ? "border-red-500" : "border-gray-300"
+            }`}
+            {...register("content")}
+          />
+          {errors.content && (
+            <p className="text-red-500 text-sm mt-1">
+              {errors.content.message}
+            </p>
+          )}
+        </div>
+
+        <div className="flex justify-center">
+          <button
+            type="save note"
+            disabled={isSubmitting || !isValid || !isDirty}
+            className={`w-full px-4 py-3 rounded text-white ${
+              isValid && isDirty && !isSubmitting
+                ? "bg-yellow-600 hover:bg-yellow-700"
+                : "bg-yellow-400 cursor-not-allowed"
+            } flex items-center justify-center gap-2`}
+          >
+            <Save size={16} />
+            {isSubmitting ? "Submitting..." : "Save note"}
+          </button>
+        </div>
+      </form>
+    </div>
   );
 };
 
diff --git a/src/schema/notes.js b/src/schema/notes.js
index 4621c8c..89d3d0c 100644
--- a/src/schema/notes.js
+++ b/src/schema/notes.js
@@ -1,8 +1,24 @@
 import { z } from "zod";
 
 export const noteSchema = z.object({
+
+
   //TODO: create the title and content schema, 
   // Make sure the title is required and the content is required
   // Make sure the title is max 50 characters and the content is max 500 characters
 
+
+   title: z
+    .string()
+    .min(2, "title must be at least 50 characters")
+    .max(50, "tile must be less than 100 characters"),
+
+
+     content: z
+    .string()
+    .min(2, "content must be at least 500 characters")
+    .max(500, "content must be less than 100 characters"),
+
+
+
   });
\ No newline at end of file