diff --git a/README.md b/README.md
index ccf51c1a..e1548e67 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,12 @@ And just thinking how to make some of those flows work in a Laravel environment
 
 Per the Laravel docs https://laravel.com/docs/11.x/reverb
 
+
+
+## Local Dev
+
+```bash
+php artisan horizon:watch
+php artisan reverb:start --debug
+npm run dev
+```
\ No newline at end of file
diff --git a/app/Domains/Messages/SearchOrSummarizeChatRepo.php b/app/Domains/Messages/SearchOrSummarizeChatRepo.php
index d91a6f97..cbca222e 100644
--- a/app/Domains/Messages/SearchOrSummarizeChatRepo.php
+++ b/app/Domains/Messages/SearchOrSummarizeChatRepo.php
@@ -23,7 +23,7 @@ public function search(Chat $chat, string $input): string
 
         /** @var EmbeddingsResponseDto $embedding */
         $embedding = LlmDriverFacade::driver(
-            $chat->chatable->getDriver()
+            $chat->chatable->getEmbeddingDriver()
         )->embedData($input);
 
         $results = DocumentChunk::query()
@@ -40,12 +40,12 @@ public function search(Chat $chat, string $input): string
         $content = [];
 
         foreach ($results as $result) {
-            $content[] = reduce_text_size($result->content);
+            $content[] = remove_ascii(reduce_text_size($result->content)); //reduce_text_size seem to mess up Claude?
         }
 
         $content = implode(' ', $content);
 
-        $content = 'This is data from the search results when entering the users prompt please use this for context and only this: '.$content;
+        $content = 'This is data from the search results when entering the users prompt please use this for context and only this and return as markdown so I can render it: '.$content;
 
         $chat->addInput(
             message: $content,
diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
index d79565d4..e92c7bb4 100644
--- a/app/Http/Controllers/CollectionController.php
+++ b/app/Http/Controllers/CollectionController.php
@@ -31,6 +31,7 @@ public function store()
             'name' => 'required',
             'description' => 'required',
             'driver' => 'required',
+            'embedding_driver' => 'required',
         ]);
 
         $validated['team_id'] = auth()->user()->current_team_id;
diff --git a/app/Jobs/VectorlizeDataJob.php b/app/Jobs/VectorlizeDataJob.php
index 868762a5..97811ab6 100644
--- a/app/Jobs/VectorlizeDataJob.php
+++ b/app/Jobs/VectorlizeDataJob.php
@@ -43,7 +43,7 @@ public function handle(): void
         $content = $this->documentChunk->content;
 
         /** @var EmbeddingsResponseDto $results */
-        $results = LlmDriverFacade::driver($this->documentChunk->getDriver())
+        $results = LlmDriverFacade::driver($this->documentChunk->getEmbeddingDriver())
             ->embedData($content);
 
         $this->documentChunk->update([
diff --git a/app/LlmDriver/ClaudeClient.php b/app/LlmDriver/ClaudeClient.php
index 6bf9fe98..042208dc 100644
--- a/app/LlmDriver/ClaudeClient.php
+++ b/app/LlmDriver/ClaudeClient.php
@@ -5,25 +5,21 @@
 use App\LlmDriver\Requests\MessageInDto;
 use App\LlmDriver\Responses\CompletionResponse;
 use App\LlmDriver\Responses\EmbeddingsResponseDto;
+use Illuminate\Http\Client\Response;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 
 class ClaudeClient
 {
+    protected string $baseUrl = 'https://api.anthropic.com/v1';
+
+    protected string $version = '2023-06-01';
+
     protected string $driver = 'claude';
 
     public function embedData(string $data): EmbeddingsResponseDto
     {
-        if (! app()->environment('testing')) {
-            sleep(2);
-        }
-        Log::info('LlmDriver::MockClient::embedData');
-
-        $data = get_fixture('embedding_response.json');
-
-        return EmbeddingsResponseDto::from([
-            'embedding' => data_get($data, 'data.0.embedding'),
-            'token_count' => 1000,
-        ]);
+        throw new \Exception('Not implemented');
     }
 
     /**
@@ -31,32 +27,118 @@ public function embedData(string $data): EmbeddingsResponseDto
      */
     public function chat(array $messages): CompletionResponse
     {
-        if (! app()->environment('testing')) {
-            sleep(2);
+        $model = $this->getConfig('claude')['models']['completion_model'];
+        $maxTokens = $this->getConfig('claude')['max_tokens'];
+
+        Log::info('LlmDriver::Claude::completion');
+
+        /**
+         * I need to iterate over each item
+         * then if there are two rows with role assistant I need to insert
+         * in betwee a user row with some copy to make it work like "And the user search results had"
+         * using the Laravel Collection library
+         */
+        $messages = collect($messages)->map(function ($item) {
+            if ($item->role === 'system') {
+                $item->role = 'assistant';
+            }
+
+            return $item->toArray();
+        })->reverse()->values();
+
+        $messages = $messages->flatMap(function ($item, $index) use ($messages) {
+            if ($index > 0 && $item['role'] === 'assistant' && optional($messages->get($index + 1))['role'] === 'assistant') {
+                return [
+                    $item,
+                    ['role' => 'user', 'content' => 'Continuation of search results'],
+                ];
+            }
+
+            return [$item];
+        })->toArray();
+
+        put_fixture('claude_messages_debug.json', $messages);
+
+        $results = $this->getClient()->post('/messages', [
+            'model' => $model,
+            'system' => 'Return a markdown response.',
+            'max_tokens' => $maxTokens,
+            'messages' => $messages,
+        ]);
+
+        if (! $results->ok()) {
+            $error = $results->json()['error']['type'];
+            $message = $results->json()['error']['message'];
+            Log::error('Claude API Error ', [
+                'type' => $error,
+                'message' => $message,
+            ]);
+            throw new \Exception('Claude API Error '.$message);
         }
 
-        Log::info('LlmDriver::MockClient::completion');
+        $data = null;
 
-        $data = <<<'EOD'
-        Voluptate irure cillum dolor anim officia reprehenderit dolor. Eiusmod veniam nostrud consectetur incididunt proident id. Anim adipisicing pariatur amet duis Lorem sunt veniam veniam est. Deserunt ea aliquip cillum pariatur consectetur. Dolor in reprehenderit adipisicing consectetur cupidatat ad cupidatat reprehenderit. Nostrud mollit voluptate aliqua anim pariatur excepteur eiusmod velit quis exercitation tempor quis excepteur.        
-EOD;
+        foreach ($results->json()['content'] as $content) {
+            $data = $content['text'];
+        }
 
-        return new CompletionResponse($data);
+        return CompletionResponse::from([
+            'content' => $data,
+        ]);
     }
 
     public function completion(string $prompt): CompletionResponse
     {
-        if (! app()->environment('testing')) {
-            sleep(2);
+        $model = $this->getConfig('claude')['models']['completion_model'];
+        $maxTokens = $this->getConfig('claude')['max_tokens'];
+
+        Log::info('LlmDriver::Claude::completion');
+
+        $results = $this->getClient()->post('/messages', [
+            'model' => $model,
+            'max_tokens' => $maxTokens,
+            'messages' => [
+                [
+                    'role' => 'user',
+                    'content' => $prompt,
+                ],
+            ],
+        ]);
+
+        if (! $results->ok()) {
+            $error = $results->json()['error']['type'];
+            Log::error('Claude API Error '.$error);
+            throw new \Exception('Claude API Error '.$error);
         }
 
-        Log::info('LlmDriver::MockClient::completion');
+        $data = null;
+
+        foreach ($results->json()['content'] as $content) {
+            $data = $content['text'];
+        }
 
-        $data = <<<'EOD'
-        Voluptate irure cillum dolor anim officia reprehenderit dolor. Eiusmod veniam nostrud consectetur incididunt proident id. Anim adipisicing pariatur amet duis Lorem sunt veniam veniam est. Deserunt ea aliquip cillum pariatur consectetur. Dolor in reprehenderit adipisicing consectetur cupidatat ad cupidatat reprehenderit. Nostrud mollit voluptate aliqua anim pariatur excepteur eiusmod velit quis exercitation tempor quis excepteur.        
-EOD;
+        return CompletionResponse::from([
+            'content' => $data,
+        ]);
+    }
+
+    protected function getError(Response $response)
+    {
+        return $response->json()['error']['type'];
+    }
+
+    protected function getClient()
+    {
+        $api_token = $this->getConfig('claude')['api_key'];
+        if (! $api_token) {
+            throw new \Exception('Claude API Token not found');
+        }
 
-        return new CompletionResponse($data);
+        return Http::withHeaders([
+            'x-api-key' => $api_token,
+            'anthropic-version' => $this->version,
+            'content-type' => 'application/json',
+        ])->baseUrl($this->baseUrl);
     }
 
     protected function getConfig(string $driver): array
diff --git a/app/LlmDriver/DriversEnum.php b/app/LlmDriver/DriversEnum.php
new file mode 100644
index 00000000..c69cba44
--- /dev/null
+++ b/app/LlmDriver/DriversEnum.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\LlmDriver;
+
+enum DriversEnum: string
+{
+    case Mock = 'mock';
+    case OpenAi = 'openai';
+    case OpenAiAzure = 'openai_azure';
+    case Ollama = 'ollama';
+    case Gemini = 'gemini';
+    case Claude = 'claude';
+}
diff --git a/app/LlmDriver/HasDrivers.php b/app/LlmDriver/HasDrivers.php
new file mode 100644
index 00000000..ef366ed9
--- /dev/null
+++ b/app/LlmDriver/HasDrivers.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\LlmDriver;
+
+interface HasDrivers
+{
+    public function getDriver(): string;
+
+    public function getEmbeddingDriver(): string;
+}
diff --git a/app/LlmDriver/LlmDriverClient.php b/app/LlmDriver/LlmDriverClient.php
index e651906e..e1a67e67 100644
--- a/app/LlmDriver/LlmDriverClient.php
+++ b/app/LlmDriver/LlmDriverClient.php
@@ -22,6 +22,8 @@ protected function createDriver($name)
         switch ($name) {
             case 'openai':
                 return new OpenAiClient();
+            case 'claude':
+                return new ClaudeClient();
             case 'mock':
                 return new MockClient();
             default:
diff --git a/app/Models/Collection.php b/app/Models/Collection.php
index d2a7aa4b..37a30e90 100644
--- a/app/Models/Collection.php
+++ b/app/Models/Collection.php
@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\LlmDriver\DriversEnum;
+use App\LlmDriver\HasDrivers;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -14,19 +16,23 @@
  * @property int $id
  * @property string $name
  * @property string|null $description
+ * @property DriversEnum $driver
+ * @property DriversEnum $embedding_driver
  * @property bool $active
  * @property int $team_id
  * @property \Illuminate\Support\Carbon $created_at
  * @property \Illuminate\Support\Carbon $updated_at
  */
-class Collection extends Model
+class Collection extends Model implements HasDrivers
 {
     use HasFactory;
 
     protected $guarded = [];
 
-    protected $cast = [
+    protected $casts = [
         'active' => 'boolean',
+        'driver' => DriversEnum::class,
+        'embedding_driver' => DriversEnum::class,
     ];
 
     public function team(): BelongsTo
@@ -36,7 +42,12 @@ public function team(): BelongsTo
 
     public function getDriver(): string
     {
-        return $this->driver;
+        return $this->driver->value;
+    }
+
+    public function getEmbeddingDriver(): string
+    {
+        return $this->embedding_driver->value;
     }
 
     public function documents(): HasMany
diff --git a/app/Models/Document.php b/app/Models/Document.php
index c436533b..9360a89f 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -4,6 +4,7 @@
 
 use App\Domains\Documents\StatusEnum;
 use App\Domains\Documents\TypesEnum;
+use App\LlmDriver\HasDrivers;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,7 +18,7 @@
  * @property string|null $summary
  * @property string|null $file_path
  */
-class Document extends Model
+class Document extends Model implements HasDrivers
 {
     use HasFactory;
 
@@ -58,6 +59,11 @@ public function mkdirPathToFile(): ?string
 
     public function getDriver(): string
     {
-        return $this->collection->driver;
+        return $this->collection->driver->value;
+    }
+
+    public function getEmbeddingDriver(): string
+    {
+        return $this->collection->embedding_driver->value;
     }
 }
diff --git a/app/Models/DocumentChunk.php b/app/Models/DocumentChunk.php
index c9b9d2d7..5c819919 100644
--- a/app/Models/DocumentChunk.php
+++ b/app/Models/DocumentChunk.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Domains\Documents\StatusEnum;
+use App\LlmDriver\HasDrivers;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Pgvector\Laravel\Vector;
@@ -10,7 +11,7 @@
 /**
  * @property Document $document
  */
-class DocumentChunk extends Model
+class DocumentChunk extends Model implements HasDrivers
 {
     use HasFactory;
 
@@ -41,8 +42,13 @@ protected static function booted()
         });
     }
 
+    public function getEmbeddingDriver(): string
+    {
+        return $this->document->collection->embedding_driver->value;
+    }
+
     public function getDriver(): string
     {
-        return $this->document->collection->driver;
+        return $this->document->collection->driver->value;
     }
 }
diff --git a/app/helpers.php b/app/helpers.php
index e5501a99..303c9bed 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -25,7 +25,7 @@ function put_fixture($file_name, $content = [], $json = true)
 if (! function_exists('remove_ascii')) {
     function remove_ascii($string): string
     {
-        return preg_replace('/[^\x00-\x7F]+/', '', $string);
+        return str_replace("\u2019", ' ', preg_replace('/[^\x00-\x7F]+/', '', $string));
     }
 }
 
diff --git a/config/llmdriver.php b/config/llmdriver.php
index 5c090d18..320e0407 100644
--- a/config/llmdriver.php
+++ b/config/llmdriver.php
@@ -14,8 +14,16 @@
             'completion_model' => env('OPENAI_COMPLETION_MODEL', 'gpt-4-turbo-preview'),
             'chat_model' => env('OPENAICHAT_MODEL', 'gpt-4-turbo-preview'),
         ],
-        'azure' => [
+        'mock' => [
 
+        ],
+        'claude' => [
+            'api_key' => env('CLAUDE_API_KEY'),
+            'max_tokens' => env('CLAUDE_MAX_TOKENS', 4000),
+            'models' => [
+                //@see https://www.anthropic.com/news/claude-3-family
+                'completion_model' => env('CLAUDE_COMPLETION_MODEL', 'claude-3-opus-20240229'),
+            ],
         ],
         'ollama' => [
 
diff --git a/database/factories/CollectionFactory.php b/database/factories/CollectionFactory.php
index ec0de092..498246a2 100644
--- a/database/factories/CollectionFactory.php
+++ b/database/factories/CollectionFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories;
 
+use App\LlmDriver\DriversEnum;
 use App\Models\Team;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -22,6 +23,8 @@ public function definition(): array
             'description' => $this->faker->paragraph,
             'active' => $this->faker->boolean,
             'team_id' => Team::factory(),
+            'driver' => DriversEnum::Mock,
+            'embedding_driver' => DriversEnum::Mock,
         ];
     }
 }
diff --git a/database/migrations/2024_03_29_200402_add_embedding_driver_to_collections_model.php b/database/migrations/2024_03_29_200402_add_embedding_driver_to_collections_model.php
new file mode 100644
index 00000000..6de31dc0
--- /dev/null
+++ b/database/migrations/2024_03_29_200402_add_embedding_driver_to_collections_model.php
@@ -0,0 +1,29 @@
+<?php
+
+use App\LlmDriver\DriversEnum;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('collections', function (Blueprint $table) {
+            $table->string('embedding_driver')->default(DriversEnum::Mock);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('collections', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/phpunit.xml b/phpunit.xml
index e90e0b93..236e4e5a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -32,5 +32,6 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="OPENAI_MOCK" value="true"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
+        <env name="CLAUDE_API_KEY" value="sk-ant-api03-Jvzj2m6ABKuC2o11jUdrT47xqvUt5Fa6RKXSAqkxGkV7hUJnQQpHQCyba4SpED9RUXauz4Zp32Ujwp1MnV9O-g-1234567890"/>
     </php>
 </phpunit>
diff --git a/resources/js/Pages/Collection/Components/EmbeddingType.vue b/resources/js/Pages/Collection/Components/EmbeddingType.vue
new file mode 100644
index 00000000..f8239bb6
--- /dev/null
+++ b/resources/js/Pages/Collection/Components/EmbeddingType.vue
@@ -0,0 +1,66 @@
+<template>
+    <Listbox as="div" v-model="selected">
+      <ListboxLabel class="sr-only">Choose Embedding LLM Drier</ListboxLabel>
+      <div class="relative">
+        <div class="inline-flex divide-x divide-indigo-700 rounded-md shadow-sm">
+          <div class="inline-flex items-center gap-x-1.5 rounded-l-md bg-indigo-600 px-3 py-2 text-white shadow-sm">
+            <CheckIcon class="-ml-0.5 h-5 w-5" aria-hidden="true" />
+            <p class="text-sm font-semibold">{{ selected.title }}</p>
+          </div>
+          <ListboxButton class="inline-flex items-center rounded-l-none rounded-r-md bg-indigo-600 p-2 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2 focus:ring-offset-gray-50">
+            <ChevronDownIcon class="h-5 w-5 text-white" aria-hidden="true" />
+          </ListboxButton>
+        </div>
+  
+        <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100" leave-to-class="opacity-0">
+          <ListboxOptions 
+          
+          class="absolute left-0 z-10 mt-2 w-72 origin-top-right divide-y divide-gray-200 overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+            <ListboxOption 
+          :disabled="!option.active"
+          as="template" v-for="option in publishingOptions" :key="option.title" :value="option" v-slot="{ active, selected }">
+              <li :class="[active ? 'bg-indigo-600 text-white' : 'text-gray-900', 'cursor-default select-none p-4 text-sm']">
+                <div class="flex flex-col">
+                  <div class="flex justify-between">
+                    <p :class="selected ? 'font-semibold' : 'font-normal'">{{ option.title }}
+                      <span class="text-gray-600" v-if="!option.active">
+                      (coming soon..)</span>
+                    </p>
+                    <span v-if="selected" :class="active ? 'text-white' : 'text-indigo-600'">
+                      <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                    </span>
+                  </div>
+                  <p :class="[active ? 'text-indigo-200' : 'text-gray-500', 'mt-2']">{{ option.description }}</p>
+                </div>
+              </li>
+            </ListboxOption>
+          </ListboxOptions>
+        </transition>
+      </div>
+    </Listbox>
+  </template>
+  
+  <script setup>
+  import { ref, watch } from 'vue'
+  import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
+  import { CheckIcon, ChevronDownIcon } from '@heroicons/vue/20/solid'
+  
+  const emit = defineEmits(['embeddingTypeChosen'])
+
+  const publishingOptions = [
+    { active: true, key: "mock", title: 'Mock LLM', description: 'This will mock all the LLM features great for local development', current: true },
+    { active: true, key: "openai", title: 'OpenAi', description: 'This will work with the OpenAi Api', current: false },
+    { active: false, key: "mock", title: 'OpenAi Azure', description: 'This will work with the Azure OpenAi Api', current: false },
+    { active: false, key: "ollama", title: 'Ollama', description: 'This will work with the Ollam API', current: false },
+    { active: false, key: "mock", title: 'Gemini', description: 'This will work with the Gemini Api', current: false },
+    { active: true, key: "mock", title: 'Claude using Vonage', description: 'This will work with the Claude Api', current: false },
+  ]
+  
+  const selected = ref(publishingOptions[0])
+
+  watch(selected, (value) => {
+    console.log("emit " , value)
+    emit('embeddingTypeChosen', value.key)
+  })
+
+  </script>
\ No newline at end of file
diff --git a/resources/js/Pages/Collection/Components/LlmType.vue b/resources/js/Pages/Collection/Components/LlmType.vue
index da86f36e..2ad45dfa 100644
--- a/resources/js/Pages/Collection/Components/LlmType.vue
+++ b/resources/js/Pages/Collection/Components/LlmType.vue
@@ -1,6 +1,5 @@
 <template>
     <Listbox as="div" v-model="selected">
-      <ListboxLabel class="sr-only">Choose LLM Drier</ListboxLabel>
       <div class="relative">
         <div class="inline-flex divide-x divide-indigo-700 rounded-md shadow-sm">
           <div class="inline-flex items-center gap-x-1.5 rounded-l-md bg-indigo-600 px-3 py-2 text-white shadow-sm">
@@ -14,12 +13,18 @@
         </div>
   
         <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100" leave-to-class="opacity-0">
-          <ListboxOptions class="absolute right-0 z-10 mt-2 w-72 origin-top-right divide-y divide-gray-200 overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-            <ListboxOption as="template" v-for="option in publishingOptions" :key="option.title" :value="option" v-slot="{ active, selected }">
+          <ListboxOptions class="absolute left-0 z-10 mt-2 w-72 origin-top-right divide-y divide-gray-200 overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+            <ListboxOption 
+
+          :disabled="!option.active"
+            as="template" v-for="option in publishingOptions" :key="option.title" :value="option" v-slot="{ active, selected }">
               <li :class="[active ? 'bg-indigo-600 text-white' : 'text-gray-900', 'cursor-default select-none p-4 text-sm']">
-                <div class="flex flex-col">
+                <div class="flex flex-col" >
                   <div class="flex justify-between">
-                    <p :class="selected ? 'font-semibold' : 'font-normal'">{{ option.title }}</p>
+                    <p :class="selected ? 'font-semibold' : 'font-normal'">
+                      {{ option.title }} <span class="text-gray-600" v-if="!option.active">
+                      (coming soon..)</span>
+                    </p>
                     <span v-if="selected" :class="active ? 'text-white' : 'text-indigo-600'">
                       <CheckIcon class="h-5 w-5" aria-hidden="true" />
                     </span>
@@ -42,14 +47,13 @@
   const emit = defineEmits(['typeChosen'])
 
   const publishingOptions = [
-  
-  
-    { key: "mock", title: 'Mock LLM', description: 'This will mock all the LLM features great for local development', current: true },
-    { key: "openai", title: 'OpenAi', description: 'This will work with the OpenAi Api', current: false },
-    { key: "mock", title: 'OpenAi Azure', description: 'This will work with the Azure OpenAi Api', current: false },
-    { key: "ollama", title: 'Ollama', description: 'This will work with the Ollam API', current: false },
-    { key: "mock", title: 'Gemini', description: 'This will work with the Gemini Api', current: false },
-    { key: "mock", title: 'Claude', description: 'This will work with the Claude Api', current: false },
+    { active: true, key: "mock", title: 'Mock LLM', description: 'This will mock all the LLM features great for local development', current: true },
+    { active: true, key: "openai", title: 'OpenAi', description: 'This will work with the OpenAi Api', current: false },
+    { active: true, key: "claude", title: 'Claude', description: 'This will work with the Claude Api', current: false },
+    { active: false, key: "mock", title: 'OpenAi Azure', description: 'This will work with the Azure OpenAi Api', current: false },
+    { active: false, key: "ollama", title: 'Ollama', description: 'This will work with the Ollam API', current: false },
+    { active: false, key: "mock", title: 'Gemini', description: 'This will work with the Gemini Api', current: false },
+    
   ]
   
   const selected = ref(publishingOptions[0])
diff --git a/resources/js/Pages/Collection/Components/ResourceForm.vue b/resources/js/Pages/Collection/Components/ResourceForm.vue
index 08778479..fc87b515 100644
--- a/resources/js/Pages/Collection/Components/ResourceForm.vue
+++ b/resources/js/Pages/Collection/Components/ResourceForm.vue
@@ -11,9 +11,14 @@
             <TextArea v-model="modelValue.description" type="text" class="mt-1 block w-full" />
             <InputError :message="modelValue.errors.description" class="mt-2" />
         </div>
-        <div class="sm:col-span-3">
+        <div class="col-span-6 sm:col-span-6">
+            <div>Choose the system to Interact with the data</div>
             <LlmType @typeChosen="typeChosen" />
         </div>
+        <div class="col-span-6 sm:col-span-6">
+            <div>Choose the system to Embed the data</div>
+            <EmbeddingType @embeddingTypeChosen="embeddingTypeChosen" />
+        </div>
     </div>
 </template>
 
@@ -23,15 +28,18 @@ import InputLabel from '@/Components/InputLabel.vue';
 import TextInput from '@/Components/TextInput.vue';
 import TextArea from '@/Components/TextArea.vue';
 import LlmType from './LlmType.vue';
+import EmbeddingType from './EmbeddingType.vue';
 const props = defineProps({
     modelValue: Object,
 });
 
-
 const typeChosen = (type) => {
-    console.log("TYPE " + type)
     props.modelValue.driver = type;
 }
 
+const embeddingTypeChosen = (type) => {
+    props.modelValue.embedding_driver = type;
+}
+
 
 </script>
\ No newline at end of file
diff --git a/resources/js/Pages/Collection/Create.vue b/resources/js/Pages/Collection/Create.vue
index 862b9024..2e71e41c 100644
--- a/resources/js/Pages/Collection/Create.vue
+++ b/resources/js/Pages/Collection/Create.vue
@@ -78,6 +78,7 @@ const closeSlideOut = () => {
 const form = useForm({
   name: "",
   driver: "mock",
+  embedding_driver: "mock",
   description: "Some details about your collection that will help give the ai system some context."
 })
 
diff --git a/resources/js/Pages/Collection/Index.vue b/resources/js/Pages/Collection/Index.vue
index 5bb564e4..7bf153f7 100644
--- a/resources/js/Pages/Collection/Index.vue
+++ b/resources/js/Pages/Collection/Index.vue
@@ -64,6 +64,12 @@ const closeCreateCollectionSlideOut = () => {
                                                     {{  collectionItem.description }}
                                                </div>
                                                <div class="flex justify-center mt-10 gap-2">
+                                                    <span class="rounded-md bg-indigo-500 text-indigo-200 px-2 py-2 ">
+                                                        LLm Driver: {{ collectionItem.driver }}
+                                                    </span>
+                                                    <span class="rounded-md bg-indigo-500 text-indigo-200 px-2 py-2 ">
+                                                        Embedding Driver: {{ collectionItem.driver }}
+                                                    </span>
                                                     <span class="rounded-md bg-indigo-500 text-indigo-200 px-2 py-2 ">
                                                         Document Count: {{ collectionItem.documents_count }}
                                                     </span>
@@ -89,9 +95,6 @@ const closeCreateCollectionSlideOut = () => {
                 </div>
             </div>
         </div>
-        <CreateCollection :open="showCreateCollection" @closing="closeCreateCollectionSlideOut" 
-        
-
-        ></CreateCollection>
+        <CreateCollection :open="showCreateCollection" @closing="closeCreateCollectionSlideOut"/>
     </AppLayout>
 </template>
diff --git a/tests/Feature/ClaudeClientTest.php b/tests/Feature/ClaudeClientTest.php
index e7c15d6d..8f4e6330 100644
--- a/tests/Feature/ClaudeClientTest.php
+++ b/tests/Feature/ClaudeClientTest.php
@@ -3,10 +3,10 @@
 namespace Tests\Feature;
 
 use App\LlmDriver\ClaudeClient;
-use App\LlmDriver\MockClient;
 use App\LlmDriver\Requests\MessageInDto;
 use App\LlmDriver\Responses\CompletionResponse;
 use App\LlmDriver\Responses\EmbeddingsResponseDto;
+use Illuminate\Support\Facades\Http;
 use Tests\TestCase;
 
 class ClaudeClientTest extends TestCase
@@ -17,6 +17,8 @@ class ClaudeClientTest extends TestCase
     public function test_embeddings(): void
     {
 
+        $this->markTestSkipped('@TODO: Requires another server');
+
         $client = new ClaudeClient();
 
         $results = $client->embedData('test');
@@ -27,7 +29,13 @@ public function test_embeddings(): void
 
     public function test_completion(): void
     {
-        $client = new MockClient();
+        $client = new ClaudeClient();
+
+        $data = get_fixture('claude_completion.json');
+
+        Http::fake([
+            'api.anthropic.com/*' => Http::response($data, 200),
+        ]);
 
         $results = $client->completion('test');
 
@@ -35,11 +43,21 @@ public function test_completion(): void
 
     }
 
-    public function test_Chat(): void
+    public function test_chat(): void
     {
-        $client = new MockClient();
+        $client = new ClaudeClient();
+
+        $data = get_fixture('claude_completion.json');
+
+        Http::fake([
+            'api.anthropic.com/*' => Http::response($data, 200),
+        ]);
 
         $results = $client->chat([
+            MessageInDto::from([
+                'content' => 'test',
+                'role' => 'system',
+            ]),
             MessageInDto::from([
                 'content' => 'test',
                 'role' => 'user',
@@ -48,5 +66,55 @@ public function test_Chat(): void
 
         $this->assertInstanceOf(CompletionResponse::class, $results);
 
+        Http::assertSent(function ($request) {
+            $message1 = $request->data()['messages'][0]['role'];
+            $message2 = $request->data()['messages'][1]['role'];
+
+            return $message2 === 'assistant' &&
+                $message1 === 'user';
+        });
+
+    }
+
+    public function test_chat_with_multiple_assistant_messages(): void
+    {
+        $client = new ClaudeClient();
+
+        $data = get_fixture('claude_completion.json');
+
+        Http::fake([
+            'api.anthropic.com/*' => Http::response($data, 200),
+        ]);
+
+        $results = $client->chat([
+            MessageInDto::from([
+                'content' => 'test 3',
+                'role' => 'assistant',
+            ]),
+            MessageInDto::from([
+                'content' => 'test 2',
+                'role' => 'assistant',
+            ]),
+            MessageInDto::from([
+                'content' => 'test 1',
+                'role' => 'assistant',
+            ]),
+            MessageInDto::from([
+                'content' => 'test',
+                'role' => 'user',
+            ]),
+        ]);
+
+        $this->assertInstanceOf(CompletionResponse::class, $results);
+
+        Http::assertSent(function ($request) {
+            $message1 = $request->data()['messages'][0]['role'];
+            $message2 = $request->data()['messages'][1]['role'];
+            $message3 = $request->data()['messages'][1]['role'];
+
+            return $message2 === 'assistant' &&
+                $message1 === 'user' && $message3 === 'assistant';
+        });
+
     }
 }
diff --git a/tests/Feature/Http/Controllers/CollectionControllerTest.php b/tests/Feature/Http/Controllers/CollectionControllerTest.php
index d7f9abce..c99ef50a 100644
--- a/tests/Feature/Http/Controllers/CollectionControllerTest.php
+++ b/tests/Feature/Http/Controllers/CollectionControllerTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Feature\Http\Controllers;
 
 use App\Jobs\ProcessFileJob;
+use App\LlmDriver\DriversEnum;
 use App\Models\Collection;
 use App\Models\User;
 use Illuminate\Http\UploadedFile;
@@ -16,7 +17,7 @@ class CollectionControllerTest extends TestCase
     /**
      * A basic feature test example.
      */
-    public function test_example(): void
+    public function test_index(): void
     {
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
 
@@ -43,9 +44,12 @@ public function test_store(): void
         $response = $this->post(route('collections.store'), [
             'name' => 'Test',
             'driver' => 'mock',
+            'embedding_driver' => DriversEnum::Claude->value,
             'description' => 'Test Description',
         ])->assertStatus(302);
         $this->assertDatabaseCount('collections', 1);
+        $collection = Collection::first();
+        $this->assertEquals(DriversEnum::Claude, $collection->embedding_driver);
 
     }
 
diff --git a/tests/fixtures/claude_chat.json b/tests/fixtures/claude_chat.json
new file mode 100644
index 00000000..2b507a3a
--- /dev/null
+++ b/tests/fixtures/claude_chat.json
@@ -0,0 +1,18 @@
+{
+    "id": "msg_01N9qpneMKuYmsVqmMrfxHh9",
+    "type": "message",
+    "role": "assistant",
+    "content": [
+        {
+            "type": "text",
+            "text": "\nIt's hard for me to say definitively whether I am \"better\" than ChatGPT for integrating with a Laravel PHP application, as it depends on the specific use case and requirements. Both ChatGPT and I are large language models with broad knowledge that can engage in conversational interactions. \n\nSome potential factors to consider:\n- Anthropic's Claude API (which I am accessed through) is specifically designed for easy integration into applications, while I believe accessing ChatGPT may require using OpenAI's general purpose API which could require more setup\/configuration.\n- From the interactions I've seen, my responses tend to be more focused and concise compared to ChatGPT which can be more verbose and meandering at times. This could be preferable for an application.\n- I put a big emphasis on truthfulness and not making up information, which could be important for certain applications. I'm not as familiar with ChatGPT's propensity for this.\n- As an Anthropic model, I'm newer and less widely used, so there may be fewer examples and less support for integrating me compared to the widely popular ChatGPT.\n\nUltimately, I'd recommend evaluating both options against your specific needs. Test out the APIs, compare responses, factor in pricing and ease of integration, etc. Both are highly capable models that could likely meet your needs, so it may come down to trying them out and seeing which provides the better developer and user experience for your application. Let me know if you have any other specific questions as you evaluate the options!"
+        }
+    ],
+    "model": "claude-3-opus-20240229",
+    "stop_reason": "end_turn",
+    "stop_sequence": null,
+    "usage": {
+        "input_tokens": 41,
+        "output_tokens": 335
+    }
+}
\ No newline at end of file
diff --git a/tests/fixtures/claude_completion.json b/tests/fixtures/claude_completion.json
new file mode 100644
index 00000000..5b6291c0
--- /dev/null
+++ b/tests/fixtures/claude_completion.json
@@ -0,0 +1,18 @@
+{
+    "id": "msg_01Uct7X8gVMtQC58Y6zuEvS3",
+    "type": "message",
+    "role": "assistant",
+    "content": [
+        {
+            "type": "text",
+            "text": "It's hard for me to say whether I'm \"better\" than ChatGPT or not. We likely have different capabilities, strengths and weaknesses. I try not to compare myself to other AI systems, as I'm honestly not always sure what they are capable of. I think it's best for humans to try interacting with different AI assistants and come to their own conclusions about which one works best for their needs. What I can say is that I will always strive to be helpful, engaging and beneficial to the humans I interact with."
+        }
+    ],
+    "model": "claude-3-opus-20240229",
+    "stop_reason": "end_turn",
+    "stop_sequence": null,
+    "usage": {
+        "input_tokens": 15,
+        "output_tokens": 116
+    }
+}
\ No newline at end of file
diff --git a/tests/fixtures/claude_messages_debug.json b/tests/fixtures/claude_messages_debug.json
new file mode 100644
index 00000000..1c773dcf
--- /dev/null
+++ b/tests/fixtures/claude_messages_debug.json
@@ -0,0 +1,26 @@
+[
+    {
+        "content": "test",
+        "role": "user"
+    },
+    {
+        "content": "test 1",
+        "role": "assistant"
+    },
+    {
+        "role": "user",
+        "content": "Continuation of search results"
+    },
+    {
+        "content": "test 2",
+        "role": "assistant"
+    },
+    {
+        "role": "user",
+        "content": "Continuation of search results"
+    },
+    {
+        "content": "test 3",
+        "role": "assistant"
+    }
+]
\ No newline at end of file
diff --git a/tests/fixtures/messages_in.json b/tests/fixtures/messages_in.json
new file mode 100644
index 00000000..d6e8fea9
--- /dev/null
+++ b/tests/fixtures/messages_in.json
@@ -0,0 +1,10 @@
+[
+    {
+        "content": "Is Claude better than ChatGPT when using their api to interact with",
+        "role": "user"
+    },
+    {
+        "content": "Help this Laravel PHP developer choose which api to use for an llm part of the application.",
+        "role": "assistant"
+    }
+]
\ No newline at end of file