diff --git a/app/Http/Controllers/BotController.php b/app/Http/Controllers/BotController.php
index d58b5f577e38..7596884192d4 100644
--- a/app/Http/Controllers/BotController.php
+++ b/app/Http/Controllers/BotController.php
@@ -100,9 +100,7 @@ class BotController extends Controller
     public function handleCommand()
     {
         $data = $this->parseMessage(request()->command);
-        //dd($data);
         $intent = BaseIntent::createIntent(BOT_PLATFORM_WEB_APP, false, $data);
-
         return $intent->process();
     }
 
diff --git a/app/Ninja/Intents/BaseIntent.php b/app/Ninja/Intents/BaseIntent.php
index f95391c8ca72..0c08c694847e 100644
--- a/app/Ninja/Intents/BaseIntent.php
+++ b/app/Ninja/Intents/BaseIntent.php
@@ -43,7 +43,7 @@ class BaseIntent
 
         foreach ($data->entities as $entity) {
             if ($entity->type === 'EntityType') {
-                $entityType = $entity->entity;
+                $entityType = rtrim($entity->entity, 's');
                 break;
             }
         }
@@ -53,6 +53,9 @@ class BaseIntent
         }
 
         $entityType = ucwords(strtolower($entityType));
+        if ($entityType == 'Recurring') {
+            $entityType = 'RecurringInvoice';
+        }
         $intent = str_replace('Entity', $entityType, $intent);
 
         if ($platform == BOT_PLATFORM_WEB_APP) {
@@ -64,7 +67,7 @@ class BaseIntent
         //echo "Intent: $intent<p>";
 
         if (! class_exists($className)) {
-            throw new Exception(trans('texts.intent_not_supported'));
+            throw new Exception($intent . ': ' . trans('texts.intent_not_supported'));
         }
 
         return new $className($state, $data);
@@ -183,6 +186,22 @@ class BaseIntent
         return $data;
     }
 
+    protected function requestFieldsAsString($fields)
+    {
+        $str = '';
+
+        foreach ($this->requestFields() as $field => $value) {
+            if (in_array($field, $fields)) {
+                $str .= $field . '=' . urlencode($value) . '&';
+            }
+        }
+
+        $str = rtrim($str, '?');
+        $str = rtrim($str, '&');
+
+        return $str;
+    }
+
     protected function processField($field)
     {
         $field = str_replace(' ', '_', $field);
diff --git a/app/Ninja/Intents/WebApp/CreateClientIntent.php b/app/Ninja/Intents/WebApp/CreateClientIntent.php
new file mode 100644
index 000000000000..f8b05eaed6ac
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateClientIntent.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreateClientIntent extends BaseIntent
+{
+    public function process()
+    {
+        $url = '/clients/create';
+
+        //$url = '/invoices/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateCreditIntent.php b/app/Ninja/Intents/WebApp/CreateCreditIntent.php
new file mode 100644
index 000000000000..147ed99d4491
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateCreditIntent.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreateCreditIntent extends BaseIntent
+{
+    public function process()
+    {
+        $client = $this->requestClient();
+        $clientPublicId = $client ? $client->public_id : null;
+
+        //$invoiceItems = $this->requestInvoiceItems();
+
+        $url = '/credits/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateExpenseIntent.php b/app/Ninja/Intents/WebApp/CreateExpenseIntent.php
new file mode 100644
index 000000000000..f247937451c7
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateExpenseIntent.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreateExpenseIntent extends BaseIntent
+{
+    public function process()
+    {
+        $url = '/expenses/create';
+
+        //$url = '/invoices/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateInvoiceIntent.php b/app/Ninja/Intents/WebApp/CreateInvoiceIntent.php
index c954bd65ee1c..24982099d251 100644
--- a/app/Ninja/Intents/WebApp/CreateInvoiceIntent.php
+++ b/app/Ninja/Intents/WebApp/CreateInvoiceIntent.php
@@ -17,15 +17,7 @@ class CreateInvoiceIntent extends InvoiceIntent
         //$invoiceItems = $this->requestInvoiceItems();
 
         $url = '/invoices/create/' . $clientPublicId . '?';
-
-        foreach ($this->requestFields() as $field => $value) {
-            if (in_array($field, Invoice::$requestFields)) {
-                $url .= $field . '=' . urlencode($value) . '&';
-            }
-        }
-
-        $url = rtrim($url, '?');
-        $url = rtrim($url, '&');
+        $url .= $this->requestFieldsAsString(Invoice::$requestFields);
 
         return redirect($url);
     }
diff --git a/app/Ninja/Intents/WebApp/CreatePaymentIntent.php b/app/Ninja/Intents/WebApp/CreatePaymentIntent.php
new file mode 100644
index 000000000000..7f62428c1274
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreatePaymentIntent.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreatePaymentIntent extends BaseIntent
+{
+    public function process()
+    {
+        $client = $this->requestClient();
+        $clientPublicId = $client ? $client->public_id : null;
+
+        //$invoiceItems = $this->requestInvoiceItems();
+
+        $url = '/payments/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateProductIntent.php b/app/Ninja/Intents/WebApp/CreateProductIntent.php
new file mode 100644
index 000000000000..d8989b3f0c05
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateProductIntent.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Models\Product;
+use App\Models\EntityModel;
+use App\Ninja\Intents\ProductIntent;
+use Exception;
+
+class CreateProductIntent extends ProductIntent
+{
+    public function process()
+    {
+        $url = '/products/create';
+        
+        //$url = '/invoices/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateQuoteIntent.php b/app/Ninja/Intents/WebApp/CreateQuoteIntent.php
new file mode 100644
index 000000000000..e3a46b0707d5
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateQuoteIntent.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Models\Invoice;
+use App\Ninja\Intents\BaseIntent;
+
+class CreateQuoteIntent extends BaseIntent
+{
+    public function process()
+    {
+        $client = $this->requestClient();
+        $clientPublicId = $client ? $client->public_id : null;
+
+        //$invoiceItems = $this->requestInvoiceItems();
+
+        $url = '/quotes/create/' . $clientPublicId . '?';
+        $url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateRecurringInvoiceIntent.php b/app/Ninja/Intents/WebApp/CreateRecurringInvoiceIntent.php
new file mode 100644
index 000000000000..bbf04871696c
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateRecurringInvoiceIntent.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Models\Invoice;
+use App\Ninja\Intents\BaseIntent;
+
+class CreateRecurringInvoiceIntent extends BaseIntent
+{
+    public function process()
+    {
+        $client = $this->requestClient();
+        $clientPublicId = $client ? $client->public_id : null;
+
+        //$invoiceItems = $this->requestInvoiceItems();
+
+        $url = '/recurring_invoices/create/' . $clientPublicId . '?';
+        $url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateTaskIntent.php b/app/Ninja/Intents/WebApp/CreateTaskIntent.php
new file mode 100644
index 000000000000..b1ff8266d40e
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateTaskIntent.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreateTaskIntent extends BaseIntent
+{
+    public function process()
+    {
+        $client = $this->requestClient();
+        $clientPublicId = $client ? $client->public_id : null;
+
+        //$invoiceItems = $this->requestInvoiceItems();
+
+        $url = '/tasks/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/CreateVendorIntent.php b/app/Ninja/Intents/WebApp/CreateVendorIntent.php
new file mode 100644
index 000000000000..ef187567e70b
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/CreateVendorIntent.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class CreateVendorIntent extends BaseIntent
+{
+    public function process()
+    {
+        $url = '/vendors/create';
+
+        //$url = '/invoices/create/' . $clientPublicId . '?';
+        //$url .= $this->requestFieldsAsString(Invoice::$requestFields);
+
+        return redirect($url);
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListClientIntent.php b/app/Ninja/Intents/WebApp/ListClientIntent.php
new file mode 100644
index 000000000000..d10e42bf2015
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListClientIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListClientIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/clients');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListCreditIntent.php b/app/Ninja/Intents/WebApp/ListCreditIntent.php
new file mode 100644
index 000000000000..0beb440e5540
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListCreditIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListCreditIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/credits');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListExpenseIntent.php b/app/Ninja/Intents/WebApp/ListExpenseIntent.php
new file mode 100644
index 000000000000..03751a97e58d
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListExpenseIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListExpenseIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/expenses');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListInvoiceIntent.php b/app/Ninja/Intents/WebApp/ListInvoiceIntent.php
new file mode 100644
index 000000000000..7cf31d3b4cb0
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListInvoiceIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\InvoiceIntent;
+
+class ListInvoiceIntent extends InvoiceIntent
+{
+    public function process()
+    {
+        return redirect('/invoices');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListPaymentIntent.php b/app/Ninja/Intents/WebApp/ListPaymentIntent.php
new file mode 100644
index 000000000000..94456df19c43
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListPaymentIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListPaymentIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/payments');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListProductIntent.php b/app/Ninja/Intents/WebApp/ListProductIntent.php
new file mode 100644
index 000000000000..613601411228
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListProductIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListProductIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/products');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListQuoteIntent.php b/app/Ninja/Intents/WebApp/ListQuoteIntent.php
new file mode 100644
index 000000000000..66887cf73b1c
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListQuoteIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListQuotesIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/quotes');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListRecurringInvoiceIntent.php b/app/Ninja/Intents/WebApp/ListRecurringInvoiceIntent.php
new file mode 100644
index 000000000000..cf98df5ee6e3
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListRecurringInvoiceIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListRecurringInvoiceIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/recurring_invoices');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListTaskIntent.php b/app/Ninja/Intents/WebApp/ListTaskIntent.php
new file mode 100644
index 000000000000..41e1a4fc6048
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListTaskIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListTaskIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/tasks');
+    }
+}
diff --git a/app/Ninja/Intents/WebApp/ListVendorIntent.php b/app/Ninja/Intents/WebApp/ListVendorIntent.php
new file mode 100644
index 000000000000..2f3f819dec14
--- /dev/null
+++ b/app/Ninja/Intents/WebApp/ListVendorIntent.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Ninja\Intents\WebApp;
+
+use App\Ninja\Intents\BaseIntent;
+
+class ListVendorIntent extends BaseIntent
+{
+    public function process()
+    {
+        return redirect('/vendors');
+    }
+}
diff --git a/resources/views/partials/speech_recognition.blade.php b/resources/views/partials/speech_recognition.blade.php
index e5951243dd82..3c7b3dc585d2 100644
--- a/resources/views/partials/speech_recognition.blade.php
+++ b/resources/views/partials/speech_recognition.blade.php
@@ -173,7 +173,9 @@
     }
 
     function onMicrophoneClick() {
-      $('#search').val('create new invoice for edgar a po number of 1234');
+      //$('#search').val('create new invoice for edgar a po number of 1234');
+      $('#search').val('create a task for edgar');
+      //$('#search').val('show me all vendors');
       $('#search-form').submit();
       return;