diff --git a/src/app/(main)/project/[project_id]/chat/[chat_id]/page.tsx b/src/app/(main)/project/[project_id]/chat/[chat_id]/page.tsx
index 2225b972..35906081 100644
--- a/src/app/(main)/project/[project_id]/chat/[chat_id]/page.tsx
+++ b/src/app/(main)/project/[project_id]/chat/[chat_id]/page.tsx
@@ -30,6 +30,16 @@ export default function Chat(params: {
       refetchOnWindowFocus: false,
     }
   );
+  
+  const projectQuery = useQuery(
+    ["chat", project_id],
+    () => API.projects.get(project_id),
+    {
+      refetchOnWindowFocus: false,
+    }
+  );
+  const project: Project | undefined = projectQuery.data;
+
   const chat: Chat | undefined = chatQuery.data;
   const [projectData, setProjectData] = useState<Project>();
 
@@ -85,13 +95,15 @@ export default function Chat(params: {
         params.formdata,
         openai_key,
         streamChatMessage,
-        20
+        20,
+        !project?.assistant_id
       ),
     {
       retry: false,
-      // onSuccess: async (data, vars) => {
-      //     await chatQuery.refetch();
-      // }
+      onSuccess: async (data, vars) => {
+        if(!project?.assistant_id)
+          await chatQuery.refetch();
+      },
       onError: async (error, vars) => {
         converseMutation.error = error
         setIsTyping(false);
diff --git a/src/app/(main)/project/[project_id]/page.tsx b/src/app/(main)/project/[project_id]/page.tsx
index 084572e2..3348b482 100644
--- a/src/app/(main)/project/[project_id]/page.tsx
+++ b/src/app/(main)/project/[project_id]/page.tsx
@@ -79,12 +79,15 @@ export default function Chat(params: { params: { project_id: string } }) {
         params.formdata,
         openai_key,
         streamChatMessage,
-        20
+        20,
+        !project?.assistant_id
       ),
     {
       retry: false,
       onSuccess: async (data, vars) => {
+        setChatID(data.external_id);
         await queryClient.invalidateQueries(["chats"]);
+        setIsTyping(false);
       },
     }
   );
@@ -132,21 +135,23 @@ export default function Chat(params: { params: { project_id: string } }) {
               <>
                 <h2 className="font-semibold mt-8">Try asking me -</h2>
                 <div className="grid md:grid-cols-2 mt-4 gap-4 px-4 lg:max-w-4xl mx-auto">
-                  {(project?.display_preset_questions ?? []).map((prompt, i) => (
-                    <button
-                      onClick={async () => {
-                        setChat(prompt);
-                        setIsTyping(true);
-                        const fd = await getFormData(undefined, prompt);
-                        newChatMutation.mutate({ formdata: fd });
-                      }}
-                      disabled={newChatMutation.isLoading}
-                      className="bg-white hover:shadow-lg hover:bg-gray-100 hover:text-indigo-500 text-left border border-gray-200 rounded-lg p-4 transition disabled:opacity-50 disabled:hover:text-gray-400"
-                      key={i}
-                    >
-                      {prompt}
-                    </button>
-                  ))}
+                  {(project?.display_preset_questions ?? []).map(
+                    (prompt, i) => (
+                      <button
+                        onClick={async () => {
+                          setChat(prompt);
+                          setIsTyping(true);
+                          const fd = await getFormData(undefined, prompt);
+                          newChatMutation.mutate({ formdata: fd });
+                        }}
+                        disabled={newChatMutation.isLoading}
+                        className="bg-white hover:shadow-lg hover:bg-gray-100 hover:text-indigo-500 text-left border border-gray-200 rounded-lg p-4 transition disabled:opacity-50 disabled:hover:text-gray-400"
+                        key={i}
+                      >
+                        {prompt}
+                      </button>
+                    )
+                  )}
                 </div>
               </>
             )}
diff --git a/src/app/admin/tests/[testsuite_id]/runs/[testrun_id]/page.tsx b/src/app/admin/tests/[testsuite_id]/runs/[testrun_id]/page.tsx
index 11a55270..8a653359 100644
--- a/src/app/admin/tests/[testsuite_id]/runs/[testrun_id]/page.tsx
+++ b/src/app/admin/tests/[testsuite_id]/runs/[testrun_id]/page.tsx
@@ -368,8 +368,8 @@ export default function Page({ params }: { params: { testsuite_id: string, testr
                                         {document.title}
                                     </div>
                                 </div>
-                                <div className="w-1/2">
-                                    <img src={document.file.split("?")[0] + '?r=' + Math.floor(Math.random() * 100000)} alt="File" className="w-full" crossOrigin="anonymous" />
+                                <div className="w-1/2 h-1/2">
+                                    <img src={document.file.split("?")[0] + '?r=' + Math.floor(Math.random() * 100000)} alt="File" crossOrigin="anonymous" />
                                 </div>
                             </Link>
                         </div>
diff --git a/src/components/forms/projectform.tsx b/src/components/forms/projectform.tsx
index 78d2ba86..aa0c19ec 100644
--- a/src/components/forms/projectform.tsx
+++ b/src/components/forms/projectform.tsx
@@ -1,8 +1,17 @@
 "use client";
 
-import { MODELS, Project, STT_ENGINES } from "@/types/project";
+import {
+  ASSISTANT_MODELS,
+  MODELS,
+  Project,
+  STT_ENGINES,
+} from "@/types/project";
 import { useEffect, useState } from "react";
 import { Button, Input, TextArea } from "../ui/interactive";
+import { useQuery } from "@tanstack/react-query";
+import { API } from "@/utils/api";
+import Modal from "../modal";
+import { Toaster, toast } from "react-hot-toast";
 
 export default function ProjectForm(props: {
   project: Partial<Project>;
@@ -12,14 +21,65 @@ export default function ProjectForm(props: {
 }) {
   const { project: pro, onSubmit, errors, loading } = props;
   const [project, setProject] = useState<Partial<Project>>(pro);
+  const [showAddAssistant, setShowAddAssistant] = useState(false);
+  const [addAssistantDetails, setAddAssistantDetails] = useState({
+    name: "",
+    instructions: "",
+    model: "",
+  });
+  const [assistants, setAssistants] = useState([]);
+  const [selectedAssistant, setSelectedAssistant] = useState<any>({});
+  const [prompt, setPrompt] = useState<string>("");
+  const [model, setModel] = useState<string | number>("");
+
+  const assistantListQuery = useQuery(["assistant"], () =>
+    API.projects.assistant.list(project.external_id ?? "")
+  );
+  useEffect(() => {
+    const assistants = assistantListQuery.data || [];
+    setAssistants(assistants);
+
+    const selectedAssistant = assistants.find(
+      (assistant: any) => assistant.id === project.assistant_id
+    );
+    setSelectedAssistant(selectedAssistant);
+  }, [assistantListQuery.data]);
+
+  useEffect(() => {
+    if (project.assistant_id) {
+      setSelectedAssistant(
+        assistants.find(
+          (assistant: any) => assistant.id === project.assistant_id
+        )
+      );
+      setPrompt(selectedAssistant?.instructions ?? "");
+      setModel(selectedAssistant?.model ?? "");
+    }
+  }, [
+    project.assistant_id,
+    assistants,
+    selectedAssistant?.instructions,
+    selectedAssistant?.model,
+  ]);
 
   useEffect(() => {
     setProject(pro);
   }, [pro]);
 
+  useEffect(() => {
+    setAddAssistantDetails({
+      ...addAssistantDetails,
+      instructions: pro.prompt ?? "",
+    });
+    if (!pro.assistant_id) {
+      setPrompt(pro.prompt ?? "");
+      setModel(pro.model ?? "");
+    }
+  }, [pro.prompt, pro.assistant_id, pro.model]);
+
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    onSubmit(project);
+    onSubmit({ ...project, prompt, model });
   };
 
   const handleRemoveKey = () => {
@@ -54,26 +114,50 @@ export default function ProjectForm(props: {
           }
           errors={errors?.description}
         />
-        <p className="text-sm text-gray-500">Prompt</p>
+
+        <div className="flex gap-1">
+          <p className="text-sm text-gray-500">Prompt</p>
+          {project.assistant_id && (
+            <p className="text-sm text-red-500">(Currently set by assistant)</p>
+          )}
+        </div>
+
         <TextArea
           placeholder="Prompt"
           className="h-56"
-          value={project.prompt}
-          onChange={(e) => setProject({ ...project, prompt: e.target.value })}
+          value={prompt}
+          onChange={(e) => setPrompt(e.target.value)}
           errors={errors?.prompt}
         />
-        <p className="text-sm text-gray-500">OpenAI Key</p>
-        {!project.key_set ? (
-          <Input
-            placeholder="OpenAI Key"
-            value={project.open_ai_key ?? ""}
-            onChange={(e) =>
-              setProject({ ...project, open_ai_key: e.target.value })
-            }
-            errors={errors?.open_ai_key}
-          />
+        {project.assistant_id ? (
+          <>
+            <div className="flex gap-1">
+              <p className="text-sm text-gray-500">OpenAI Key</p>
+              <p className="text-sm text-red-500">
+                (Assistant uses the global key)
+              </p>
+            </div>
+            <Input
+              disabled={true}
+              placeholder="*********"
+              parentDivClassName="w-full"
+            />
+          </>
+        ) : !project.key_set ? (
+          <>
+            <p className="text-sm text-gray-500">OpenAI Key</p>
+            <Input
+              placeholder="OpenAI Key"
+              value={project.open_ai_key ?? ""}
+              onChange={(e) =>
+                setProject({ ...project, open_ai_key: e.target.value })
+              }
+              errors={errors?.open_ai_key}
+            />
+          </>
         ) : (
           <>
+            <p className="text-sm text-gray-500">OpenAI Key</p>
             <div className="flex w-full items-center">
               <Input
                 disabled={true}
@@ -105,26 +189,156 @@ export default function ProjectForm(props: {
             </option>
           ))}
         </select>
-        <p className="text-sm text-gray-500">Model</p>
-        <select
-          className="border border-gray-200 w-full bg-white rounded-lg relative transition-all flex ring-0 ring-green-500 focus-within:ring-2 focus-within:ring-offset-1 p-3"
-          value={project.model ?? 1}
-          onChange={(e) =>
-            setProject({ ...project, model: parseInt(e.target.value) })
-          }
-        >
-          {MODELS.map((model, i) => (
-            <option key={model.id} value={model.id}>
-              {model.label}
-            </option>
-          ))}
-        </select>
+        <div>
+          <div className="flex gap-1">
+            <p className="text-sm text-gray-500">Model</p>
+            {project.assistant_id && (
+              <p className="text-sm text-red-500">
+                (Currently set by assistant)
+              </p>
+            )}
+          </div>
+          <select
+            className="border border-gray-200 w-full bg-white rounded-lg relative transition-all flex ring-0 ring-green-500 focus-within:ring-2 focus-within:ring-offset-1 p-3"
+            value={model ?? ""}
+            onChange={(e) => {
+              project.assistant_id
+                ? setModel(e.target.value)
+                : setModel(parseInt(e.target.value));
+            }}
+          >
+            {(project.assistant_id ? ASSISTANT_MODELS : MODELS).map(
+              (model, i) => (
+                <option key={model.id} value={model.id}>
+                  {model.label}
+                </option>
+              )
+            )}
+          </select>
+        </div>
+        <p className="text-sm text-gray-500">Assistant</p>
+        <div className="flex gap-3">
+          <select
+            className="border border-gray-200 w-full bg-white rounded-lg relative transition-all flex ring-0 ring-green-500 focus-within:ring-2 focus-within:ring-offset-1 p-3"
+            value={project.assistant_id ?? ""}
+            onChange={(e) =>
+              setProject({ ...project, assistant_id: e.target.value })
+            }
+          >
+            {!project.assistant_id && (
+              <option key="" value="">
+                Select an assistant
+              </option>
+            )}
+            {assistants.map((assistant: any) => (
+              <option key={assistant.id} value={assistant.id}>
+                {assistant.name} ({assistant.id})
+              </option>
+            ))}
+          </select>
+          {project.external_id && (
+            <Button
+              className="bg-indigo-500 enabled:hover:bg-indigo-600"
+              type="button"
+              onClick={() => setShowAddAssistant(true)}
+            >
+              <i className="fa-regular fa-plus mr-2"></i>
+              New
+            </Button>
+          )}
+          {project.assistant_id && (
+            <Button
+              type="button"
+              className="text-red-600 flex justify-center items-center"
+              variant="secondary"
+              onClick={() => {
+                onSubmit({ assistant_id: null });
+              }}
+            >
+              <i className="fas fa-trash"></i>
+            </Button>
+          )}
+        </div>
         <p className="text-sm text-gray-500">Preset Questions</p>
         {project.preset_questions?.length === 0 && (
           <p className="text-sm text-gray-500">
             No preset questions. Add some below.
           </p>
         )}
+        <Modal
+          className="h-auto md:h-auto md:min-w-[500px] lg:min-w-[600px]"
+          show={showAddAssistant}
+          onClose={() => setShowAddAssistant(false)}
+        >
+          <div className="justify-center flex">
+            <h1 className="block font-medium text-lg">Add New Assistant</h1>
+          </div>
+          <div className="p-3">
+            <label className="block font-medium text-gray-700 mb-2">Name</label>
+            <input
+              type="text"
+              onChange={(e) =>
+                setAddAssistantDetails({
+                  ...addAssistantDetails,
+                  name: e.target.value,
+                })
+              }
+              className="block w-full bg-white border border-gray-300 hover:border-gray-500 px-4 py-2 rounded leading-tight focus:outline-none focus:border-blue-500 transition duration-150 ease-in-out sm:text-sm sm:leading-5"
+            />
+
+            <label className="block font-medium text-gray-700 mb-2 mt-4">
+              Instructions
+            </label>
+            <textarea
+              onChange={(e) =>
+                setAddAssistantDetails({
+                  ...addAssistantDetails,
+                  instructions: e.target.value,
+                })
+              }
+              placeholder={project.prompt}
+              className="block w-full bg-white border border-gray-300 hover:border-gray-500 px-4 py-2 rounded leading-tight focus:outline-none focus:border-blue-500 transition duration-150 ease-in-out sm:text-sm sm:leading-5"
+            />
+
+            <label className="block font-medium text-gray-700 mb-2 mt-4">
+              Model
+            </label>
+            <select
+              className="border border-gray-200 w-full bg-white rounded-lg relative transition-all flex ring-0 ring-green-500 focus-within:ring-2 focus-within:ring-offset-1 p-3"
+              value={addAssistantDetails.model}
+              onChange={(e) =>
+                setAddAssistantDetails({
+                  ...addAssistantDetails,
+                  model: e.target.value,
+                })
+              }
+            >
+              {ASSISTANT_MODELS.map((model, i) => (
+                <option key={model.id} value={model.id}>
+                  {model.label}
+                </option>
+              ))}
+            </select>
+            <Button
+              className=" w-full mt-4"
+              type="button"
+              onClick={() => {
+                API.projects.assistant
+                  .create(project.external_id ?? "", addAssistantDetails)
+                  .then(() => {
+                    toast.success("Assistant created successfully");
+                    setShowAddAssistant(false);
+                    assistantListQuery.refetch();
+                  })
+                  .catch((e) => {
+                    toast.error("Error creating assistant");
+                  });
+              }}
+            >
+              Create
+            </Button>
+          </div>
+        </Modal>
         {project.preset_questions?.map((question, i) => (
           <div className="flex gap-2 items-center" key={i}>
             <Input
@@ -170,6 +384,7 @@ export default function ProjectForm(props: {
           {pro.external_id ? "Save" : "Create"}
         </Button>
       </form>
+      <Toaster />
     </div>
   );
 }
diff --git a/src/types/project.ts b/src/types/project.ts
index cc081d42..8f228b56 100644
--- a/src/types/project.ts
+++ b/src/types/project.ts
@@ -6,12 +6,13 @@ export type Project = BaseModelType & {
     is_default: boolean,
     prompt?: string,
     stt_engine: number,
-    model: number,
+    model: number | string,
     archived: boolean,
     preset_questions?: string[],
     display_preset_questions: string[],
     open_ai_key?: string | null,
     key_set?: boolean
+    assistant_id?: string | null,
 }
 
 export enum DocumentType {
@@ -33,6 +34,10 @@ export const MODELS = [
     { id: 4, label: 'GPT-4-32k' },
     { id: 5, label: 'GPT-4-VISUAL' },
 ]
+export const ASSISTANT_MODELS = [
+    { id: "gpt-3.5-turbo-1106", label: 'gpt-3.5-turbo-1106' },
+    { id: "gpt-4-1106-preview", label: 'gpt-4-1106-preview' },
+]
 
 export type Document = BaseModelType & {
     title: string,
diff --git a/src/utils/api.ts b/src/utils/api.ts
index e0840bcd..392b174d 100644
--- a/src/utils/api.ts
+++ b/src/utils/api.ts
@@ -199,6 +199,11 @@ export const API = {
       request("auth/reset", "POST", { token, email, password }),
   },
   projects: {
+    assistant:{
+      list:
+      (project_id: string) => request(`projects/${project_id}/list_assistants`, "GET"),
+      create: (project_id: string, assistant: Partial<any>) => request(`projects/${project_id}/create_assistant`, "POST", assistant),
+    },
     list: (
       filters: {
         ordering?: string;
@@ -289,14 +294,15 @@ export const API = {
       formdata: FormData,
       openai_api_key?: string,
       onMessage: ((event: ChatConverseStream) => void) | null = null,
-      delay: number | null = null
+      delay: number | null = null,
+      stream: boolean = true
     ) =>
       request(
         `projects/${project_id}/chats/${chat_id}/converse`,
         "POST",
         formdata,
         {
-          stream: true,
+          stream,
           formdata: true,
           headers: openai_api_key
             ? {