diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index b306ee7f43d0..202a5073ca30 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -2,17 +2,37 @@
 
 namespace App\Console\Commands;
 
+use App\DataMapper\CompanySettings;
+use App\Events\Invoice\InvoiceWasCreated;
+use App\Factory\InvoiceFactory;
+use App\Factory\InvoiceItemFactory;
+use App\Helpers\Invoice\InvoiceSum;
+use App\Models\CompanyToken;
+use App\Models\Country;
+use App\Models\Product;
+use App\Models\User;
+use App\Repositories\InvoiceRepository;
+use App\Utils\Traits\GeneratesCounter;
+use App\Utils\Traits\MakesHash;
+use Carbon\Carbon;
 use Composer\Composer;
+use Composer\Console\Application;
 use Composer\Factory;
 use Composer\IO\NullIO;
 use Composer\Installer;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Input\ArrayInput;
-use Composer\Console\Application;
 
 class DemoMode extends Command
 {
+    use MakesHash, GeneratesCounter;
+
+    private $count;
 
     protected $name = 'ninja:demo-mode';
     /**
@@ -29,6 +49,15 @@ class DemoMode extends Command
      */
     protected $description = 'Setup demo mode';
 
+    protected $invoice_repo;
+    
+    public function __construct(InvoiceRepository $invoice_repo)
+    {
+        parent::__construct();
+
+        $this->invoice_repo = $invoice_repo;
+    }
+
     /**
      * Execute the console command.
      *
@@ -45,7 +74,439 @@ class DemoMode extends Command
         Artisan::call('db:seed --force');
 
         $this->info("Seeding Random Data");
-        Artisan::call('db:seed --class=RandomDataSeeder --force');
+        $this->createSmallAccount();
+    }
+
+
+
+
+    private function createSmallAccount()
+    {
+        $this->count = 10;
+
+        $this->info('Creating Small Account and Company');
+
+        $account = factory(\App\Models\Account::class)->create();
+        $company = factory(\App\Models\Company::class)->create([
+            'account_id' => $account->id,
+            'slack_webhook_url' => config('ninja.notification.slack'),
+        ]);
+
+
+        $account->default_company_id = $company->id;
+        $account->save();
+
+        $user = User::whereEmail('small@example.com')->first();
+
+        if (!$user) {
+            $user = factory(\App\Models\User::class)->create([
+                'account_id' => $account->id,
+                'email' => 'small@example.com',
+                'confirmation_code' => $this->createDbHash(config('database.default'))
+            ]);
+        }
+        
+        $company_token = new CompanyToken;
+        $company_token->user_id = $user->id;
+        $company_token->company_id = $company->id;
+        $company_token->account_id = $account->id;
+        $company_token->name = 'test token';
+        $company_token->token = Str::random(64);
+        $company_token->save();
+
+        $user->companies()->attach($company->id, [
+            'account_id' => $account->id,
+            'is_owner' => 1,
+            'is_admin' => 1,
+            'is_locked' => 0,
+            'notifications' => CompanySettings::notificationDefaults(),
+           // 'permissions' => '',
+            'settings' => null,
+        ]);
+
+        $u2 = User::where('email', 'demo@invoiceninja.com')->first();
+
+        if(!$u2){
+
+            $u2 = factory(\App\Models\User::class)->create([
+                'email'             => 'demo@invoiceninja.com',
+                'password'          => Hash::make('demo'),
+                'account_id' => $account->id,
+                'confirmation_code' => $this->createDbHash(config('database.default'))
+            ]);
+
+            $company_token = new CompanyToken;
+            $company_token->user_id = $u2->id;
+            $company_token->company_id = $company->id;
+            $company_token->account_id = $account->id;
+            $company_token->name = 'test token';
+            $company_token->token = 'TOKEN';
+            $company_token->save();
+
+            $u2->companies()->attach($company->id, [
+                'account_id' => $account->id,
+                'is_owner' => 1,
+                'is_admin' => 1,
+                'is_locked' => 0,
+                'notifications' => CompanySettings::notificationDefaults(),
+                'permissions' => '',
+                'settings' => null,
+            ]);
+        }
+
+
+        factory(\App\Models\Product::class, 50)->create([
+                'user_id' => $user->id,
+                'company_id' => $company->id,
+            ]);
+
+        $this->info('Creating '.$this->count. ' clients');
+
+        for ($x=0; $x<$this->count; $x++) {
+            $z = $x+1;
+            $this->info("Creating client # ".$z);
+
+            $this->createClient($company, $user);
+        }
+
+        for($x=0; $x<$this->count; $x++)
+        {
+            $client = $company->clients->random();
+
+            $this->info('creating invoice for client #'.$client->id);
+            $this->createInvoice($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating credit for client #'.$client->id);
+            $this->createCredit($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating quote for client #'.$client->id);
+            $this->createQuote($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating expense for client #'.$client->id);
+            $this->createExpense($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating vendor for client #'.$client->id);
+            $this->createVendor($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating task for client #'.$client->id);
+            $this->createTask($client);
+
+            $client = $company->clients->random();
+
+            $this->info('creating project for client #'.$client->id);
+            $this->createProject($client);
+        }
 
     }
+
+    private function createClient($company, $user)
+    {
+
+        // dispatch(function () use ($company, $user) {
+   
+        // });
+        $client = factory(\App\Models\Client::class)->create([
+                'user_id' => $user->id,
+                'company_id' => $company->id
+            ]);
+
+        factory(\App\Models\ClientContact::class, 1)->create([
+                    'user_id' => $user->id,
+                    'client_id' => $client->id,
+                    'company_id' => $company->id,
+                    'is_primary' => 1
+                ]);
+
+        factory(\App\Models\ClientContact::class, rand(1, 5))->create([
+                    'user_id' => $user->id,
+                    'client_id' => $client->id,
+                    'company_id' => $company->id
+                ]);
+
+        $client->id_number = $this->getNextClientNumber($client);
+
+        $settings = $client->settings;
+        $settings->currency_id = (string)rand(1,79);
+        $client->settings = $settings;
+
+        $country = Country::all()->random();
+
+        $client->country_id = $country->id;
+        $client->save();
+
+    }
+
+    private function createExpense($client)
+    {
+        factory(\App\Models\Expense::class, rand(1, 5))->create([
+                'user_id' => $client->user->id,
+                'client_id' => $client->id,
+                'company_id' => $client->company->id
+            ]);
+    }
+
+    private function createVendor($client)
+    {
+        $vendor = factory(\App\Models\Vendor::class)->create([
+                'user_id' => $client->user->id,
+                'company_id' => $client->company->id
+            ]);
+
+
+        factory(\App\Models\VendorContact::class, 1)->create([
+                'user_id' => $client->user->id,
+                'vendor_id' => $vendor->id,
+                'company_id' => $client->company->id,
+                'is_primary' => 1
+            ]);
+
+        factory(\App\Models\VendorContact::class, rand(1, 5))->create([
+                'user_id' => $client->user->id,
+                'vendor_id' => $vendor->id,
+                'company_id' => $client->company->id,
+                'is_primary' => 0
+            ]);
+    }
+
+    private function createTask($client)
+    {
+        $vendor = factory(\App\Models\Task::class)->create([
+                'user_id' => $client->user->id,
+                'company_id' => $client->company->id
+            ]);
+    }
+
+    private function createProject($client)
+    {
+        $vendor = factory(\App\Models\Project::class)->create([
+                'user_id' => $client->user->id,
+                'company_id' => $client->company->id
+            ]);
+    }
+
+    private function createInvoice($client)
+    {
+        // for($x=0; $x<$this->count; $x++){
+        //     dispatch(new CreateTestInvoiceJob($client));
+        // }
+
+        $faker = \Faker\Factory::create();
+
+        $invoice = InvoiceFactory::create($client->company->id, $client->user->id);//stub the company and user_id
+        $invoice->client_id = $client->id;
+//        $invoice->date = $faker->date();
+        $dateable = Carbon::now()->subDays(rand(0, 90));
+        $invoice->date = $dateable;
+
+        $invoice->line_items = $this->buildLineItems(rand(1, 10));
+        $invoice->uses_inclusive_taxes = false;
+
+        if (rand(0, 1)) {
+            $invoice->tax_name1 = 'GST';
+            $invoice->tax_rate1 = 10.00;
+        }
+
+        if (rand(0, 1)) {
+            $invoice->tax_name2 = 'VAT';
+            $invoice->tax_rate2 = 17.50;
+        }
+
+        if (rand(0, 1)) {
+            $invoice->tax_name3 = 'CA Sales Tax';
+            $invoice->tax_rate3 = 5;
+        }
+
+        $invoice->custom_value1 = $faker->date;
+        $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
+
+        $invoice->save();
+
+        $invoice_calc = new InvoiceSum($invoice);
+        $invoice_calc->build();
+
+        $invoice = $invoice_calc->getInvoice();
+
+        $invoice->save();
+        $invoice->service()->createInvitations()->markSent();
+
+        $this->invoice_repo->markSent($invoice);
+
+        if (rand(0, 1)) {
+
+            $invoice = $invoice->service()->markPaid()->save();
+
+        }
+        //@todo this slow things down, but gives us PDFs of the invoices for inspection whilst debugging.
+        event(new InvoiceWasCreated($invoice, $invoice->company));
+    }
+
+    private function createCredit($client)
+    {
+        // for($x=0; $x<$this->count; $x++){
+
+        //     dispatch(new CreateTestCreditJob($client));
+
+        // }
+        $faker = \Faker\Factory::create();
+
+        $credit = factory(\App\Models\Credit::class)->create(['user_id' => $client->user->id, 'company_id' => $client->company->id, 'client_id' => $client->id]);
+
+        $dateable = Carbon::now()->subDays(rand(0, 90));
+        $credit->date = $dateable;
+
+        $credit->line_items = $this->buildLineItems(rand(1, 10));
+        $credit->uses_inclusive_taxes = false;
+
+        if (rand(0, 1)) {
+            $credit->tax_name1 = 'GST';
+            $credit->tax_rate1 = 10.00;
+        }
+
+        if (rand(0, 1)) {
+            $credit->tax_name2 = 'VAT';
+            $credit->tax_rate2 = 17.50;
+        }
+
+        if (rand(0, 1)) {
+            $credit->tax_name3 = 'CA Sales Tax';
+            $credit->tax_rate3 = 5;
+        }
+
+        $credit->save();
+
+        $invoice_calc = new InvoiceSum($credit);
+        $invoice_calc->build();
+
+        $credit = $invoice_calc->getCredit();
+
+        $credit->save();
+        $credit->service()->markSent()->save();
+        $credit->service()->createInvitations();
+    }
+
+    private function createQuote($client)
+    {
+        // for($x=0; $x<$this->count; $x++){
+
+        //     dispatch(new CreateTestQuoteJob($client));
+        // }
+        $faker = \Faker\Factory::create();
+
+        //$quote = QuoteFactory::create($client->company->id, $client->user->id);//stub the company and user_id
+        $quote =factory(\App\Models\Quote::class)->create(['user_id' => $client->user->id, 'company_id' => $client->company->id, 'client_id' => $client->id]);
+        $quote->date = $faker->date();
+        $quote->client_id = $client->id;
+        
+        $quote->setRelation('client', $client);
+
+        $quote->line_items = $this->buildLineItems(rand(1, 10));
+        $quote->uses_inclusive_taxes = false;
+
+        if (rand(0, 1)) {
+            $quote->tax_name1 = 'GST';
+            $quote->tax_rate1 = 10.00;
+        }
+
+        if (rand(0, 1)) {
+            $quote->tax_name2 = 'VAT';
+            $quote->tax_rate2 = 17.50;
+        }
+
+        if (rand(0, 1)) {
+            $quote->tax_name3 = 'CA Sales Tax';
+            $quote->tax_rate3 = 5;
+        }
+
+        $quote->save();
+
+        $quote_calc = new InvoiceSum($quote);
+        $quote_calc->build();
+
+        $quote = $quote_calc->getQuote();
+
+        $quote->save();
+
+        $quote->service()->markSent()->save();
+        $quote->service()->createInvitations();
+    }
+
+    private function buildLineItems($count = 1)
+    {
+        $line_items = [];
+
+        for ($x=0; $x<$count; $x++) {
+            $item = InvoiceItemFactory::create();
+            $item->quantity = 1;
+            //$item->cost = 10;
+
+            if (rand(0, 1)) {
+                $item->tax_name1 = 'GST';
+                $item->tax_rate1 = 10.00;
+            }
+
+            if (rand(0, 1)) {
+                $item->tax_name1 = 'VAT';
+                $item->tax_rate1 = 17.50;
+            }
+
+            if (rand(0, 1)) {
+                $item->tax_name1 = 'Sales Tax';
+                $item->tax_rate1 = 5;
+            }
+
+            $product = Product::all()->random();
+
+            $item->cost = (float)$product->cost;
+            $item->product_key = $product->product_key;
+            $item->notes = $product->notes;
+            $item->custom_value1 = $product->custom_value1;
+            $item->custom_value2 = $product->custom_value2;
+            $item->custom_value3 = $product->custom_value3;
+            $item->custom_value4 = $product->custom_value4;
+
+
+
+            $line_items[] = $item;
+        }
+
+        return $line_items;
+    }
+
+    private function warmCache()
+    {
+        /* Warm up the cache !*/
+        $cached_tables = config('ninja.cached_tables');
+
+        foreach ($cached_tables as $name => $class) {
+            if (! Cache::has($name)) {
+                // check that the table exists in case the migration is pending
+                if (! Schema::hasTable((new $class())->getTable())) {
+                    continue;
+                }
+                if ($name == 'payment_terms') {
+                    $orderBy = 'num_days';
+                } elseif ($name == 'fonts') {
+                    $orderBy = 'sort_order';
+                } elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) {
+                    $orderBy = 'name';
+                } else {
+                    $orderBy = 'id';
+                }
+                $tableData = $class::orderBy($orderBy)->get();
+                if ($tableData->count()) {
+                    Cache::forever($name, $tableData);
+                }
+            }
+        }
+    }
 }