diff --git a/.gitignore b/.gitignore
index 492e3c3..f681820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 /storage/*.key
 /vendor
 /modules
-/public
 .env
 .phpunit.result.cache
 Homestead.json
diff --git a/app/CorePackages/Models/VAModel.php b/app/CorePackages/Models/VAModel.php
new file mode 100644
index 0000000..14eff4c
--- /dev/null
+++ b/app/CorePackages/Models/VAModel.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\CorePackages\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use App\CorePackages\Scopes\RelatedToVirtualActivity;
+
+abstract class VAModel extends Model
+{
+    use RelatedToVirtualActivity;
+
+    public function attributeExists($attr)
+    {
+        return array_key_exists($attr, $this->attributes);
+    }
+
+}
diff --git a/app/CorePackages/RelatedToUser.php b/app/CorePackages/RelatedToUser.php
new file mode 100644
index 0000000..30bc430
--- /dev/null
+++ b/app/CorePackages/RelatedToUser.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\CorePackages;
+
+
+trait RelatedToUser
+{
+
+    /**
+     * The "booting" method of the model.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function($model) {
+            $model->user_id = 116;
+        });
+    }
+
+}
diff --git a/app/CorePackages/Resources/UserResource.php b/app/CorePackages/Resources/UserResource.php
new file mode 100644
index 0000000..2ed115c
--- /dev/null
+++ b/app/CorePackages/Resources/UserResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\CorePackages\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+
+class UserResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+        ];
+    }
+}
diff --git a/app/CorePackages/Scopes/RelatedToVirtualActivity.php b/app/CorePackages/Scopes/RelatedToVirtualActivity.php
new file mode 100644
index 0000000..c460c8b
--- /dev/null
+++ b/app/CorePackages/Scopes/RelatedToVirtualActivity.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\CorePackages\Scopes;
+
+use App\CorePackages\Scopes\VirtualActivityScope;
+
+
+trait RelatedToVirtualActivity
+{
+    /**
+     * The "booting" method of the model.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope(new VirtualActivityScope);
+
+        static::creating(function($model) {
+            $model->business_id = request()->business_id;
+            $model->user_id = 116;
+        });
+    }
+
+}
diff --git a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php b/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php
index 82e38e8..d42a284 100644
--- a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php
+++ b/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php
@@ -3,29 +3,54 @@
 namespace App\CorePackages\VirtualActivity;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Validator;
+
+
 use App\Business;
 
 class VirtualActivityServiceProvider extends ServiceProvider
 {
 
-    protected $defer = true;
+    public function boot()
+    {
+        Validator::extend('exists_va', function ($attribute, $value, $parameters, $validator) {
+            $table = $parameters[0];
+            $column = $parameters[1];
+
+            return \DB::table($table)
+                ->where($column, $value)
+                ->where('business_id',  request()->business_id)
+                ->count() > 0;
 
+        });
+    }
 
     public function register()
     {
+
         $this->app->singleton(Business::class, function () {
             return VirtualActivityFinder::fetch();
         });
-    }
 
+        $this->registerHandler();
+    }
 
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
+    protected function registerHandler()
     {
-        return [Business::class];
+
+        Route::macro('handler', function ($prefix) {
+            $singular = Str::singular($prefix);
+            Route::group([
+                'namespace' => $singular
+            ], function () use ($prefix, $singular) {
+                Route::get($prefix, 'Index' . $singular);
+                Route::post($prefix , 'Store' . $singular);
+                Route::put($prefix . '/{' . $singular . '}', 'Update' . $singular);
+                Route::delete($prefix . '/{' . $singular . '}', 'Destroy' . $singular);
+                Route::get($prefix . '/{' . $singular . '}', 'Show' . $singular);
+            });
+        });
     }
 }
diff --git a/composer.json b/composer.json
index ff8d4b2..d5f403f 100755
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "laravel/tinker": "^1.0",
         "nwidart/laravel-modules": "^4.0",
         "wm/crm": "dev-master",
-        "wm/task": "dev-master"
+        "wm/common": "dev-master"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",
@@ -68,9 +68,9 @@
             "type": "path",
             "url": "./modules/wm-crm"
         },
-        {
+	{
             "type": "path",
-            "url": "./modules/wm-task"
+            "url": "./modules/wm-common"
         }
     ]
 }
diff --git a/composer.lock b/composer.lock
index 593b3f6..ec22a86 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f8eaf468e405e51c383538dcb6fc1a9b",
+    "content-hash": "e10c5056bb6079312fe5934e34e35707",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -467,16 +467,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.8.26",
+            "version": "v5.8.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31"
+                "reference": "f1dccffb96f614895393e27e4667105a05407af5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1d8ec9afdedc79314c18715056b8143d7e1fac31",
-                "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f1dccffb96f614895393e27e4667105a05407af5",
+                "reference": "f1dccffb96f614895393e27e4667105a05407af5",
                 "shasum": ""
             },
             "require": {
@@ -610,7 +610,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2019-06-25T16:20:51+00:00"
+            "time": "2019-07-02T13:43:47+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -1538,16 +1538,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64"
+                "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64",
-                "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64",
+                "url": "https://api.github.com/repos/symfony/console/zipball/b592b26a24265a35172d8a2094d8b10f22b7cc39",
+                "reference": "b592b26a24265a35172d8a2094d8b10f22b7cc39",
                 "shasum": ""
             },
             "require": {
@@ -1609,11 +1609,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2019-06-05T13:25:51+00:00"
+            "time": "2019-06-13T11:03:18+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -1666,16 +1666,16 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6"
+                "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6",
-                "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/d8f4fb38152e0eb6a433705e5f661d25b32c5fcd",
+                "reference": "d8f4fb38152e0eb6a433705e5f661d25b32c5fcd",
                 "shasum": ""
             },
             "require": {
@@ -1718,20 +1718,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-30T16:10:05+00:00"
+            "time": "2019-06-19T15:27:09+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f"
+                "reference": "d257021c1ab28d48d24a16de79dfab445ce93398"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f",
-                "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d257021c1ab28d48d24a16de79dfab445ce93398",
+                "reference": "d257021c1ab28d48d24a16de79dfab445ce93398",
                 "shasum": ""
             },
             "require": {
@@ -1788,7 +1788,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-30T16:10:05+00:00"
+            "time": "2019-06-13T11:03:18+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1850,16 +1850,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176"
+                "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176",
-                "reference": "b3d4f4c0e4eadfdd8b296af9ca637cfbf51d8176",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a",
+                "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a",
                 "shasum": ""
             },
             "require": {
@@ -1895,20 +1895,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-26T20:47:49+00:00"
+            "time": "2019-06-13T11:03:18+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9"
+                "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9",
-                "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1b507fcfa4e87d192281774b5ecd4265370180d",
+                "reference": "e1b507fcfa4e87d192281774b5ecd4265370180d",
                 "shasum": ""
             },
             "require": {
@@ -1950,20 +1950,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-06-06T10:05:02+00:00"
+            "time": "2019-06-26T09:25:00+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429"
+                "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429",
-                "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4150f71e27ed37a74700561b77e3dbd754cbb44d",
+                "reference": "4150f71e27ed37a74700561b77e3dbd754cbb44d",
                 "shasum": ""
             },
             "require": {
@@ -2042,11 +2042,11 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2019-06-06T13:23:34+00:00"
+            "time": "2019-06-26T14:26:16+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
@@ -2456,7 +2456,7 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -2505,16 +2505,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465"
+                "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465",
-                "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/2ef809021d72071c611b218c47a3bf3b17b7325e",
+                "reference": "2ef809021d72071c611b218c47a3bf3b17b7325e",
                 "shasum": ""
             },
             "require": {
@@ -2577,7 +2577,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-06-05T09:16:20+00:00"
+            "time": "2019-06-26T13:54:39+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2639,16 +2639,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa"
+                "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa",
-                "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/934ab1d18545149e012aa898cf02e9f23790f7a0",
+                "reference": "934ab1d18545149e012aa898cf02e9f23790f7a0",
                 "shasum": ""
             },
             "require": {
@@ -2711,7 +2711,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-06-03T20:27:40+00:00"
+            "time": "2019-06-13T11:03:18+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -2772,16 +2772,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b"
+                "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b",
-                "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/45d6ef73671995aca565a1aa3d9a432a3ea63f91",
+                "reference": "45d6ef73671995aca565a1aa3d9a432a3ea63f91",
                 "shasum": ""
             },
             "require": {
@@ -2844,7 +2844,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2019-06-05T02:08:12+00:00"
+            "time": "2019-06-17T17:37:00+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -2946,17 +2946,16 @@
             "time": "2019-06-15T22:40:20+00:00"
         },
         {
-            "name": "wm/crm",
+            "name": "wm/common",
             "version": "dev-master",
             "dist": {
                 "type": "path",
-                "url": "./modules/wm-crm",
-                "reference": "cc4c3a1b0e76cb736b2a54cab8edfe8478ef902b"
+                "url": "./modules/wm-common",
+                "reference": "abe6be64f1e0a969b328b76416200cac8cdf2421"
             },
             "require": {
                 "illuminate/support": "5.8.*",
-                "php": "^7.1.3",
-                "wm/task": "dev-master"
+                "php": "^7.1.3"
             },
             "require-dev": {
                 "orchestra/testbench": "~3.6.0",
@@ -2966,36 +2965,37 @@
             "extra": {
                 "laravel": {
                     "providers": [
-                        "WM\\CRM\\CrmServiceProvider"
+                        "WM\\Common\\CommonServiceProvider"
                     ]
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "WM\\CRM\\": "src/"
+                    "WM\\Common\\": "src/"
                 }
             },
             "autoload-dev": {
                 "psr-4": {
-                    "WM\\CRM\\Tests\\": "tests/"
+                    "WM\\Common\\Tests\\": "tests/"
                 }
             },
             "license": [
                 "MIT"
             ],
-            "description": "client relationship management"
+            "description": "manage common information in willamall"
         },
         {
-            "name": "wm/task",
+            "name": "wm/crm",
             "version": "dev-master",
             "dist": {
                 "type": "path",
-                "url": "./modules/wm-task",
-                "reference": "1d75a3a4ac879e59e62b9f19fb6d32222e13d271"
+                "url": "./modules/wm-crm",
+                "reference": "2540e4bb60abb04d00ec73ffd6844be9fb6c6ccb"
             },
             "require": {
                 "illuminate/support": "5.8.*",
-                "php": "^7.1.3"
+                "php": "^7.1.3",
+                "wm/common": "dev-master"
             },
             "require-dev": {
                 "orchestra/testbench": "~3.6.0",
@@ -3005,24 +3005,24 @@
             "extra": {
                 "laravel": {
                     "providers": [
-                        "WM\\Task\\TaskServiceProvider"
+                        "WM\\CRM\\CrmServiceProvider"
                     ]
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "WM\\Task\\": "src/"
+                    "WM\\CRM\\": "src/"
                 }
             },
             "autoload-dev": {
                 "psr-4": {
-                    "WM\\Task\\Tests\\": "tests/"
+                    "WM\\CRM\\Tests\\": "tests/"
                 }
             },
             "license": [
                 "MIT"
             ],
-            "description": "task management"
+            "description": "client relationship management"
         }
     ],
     "packages-dev": [
@@ -3145,16 +3145,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33"
+                "reference": "6fb502c23885701a991b0bba974b1a8eb6673577"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
-                "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/6fb502c23885701a991b0bba974b1a8eb6673577",
+                "reference": "6fb502c23885701a991b0bba974b1a8eb6673577",
                 "shasum": ""
             },
             "require": {
@@ -3202,7 +3202,7 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2019-06-23T09:00:00+00:00"
+            "time": "2019-07-04T09:00:00+00:00"
         },
         {
             "name": "fzaninotto/faker",
@@ -4794,7 +4794,7 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "wm/crm": 20,
-        "wm/task": 20
+        "wm/common": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 2e71e34..a18d699 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e7004e4ba1268d86bc4e",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=4c16ec47fcd25fad855e",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=2f1fa2b483235f04d2be",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=9bb3fd0b0dfdc5f87218"
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=9012e4eb0262ef00b778",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=0dd686be7e23f26c017b",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=8ebffb510a9607df833a"
 }