diff --git a/app/Console/Commands/corpJournal.php b/app/Console/Commands/corpJournal.php
index f3e3e6f31..196903ced 100644
--- a/app/Console/Commands/corpJournal.php
+++ b/app/Console/Commands/corpJournal.php
@@ -63,22 +63,11 @@ class CorpJournal extends Command
         //Get the corps with structures logged in the database
         $corps = DB::table('CorpStructures')->select('corporation_id')->groupBy('corporation_id')->get();
         foreach($corps as $corp) {
-            $this->line('Retrieving Corporation Journals for ' . $corp->corporation_id);
             $charId = DB::table('CorpStructures')->select('character_id')->where(['corporation_id' => $corp->corporation_id])->first();
-            $lastPage = $this->GetJournal($charId->character_id);
-            $this->line('Last Page recorded was ' . $lastPage);
-            $this->line('Received Corporation Journals for ' . $corp->corporation_id);
+            $finance->GetWalletJournal(1, $charId);
         }
 
         //Mark the job as finished
         $task->SetStopStatus();
     }
-
-    private function GetJournal($charId) {
-        $finances = new FinanceHelper();
-        //Get the master wallet journal for the corporation for the character
-        $lastPage = $finances->GetWalletJournal(1, $charId);
-
-        return $lastPage;
-    }
 }
diff --git a/app/Library/Finances/FinanceHelper.php b/app/Library/Finances/Helper/FinanceHelper.php
similarity index 52%
rename from app/Library/Finances/FinanceHelper.php
rename to app/Library/Finances/Helper/FinanceHelper.php
index 4146d2d8f..234bed6e7 100644
--- a/app/Library/Finances/FinanceHelper.php
+++ b/app/Library/Finances/Helper/FinanceHelper.php
@@ -5,17 +5,16 @@
  * GNU Public License
  */
 
-namespace App\Library\Finances;
+namespace App\Library\Finances\Helper;
 
 use DB;
 
-use App\Models\Esi\EsiScope;
-use App\Models\Esi\EsiToken;
-use App\Models\Corporation\CorpJournal;
 use App\Models\User\UserToCorporation;
-use App\Models\Finances\PlayerDonationJournal;
 
 use App\Library\Esi;
+use App\Library\Finances\MarketTax;
+use App\Library\Finances\PlayerDonation;
+use App\Library\Finances\ReprocessingTax;
 
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;
@@ -73,12 +72,19 @@ class FinanceHelper {
             //The PutWalletJournal function checks to see if it's already in the database.
             foreach($wallet as $entry) {
                 if($entry['amount'] > 0) {
-                    if($entry['ref_type'] == 'brokers_fee' || 
-                       $entry['ref_type'] == 'reprocessing_tax' || 
-                       $entry['ref_type'] == 'jumpgate_fee' || 
-                       $entry['ref_type'] == 'player_donation' ||
-                       ($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
-                        $this->PutWalletJournal($entry, $corpId, $division);
+                    if($entry['ref_type'] == 'brokers_fee') {
+                        $market = new MarketTax();
+                        $market->InsertMarketTax($entry, $corpId, $division);
+                    } else if($entry['ref_type'] == 'reprocessing_tax') {
+                        $reprocessing = new ReprocessingTax();
+                        $reprocessing->InsertReprocessingTax($entry, $corpId, $division);
+                    } else if($entry['ref_type'] == 'jumpgate_fee') {
+                        $jb = new JumpBridgeTax();
+                        $jb->InsertJumpBridgeTax($entry, $corpId, $division);
+                    } else if($entry['ref_type'] == 'player_donation' ||
+                             ($entry['ref_type'] == 'corporation_account_withdrawal' && $entry['second_party_id'] == 98287666)) {
+                        $other = new PlayerDonation();
+                        $other->InsertPlayerDonation($entry, $corpId, $division);
                     }
                 }
                 
@@ -88,8 +94,6 @@ class FinanceHelper {
             $currentPage++;
         //Continue looping through the do while loop until the current page is greater than or equal to the total pages.
         } while ($currentPage < $totalPages);
-
-        return $currentPage;
     }
 
     /**
@@ -136,92 +140,6 @@ class FinanceHelper {
         }
     }
 
-    private function PutWalletJournal($journal, $corpId, $division) {
-        //Create ESI Helper class
-        $esiHelper = new Esi;
-        $date = $esiHelper->DecodeDate($journal['date']);
-
-        if($journal['ref_type'] == 'player_donation' || ($journal['ref_type'] == 'corporation_account_withdrawal' && $journal['second_party_id'] == 98287666)) {
-            //if we don't find the journal entry, add the journal entry to the database
-            if(!PlayerDonationJournal::where(['id' => $journal['id']])->exists()) {
-                $entry = new PlayerDonationJournal;
-                $entry->id = $journal['id'];
-                $entry->corporation_id = $corpId;
-                $entry->division = $division;
-                if(isset($journal['amount'])) {
-                    $entry->amount = $journal['amount'];
-                }
-                if(isset($journal['balance'])) {
-                    $entry->balance = $journal['balance'];
-                }
-                if(isset($journal['context_id'])) {
-                    $entry->context_id = $journal['context_id'];
-                }
-                if(isset($journal['context_id_type'])) {
-                    $entry->context_id_type = $journal['context_id_type'];
-                }
-                $entry->date = $date;
-                $entry->description = $journal['description'];
-                if(isset($journal['first_party_id'])) {
-                    $entry->first_party_id = $journal['first_party_id'];
-                }
-                if(isset($journal['reason'])) {
-                    $entry->reason = $journal['reason'];
-                }
-                $entry->ref_type = $journal['ref_type'];
-                if(isset($journal['second_party_id'])) {
-                    $entry->second_party_id = $journal['second_party_id'];
-                }
-                if(isset($journal['tax'])) {
-                    $entry->tax = $journal['tax'];
-                }
-                if(isset($journal['tax_receiver_id'])) {
-                    $entry->tax_receiver_id = $journal['tax_receiver_id'];
-                }
-                $entry->save();
-            }   
-        } else {
-            //if we don't find the journal entry, add the journal entry to the database
-            if(!CorpJournal::where(['id' => $journal['id']])->exists()) {
-                $entry = new CorpJournal;
-                $entry->id = $journal['id'];
-                $entry->corporation_id = $corpId;
-                $entry->division = $division;
-                if(isset($journal['amount'])) {
-                    $entry->amount = $journal['amount'];
-                }
-                if(isset($journal['balance'])) {
-                    $entry->balance = $journal['balance'];
-                }
-                if(isset($journal['context_id'])) {
-                    $entry->context_id = $journal['context_id'];
-                }
-                if(isset($journal['context_id_type'])) {
-                    $entry->context_id_type = $journal['context_id_type'];
-                }
-                $entry->date = $date;
-                $entry->description = $journal['description'];
-                if(isset($journal['first_party_id'])) {
-                    $entry->first_party_id = $journal['first_party_id'];
-                }
-                if(isset($journal['reason'])) {
-                    $entry->reason = $journal['reason'];
-                }
-                $entry->ref_type = $journal['ref_type'];
-                if(isset($journal['second_party_id'])) {
-                    $entry->second_party_id = $journal['second_party_id'];
-                }
-                if(isset($journal['tax'])) {
-                    $entry->tax = $journal['tax'];
-                }
-                if(isset($journal['tax_receiver_id'])) {
-                    $entry->tax_receiver_id = $journal['tax_receiver_id'];
-                }
-                $entry->save();
-            }    
-        }
-    }
-
 }
 
 ?>
\ No newline at end of file
diff --git a/app/Library/Finances/JumpBridgeTax.php b/app/Library/Finances/JumpBridgeTax.php
new file mode 100644
index 000000000..d6ce4bceb
--- /dev/null
+++ b/app/Library/Finances/JumpBridgeTax.php
@@ -0,0 +1,60 @@
+<?php
+
+/** W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+use DB;
+
+use App\Library\Esi;
+
+use App\Models\Finances\JumpBridgeJournal;
+
+class JumpBridgeTax {
+    public function InsertJumpBridgeTax($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!JumpBridgeJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new JumpBridgeJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Library/Finances/MarketTax.php b/app/Library/Finances/MarketTax.php
new file mode 100644
index 000000000..71494d179
--- /dev/null
+++ b/app/Library/Finances/MarketTax.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+use DB;
+
+use App\Library\Esi;
+
+use App\Models\Finances\CorpMarketJournal;
+
+class MarketTax {
+    public function InsertMarketTax($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!CorpMarketJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new CorpMarketJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/app/Library/Finances/PlayerDonation.php b/app/Library/Finances/PlayerDonation.php
new file mode 100644
index 000000000..2ebf895b5
--- /dev/null
+++ b/app/Library/Finances/PlayerDonation.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+use DB;
+
+use App\Library\Esi;
+
+use App\Library\Models\PlayerDonationJournal;
+
+class PlayerDonation {
+    public function InsertPlayerDonation($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!PlayerDonationJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new PlayerDonationJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/app/Library/Finances/ReprocessingTax.php b/app/Library/Finances/ReprocessingTax.php
new file mode 100644
index 000000000..0508330e9
--- /dev/null
+++ b/app/Library/Finances/ReprocessingTax.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * W4RP Services
+ * GNU Public License
+ */
+
+namespace App\Library\Finances;
+
+use DB;
+use App\Library\Esi;
+
+use App\Models\Finances\ReprocessingTaxJournal;
+
+class ReprocessingTax {
+    public function InsertReprocessingTax($journal, $corpId, $division) {
+        //Create the ESI Helper class
+        $esiHelper = new Esi;
+
+        //Check to see if we can find the entry in the database already.
+        //If we don't then add it to the database
+        if(!ReprocessingTaxJournal::where(['id' => $journal['id']])->exists()) {
+            $entry = new ReprocessingTaxJournal;
+            $entry->id = $journal['id'];
+            $entry->corporation_id = $corpId;
+            $entry->division = $division;
+            if(isset($journal['amount'])) {
+                $entry->amount = $journal['amount'];
+            }
+            if(isset($journal['balance'])) {
+                $entry->balance = $journal['balance'];
+            }
+            if(isset($journal['context_id'])) {
+                $entry->context_id = $journal['context_id'];
+            }
+            if(isset($journal['context_id_type'])) {
+                $entry->context_id_type = $journal['context_id_type'];
+            }
+            $entry->date = $esiHelper->DecodeDate($journal['date']);
+            $entry->description = $journal['description'];
+            if(isset($journal['first_party_id'])) {
+                $entry->first_party_id = $journal['first_party_id'];
+            }
+            if(isset($journal['reason'])) {
+                $entry->reason = $journal['reason'];
+            }
+            $entry->ref_type = $journal['ref_type'];
+            if(isset($journal['second_party_id'])) {
+                $entry->second_party_id = $journal['second_party_id'];
+            }
+            if(isset($journal['tax'])) {
+                $entry->tax = $journal['tax'];
+            }
+            if(isset($journal['tax_receiver_id'])) {
+                $entry->tax_receiver_id = $journal['tax_receiver_id'];
+            }
+            $entry->save();
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/app/Models/Finances/CorpMarketJournal.php b/app/Models/Finances/CorpMarketJournal.php
new file mode 100644
index 000000000..d718ae3a6
--- /dev/null
+++ b/app/Models/Finances/CorpMarketJournal.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models\Finances;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CorpMarketJournal extends Model
+{
+    /**
+     * Table Name
+     */
+    protected $table = 'corp_market_journal';
+
+    /**
+     * Timestamps
+     */
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'corporation_id',
+        'division',
+        'amount',
+        'balance',
+        'context_id',
+        'context_id_type',
+        'date',
+        'description',
+        'first_party_id',
+        'reason',
+        'ref_type',
+        'second_party_id',
+        'tax',
+        'tax_receiver_id',
+    ];
+}
diff --git a/app/Models/Finances/JumpBridgeJournal.php b/app/Models/Finances/JumpBridgeJournal.php
new file mode 100644
index 000000000..85d568ca4
--- /dev/null
+++ b/app/Models/Finances/JumpBridgeJournal.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models\Finances;
+
+use Illuminate\Database\Eloquent\Model;
+
+class JumpBridgeJournal extends Model
+{
+    /**
+     * Table Name
+     */
+    protected $table = 'jump_bridge_journal';
+
+    /**
+     * Timestamps
+     */
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'corporation_id',
+        'division',
+        'amount',
+        'balance',
+        'context_id',
+        'context_id_type',
+        'date',
+        'description',
+        'first_party_id',
+        'reason',
+        'ref_type',
+        'second_party_id',
+        'tax',
+        'tax_receiver_id',
+    ];
+}
diff --git a/app/Models/Finances/PlayerDonationJournal.php b/app/Models/Finances/PlayerDonationJournal.php
index 3260868d1..d9fae55fe 100644
--- a/app/Models/Finances/PlayerDonationJournal.php
+++ b/app/Models/Finances/PlayerDonationJournal.php
@@ -9,7 +9,7 @@ class PlayerDonationJournal extends Model
     /**
      * Table Name
      */
-    protected $table = 'PlayerDonationJournals';
+    protected $table = 'player_donation_journal';
 
     /**
      * Timestamps
diff --git a/app/Models/Finances/ReprocessingTaxJournal.php b/app/Models/Finances/ReprocessingTaxJournal.php
new file mode 100644
index 000000000..9732c76e6
--- /dev/null
+++ b/app/Models/Finances/ReprocessingTaxJournal.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Models\Finances;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ReprocessingTaxJournal extends Model
+{
+    /**
+     * Table Name
+     */
+    protected $table = 'reprocessing_tax_journal';
+
+    /**
+     * Timestamps
+     */
+    public $timestamps = true;
+
+    /**
+     * The attributes that are mass assignable
+     * 
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'corporation_id',
+        'division',
+        'amount',
+        'balance',
+        'context_id',
+        'context_id_type',
+        'date',
+        'description',
+        'first_party_id',
+        'reason',
+        'ref_type',
+        'second_party_id',
+        'tax',
+        'tax_receiver_id',
+    ];
+}
diff --git a/database/migrations/2018_12_21_220501_create_jump_bridge_journal.php b/database/migrations/2018_12_21_220501_create_jump_bridge_journal.php
new file mode 100644
index 000000000..4c6ebebea
--- /dev/null
+++ b/database/migrations/2018_12_21_220501_create_jump_bridge_journal.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateJumpBridgeJournal extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if(!Schema::hasTable('jump_bridge_journal')) {
+            Schema::create('jump_bridge_journal', function(Blueprint $table) {
+                $table->string('id')->unique();
+                $table->integer('corporation_id')->nullabe();
+                $table->integer('division')->default(0);
+                $table->decimal('amount', 20, 2)->nullable();
+                $table->decimal('balance', 20, 2)->nullable();
+                $table->integer('context_id')->nullable();
+                $table->string('context_id_type')->nullable();
+                $table->dateTime('date')->nullabe();
+                $table->string('description')->nullabe();
+                $table->integer('first_party_id')->nullable();
+                $table->string('reason')->default(' ');
+                $table->string('ref_type')->nullabe();
+                $table->integer('second_party_id')->nullable();
+                $table->decimal('tax', 20, 2)->default(0.00);
+                $table->integer('tax_receiver_id')->nullable();
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('jump_bridge_journal');
+    }
+}
diff --git a/database/migrations/2018_12_21_222925_create_corp_market_journal.php b/database/migrations/2018_12_21_222925_create_corp_market_journal.php
new file mode 100644
index 000000000..6079e79fa
--- /dev/null
+++ b/database/migrations/2018_12_21_222925_create_corp_market_journal.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCorpMarketJournal extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if(!Schema::hasTable('corp_market_journal')) {
+            Schema::create('corp_market_journal', function(Blueprint $table) {
+                $table->string('id')->unique();
+                $table->integer('corporation_id')->nullabe();
+                $table->integer('division')->default(0);
+                $table->decimal('amount', 20, 2)->nullable();
+                $table->decimal('balance', 20, 2)->nullable();
+                $table->integer('context_id')->nullable();
+                $table->string('context_id_type')->nullable();
+                $table->dateTime('date')->nullabe();
+                $table->string('description')->nullabe();
+                $table->integer('first_party_id')->nullable();
+                $table->string('reason')->default(' ');
+                $table->string('ref_type')->nullabe();
+                $table->integer('second_party_id')->nullable();
+                $table->decimal('tax', 20, 2)->default(0.00);
+                $table->integer('tax_receiver_id')->nullable();
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('corp_market_journal');
+    }
+}
diff --git a/database/migrations/2018_12_21_223043_create_player_donation_journal.php b/database/migrations/2018_12_21_223043_create_player_donation_journal.php
new file mode 100644
index 000000000..57a367337
--- /dev/null
+++ b/database/migrations/2018_12_21_223043_create_player_donation_journal.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePlayerDonationJournal extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if(!Schema::hasTable('player_donation_journal')) {
+            Schema::create('player_donation_journal', function(Blueprint $table) {
+                $table->string('id')->unique();
+                $table->integer('corporation_id')->nullabe();
+                $table->integer('division')->default(0);
+                $table->decimal('amount', 20, 2)->nullable();
+                $table->decimal('balance', 20, 2)->nullable();
+                $table->integer('context_id')->nullable();
+                $table->string('context_id_type')->nullable();
+                $table->dateTime('date')->nullabe();
+                $table->string('description')->nullabe();
+                $table->integer('first_party_id')->nullable();
+                $table->string('reason')->default(' ');
+                $table->string('ref_type')->nullabe();
+                $table->integer('second_party_id')->nullable();
+                $table->decimal('tax', 20, 2)->default(0.00);
+                $table->integer('tax_receiver_id')->nullable();
+                $table->timestamps();
+            });
+        }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('player_donation_journal');
+    }
+}
diff --git a/database/migrations/2018_12_21_223222_create_reprocessing_tax_journal.php b/database/migrations/2018_12_21_223222_create_reprocessing_tax_journal.php
new file mode 100644
index 000000000..dbda048ce
--- /dev/null
+++ b/database/migrations/2018_12_21_223222_create_reprocessing_tax_journal.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateReprocessingTaxJournal extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if(!Schema::hasTable('reprocessing_tax_journal')) {
+            Schema::create('reprocessing_tax_journal', function(Blueprint $table) {
+                $table->string('id')->unique();
+                $table->integer('corporation_id')->nullabe();
+                $table->integer('division')->default(0);
+                $table->decimal('amount', 20, 2)->nullable();
+                $table->decimal('balance', 20, 2)->nullable();
+                $table->integer('context_id')->nullable();
+                $table->string('context_id_type')->nullable();
+                $table->dateTime('date')->nullabe();
+                $table->string('description')->nullabe();
+                $table->integer('first_party_id')->nullable();
+                $table->string('reason')->default(' ');
+                $table->string('ref_type')->nullabe();
+                $table->integer('second_party_id')->nullable();
+                $table->decimal('tax', 20, 2)->default(0.00);
+                $table->integer('tax_receiver_id')->nullable();
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('reprocessing_tax_journal');
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 6b8a4d0ea..79f78f31f 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,12 +6,12 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'App\\Console\\Commands\\CalculateMarketTax' => $baseDir . '/app/Console/Commands/CalculateMarketTax.php',
-    'App\\Console\\Commands\\CorpJournal' => $baseDir . '/app/Console/Commands/CorpJournal.php',
-    'App\\Console\\Commands\\DumpFleets' => $baseDir . '/app/Console/Commands/DumpFleets.php',
-    'App\\Console\\Commands\\GetCorps' => $baseDir . '/app/Console/Commands/GetCorps.php',
-    'App\\Console\\Commands\\GetLogisticsContracts' => $baseDir . '/app/Console/Commands/GetLogisticContracts.php',
-    'App\\Console\\Commands\\SendMail' => $baseDir . '/app/Console/Commands/SendMail.php',
+    'App\\Console\\Commands\\CalculateMarketTax' => $baseDir . '/app/Console/Commands/calculatemarkettax.php',
+    'App\\Console\\Commands\\CorpJournal' => $baseDir . '/app/Console/Commands/corpJournal.php',
+    'App\\Console\\Commands\\DumpFleets' => $baseDir . '/app/Console/Commands/dumpFleets.php',
+    'App\\Console\\Commands\\GetCorps' => $baseDir . '/app/Console/Commands/getCorps.php',
+    'App\\Console\\Commands\\GetLogisticsContracts' => $baseDir . '/app/Console/Commands/getLogisticContracts.php',
+    'App\\Console\\Commands\\SendMail' => $baseDir . '/app/Console/Commands/sendmail.php',
     'App\\Console\\Commands\\UpdateMoonPricing' => $baseDir . '/app/Console/Commands/UpdateMoonPricing.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
@@ -46,11 +46,17 @@ return array(
     'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php',
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
     'App\\Library\\Esi' => $baseDir . '/app/Library/Esi.php',
+    'App\\Library\\Esi\\Esi' => $baseDir . '/app/Library/Esi/Esi.php',
+    'App\\Library\\Esi\\Mail' => $baseDir . '/app/Library/Esi/Mail.php',
     'App\\Library\\FinanceHelper' => $baseDir . '/app/Library/FinanceHelper.php',
+    'App\\Library\\Finances\\FinanceHelper' => $baseDir . '/app/Library/Finances/FinanceHelper.php',
     'App\\Library\\FleetHelper' => $baseDir . '/app/Library/FleetHelper.php',
+    'App\\Library\\Fleets\\FleetHelper' => $baseDir . '/app/Library/Fleets/FleetHelper.php',
     'App\\Library\\Mail' => $baseDir . '/app/Library/Mail.php',
     'App\\Library\\MoonCalc' => $baseDir . '/app/Library/MoonCalc.php',
     'App\\Library\\MoonMine' => $baseDir . '/app/Library/MoonMine.php',
+    'App\\Library\\Moons\\MoonCalc' => $baseDir . '/app/Library/Moons/MoonCalc.php',
+    'App\\Library\\Moons\\MoonMine' => $baseDir . '/app/Library/Moons/MoonMine.php',
     'App\\Library\\SeatHelper' => $baseDir . '/app/Library/SeatHelper.php',
     'App\\Library\\Structures\\StructureTaxHelper' => $baseDir . '/app/Library/Structures/StructureTaxHelper.php',
     'App\\Models\\Config' => $baseDir . '/app/Models/Config.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 5ac01f4b1..f5fa49d28 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -455,12 +455,12 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
     );
 
     public static $classMap = array (
-        'App\\Console\\Commands\\CalculateMarketTax' => __DIR__ . '/../..' . '/app/Console/Commands/CalculateMarketTax.php',
-        'App\\Console\\Commands\\CorpJournal' => __DIR__ . '/../..' . '/app/Console/Commands/CorpJournal.php',
-        'App\\Console\\Commands\\DumpFleets' => __DIR__ . '/../..' . '/app/Console/Commands/DumpFleets.php',
-        'App\\Console\\Commands\\GetCorps' => __DIR__ . '/../..' . '/app/Console/Commands/GetCorps.php',
-        'App\\Console\\Commands\\GetLogisticsContracts' => __DIR__ . '/../..' . '/app/Console/Commands/GetLogisticContracts.php',
-        'App\\Console\\Commands\\SendMail' => __DIR__ . '/../..' . '/app/Console/Commands/SendMail.php',
+        'App\\Console\\Commands\\CalculateMarketTax' => __DIR__ . '/../..' . '/app/Console/Commands/calculatemarkettax.php',
+        'App\\Console\\Commands\\CorpJournal' => __DIR__ . '/../..' . '/app/Console/Commands/corpJournal.php',
+        'App\\Console\\Commands\\DumpFleets' => __DIR__ . '/../..' . '/app/Console/Commands/dumpFleets.php',
+        'App\\Console\\Commands\\GetCorps' => __DIR__ . '/../..' . '/app/Console/Commands/getCorps.php',
+        'App\\Console\\Commands\\GetLogisticsContracts' => __DIR__ . '/../..' . '/app/Console/Commands/getLogisticContracts.php',
+        'App\\Console\\Commands\\SendMail' => __DIR__ . '/../..' . '/app/Console/Commands/sendmail.php',
         'App\\Console\\Commands\\UpdateMoonPricing' => __DIR__ . '/../..' . '/app/Console/Commands/UpdateMoonPricing.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
@@ -495,11 +495,17 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php',
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
         'App\\Library\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi.php',
+        'App\\Library\\Esi\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi/Esi.php',
+        'App\\Library\\Esi\\Mail' => __DIR__ . '/../..' . '/app/Library/Esi/Mail.php',
         'App\\Library\\FinanceHelper' => __DIR__ . '/../..' . '/app/Library/FinanceHelper.php',
+        'App\\Library\\Finances\\FinanceHelper' => __DIR__ . '/../..' . '/app/Library/Finances/FinanceHelper.php',
         'App\\Library\\FleetHelper' => __DIR__ . '/../..' . '/app/Library/FleetHelper.php',
+        'App\\Library\\Fleets\\FleetHelper' => __DIR__ . '/../..' . '/app/Library/Fleets/FleetHelper.php',
         'App\\Library\\Mail' => __DIR__ . '/../..' . '/app/Library/Mail.php',
         'App\\Library\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/MoonCalc.php',
         'App\\Library\\MoonMine' => __DIR__ . '/../..' . '/app/Library/MoonMine.php',
+        'App\\Library\\Moons\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalc.php',
+        'App\\Library\\Moons\\MoonMine' => __DIR__ . '/../..' . '/app/Library/Moons/MoonMine.php',
         'App\\Library\\SeatHelper' => __DIR__ . '/../..' . '/app/Library/SeatHelper.php',
         'App\\Library\\Structures\\StructureTaxHelper' => __DIR__ . '/../..' . '/app/Library/Structures/StructureTaxHelper.php',
         'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Config.php',