diff --git a/app/Console/Commands/moonmailer.php b/app/Console/Commands/moonmailer.php
index 9643bf303..81e2573f9 100644
--- a/app/Console/Commands/moonmailer.php
+++ b/app/Console/Commands/moonmailer.php
@@ -63,31 +63,7 @@ class MoonMailerCommand extends Command
         $total = 0.00;
         $entityType = '';
         foreach($contacts as $contact) {
-            if($contact != 0) {
-                //Get whether the contact is part of the alliance or an ally.
-                $corpId = $lookup->LookupCharacter($contact);
-                $allianceId = $lookup->LookupCorporation($corpId);
-                if($allianceId == 99004116) {
-                    $entityType = 'W4RP';
-                } else {
-                    $entityType = 'Other';
-                }
-                
-                //Get all of the moons a particular contact is renting.
-                $moons = Moon::where(['Contact' => $contact])->get();
-
-                //Price the moons based on whether the contact is of the alliance or an ally
-                foreach($moons as $moon) {
-                    $moon = $moontTotal->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
-                                                             $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
-
-                    if($entityType = 'W4RP') {
-                        $total += $moon['alliance'];
-                    } else {
-                        $total += $moon['outofalliance'];
-                    }
-                }
-            }
+            
         }
 
         //Send a mail to the contact listing the moons, and how much is owed
diff --git a/app/Http/Controllers/MoonsAdminController.php b/app/Http/Controllers/MoonsAdminController.php
index 2117afdcd..215c51484 100644
--- a/app/Http/Controllers/MoonsAdminController.php
+++ b/app/Http/Controllers/MoonsAdminController.php
@@ -13,10 +13,12 @@ use App\Models\Moon\ItemComposition;
 use App\Models\Moon\Moon;
 use App\Models\Moon\OrePrice;
 use App\Models\Moon\Price;
+use App\Models\Moon\MoonRent;
 
 use App\Models\Finances\PlayerDonationJournal;
 use App\Library\Moons\MoonCalc;
 use App\Library\Esi\Esi;
+use App\Library\Lookups\LookupHelper;
 
 class MoonsAdminController extends Controller
 {
@@ -38,6 +40,59 @@ class MoonsAdminController extends Controller
         return view('moons.updatemoon');
     }
 
+    public function storeUpdateMoon2(Request $request) {
+        $moonCalc = MoonCalc();
+        $lookup = LookupHelper();
+
+        $this->validate($request, [
+            'system' => 'required',
+            'planet' => 'required',
+            'moon' => 'required',
+            'renter' => 'required',
+            'date' => 'required',
+            'contact' => 'required',
+        ]);
+
+        //Take the contact name and create a character id from it
+        $contact = $lookup->CharacterNameToId($request->contact);
+
+        //Create the date
+        $date = new Carbon($request->date . '00:00:01');
+        //Calculate the moon price
+        $moon = Moon::where([
+            'System' => $request->system,
+            'Planet' => $request->planet,
+            'Moon' => $request->moon,
+        ])->first();
+        $price = $moonCalc->SpatialMoonsOnlyGoo($moon->FirstOre, $moon->FirstQuantity, $moon->SecondOre, $moon->SecondQuantity, 
+                                                $moon->ThirdOre, $moon->ThirdQuantity, $moon->FourthOre, $moon->FourthQuantity);
+        
+        $date = new Carbon($request->date . '00:00:01');
+        //Update the database entry
+        Moon::where([
+            'System' => $request->system,
+            'Planet' => $request->planet,
+            'Moon' => $request->moon,
+        ])->update([
+            'RentalCorp' => $request->renter,
+            'RentalEnd' => $date,
+            'Contact' => $contact,
+        ]);
+
+        //Going to store moon price in a table for future reference
+        MoonRent::insert([
+            'System' => $request->system,
+            'Planet' => $request->planet,
+            'Moon' => $request->moon,
+            'RentalCorp' => $request->renter,
+            'RentalEnd' => $date,
+            'Contact' => $request->contact,
+            'Price' => $price,
+        ]);
+
+        return redirect('/moons/display')->with('success', 'Moon Updated');
+    }
+
     public function storeUpdateMoon(Request $request) {
         $this->validate($request, [
             'system' => 'required',
diff --git a/app/Library/Lookups/LookupHelper.php b/app/Library/Lookups/LookupHelper.php
index 037b57f1d..a492aee01 100644
--- a/app/Library/Lookups/LookupHelper.php
+++ b/app/Library/Lookups/LookupHelper.php
@@ -17,8 +17,11 @@ use App\Models\Character\CharacterToCorporation;
 class LookupHelper {
 
     //Create a character id from a character name
-    public function CharacterIdToName($character) {
+    public function CharacterNameToId($character) {
+        $esi = new Eseye();
 
+        
+        
     }
 
     //Add characters to the lookup table for quicker lookups without having
diff --git a/app/Models/Moon/MoonRent.php b/app/Models/Moon/MoonRent.php
new file mode 100644
index 000000000..d69872334
--- /dev/null
+++ b/app/Models/Moon/MoonRent.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MoonRent extends Model
+{
+    // Table Name
+    protected $table = 'MoonRent';
+
+    //Primary Key
+    public $primaryKey = 'id';
+
+    //Timestamps
+    public $timestamps = true;
+
+    //Fillable Items
+    protected $fillable = [
+        'System',
+        'Planet',
+        'Moon',
+        'RentalCorp',
+        'RentalEnd',
+        'Contact',
+        'Price',
+    ];
+}
diff --git a/database/migrations/2019_02_13_133855_create_moon_rents_table.php b/database/migrations/2019_02_13_133855_create_moon_rents_table.php
new file mode 100644
index 000000000..423dc5c8b
--- /dev/null
+++ b/database/migrations/2019_02_13_133855_create_moon_rents_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateMoonRentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('moon_rents', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('System');
+            $table->string('Planet');
+            $table->string('Moon');
+            $table->string('RentalCorp');
+            $table->dateTime('RentalEnd');
+            $table->string('Contact');
+            $table->float('Price', 20, 2);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('moon_rents');
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 46c208124..a24e9a899 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,30 +6,22 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'App\\AllowedLogin' => $baseDir . '/app/Models/Admin/AllowedLogin.php',
     'App\\Console\\Commands\\CalculateMarketTax' => $baseDir . '/app/Console/Commands/calculatemarkettax.php',
     'App\\Console\\Commands\\CorpJournal' => $baseDir . '/app/Console/Commands/corpJournal.php',
     'App\\Console\\Commands\\GetCorps' => $baseDir . '/app/Console/Commands/GetCorps.php',
-    'App\\Console\\Commands\\RunCloneSaver' => $baseDir . '/app/Console/Commands/runclonesaver.php',
+    'App\\Console\\Commands\\MoonMailerCommand' => $baseDir . '/app/Console/Commands/moonmailer.php',
     'App\\Console\\Commands\\SendMail' => $baseDir . '/app/Console/Commands/sendmail.php',
     'App\\Console\\Commands\\UpdateMoonPricing' => $baseDir . '/app/Console/Commands/UpdateMoonPricing.php',
     'App\\Console\\Commands\\holdingfinances' => $baseDir . '/app/Console/Commands/holdingfinances.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
-    'App\\HelpDeskTicket' => $baseDir . '/app/Models/HelpDesk/HelpDeskTicket.php',
-    'App\\HelpDeskTicketResponse' => $baseDir . '/app/Models/HelpDesk/HelpDeskTicketResponse.php',
     'App\\Http\\Controllers\\AdminController' => $baseDir . '/app/Http/Controllers/AdminController.php',
-    'App\\Http\\Controllers\\Auth\\ForgotPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ForgotPasswordController.php',
     'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php',
-    'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php',
-    'App\\Http\\Controllers\\Auth\\ResetPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ResetPasswordController.php',
-    'App\\Http\\Controllers\\Auth\\VerificationController' => $baseDir . '/app/Http/Controllers/Auth/VerificationController.php',
-    'App\\Http\\Controllers\\CloneSaverController' => $baseDir . '/app/Http/Controllers/CloneSaverController.php',
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
     'App\\Http\\Controllers\\DashboardController' => $baseDir . '/app/Http/Controllers/DashboardController.php',
     'App\\Http\\Controllers\\EsiScopeController' => $baseDir . '/app/Http/Controllers/EsiScopeController.php',
+    'App\\Http\\Controllers\\FinancesController' => $baseDir . '/app/Http/Controllers/FinancesController.php',
     'App\\Http\\Controllers\\FleetsController' => $baseDir . '/app/Http/Controllers/FleetsController.php',
-    'App\\Http\\Controllers\\JumpBridgeController' => $baseDir . '/app/Http/Controllers/JumpBridgeController.php',
     'App\\Http\\Controllers\\MoonsAdminController' => $baseDir . '/app/Http/Controllers/MoonsAdminController.php',
     'App\\Http\\Controllers\\MoonsController' => $baseDir . '/app/Http/Controllers/MoonsController.php',
     'App\\Http\\Controllers\\RegisterStructureController' => $baseDir . '/app/Http/Controllers/RegisterStructureController.php',
@@ -60,11 +52,13 @@ return array(
     'App\\Library\\Finances\\StructureIndustryTax' => $baseDir . '/app/Library/Finances/StructureIndustryTax.php',
     'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php',
     'App\\Library\\Moons\\MoonCalc' => $baseDir . '/app/Library/Moons/MoonCalc.php',
+    'App\\Library\\Moons\\MoonMailer' => $baseDir . '/app/Library/Moons/MoonMailer.php',
     'App\\Library\\Structures\\JumpBridgeFuel' => $baseDir . '/app/Library/Structures/JumpBridgeFuel.php',
     'App\\Library\\Structures\\StructureTaxHelper' => $baseDir . '/app/Library/Structures/StructureTaxHelper.php',
+    'App\\Models\\Admin\\AllowedLogin' => $baseDir . '/app/Models/Admin/AllowedLogin.php',
     'App\\Models\\Character\\CharacterClone' => $baseDir . '/app/Models/Charcter/CharacterClone.php',
     'App\\Models\\Character\\CharacterToCorporation' => $baseDir . '/app/Models/Charcter/CharacterToCorporation.php',
-    'App\\Models\\Config' => $baseDir . '/app/Models/Config.php',
+    'App\\Models\\Config' => $baseDir . '/app/Models/Moon/Config.php',
     'App\\Models\\Corporation\\AllianceCorp' => $baseDir . '/app/Models/Corporation/AllianceCorp.php',
     'App\\Models\\Corporation\\CorpStructure' => $baseDir . '/app/Models/Corporation/CorpStructure.php',
     'App\\Models\\Corporation\\CorpTaxRatio' => $baseDir . '/app/Models/Corporation/CorpTaxRatio.php',
@@ -96,6 +90,7 @@ return array(
     'App\\Models\\User\\UserPermission' => $baseDir . '/app/Models/User/UserPermission.php',
     'App\\Models\\User\\UserRole' => $baseDir . '/app/Models/User/UserRole.php',
     'App\\Models\\User\\UserToCorporation' => $baseDir . '/app/Models/User/UserToCorporation.php',
+    'App\\MoonRent' => $baseDir . '/app/Models/Moon/MoonRent.php',
     'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
     'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index b030056bc..fec35ee44 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -460,30 +460,22 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
     );
 
     public static $classMap = array (
-        'App\\AllowedLogin' => __DIR__ . '/../..' . '/app/Models/Admin/AllowedLogin.php',
         'App\\Console\\Commands\\CalculateMarketTax' => __DIR__ . '/../..' . '/app/Console/Commands/calculatemarkettax.php',
         'App\\Console\\Commands\\CorpJournal' => __DIR__ . '/../..' . '/app/Console/Commands/corpJournal.php',
         'App\\Console\\Commands\\GetCorps' => __DIR__ . '/../..' . '/app/Console/Commands/GetCorps.php',
-        'App\\Console\\Commands\\RunCloneSaver' => __DIR__ . '/../..' . '/app/Console/Commands/runclonesaver.php',
+        'App\\Console\\Commands\\MoonMailerCommand' => __DIR__ . '/../..' . '/app/Console/Commands/moonmailer.php',
         'App\\Console\\Commands\\SendMail' => __DIR__ . '/../..' . '/app/Console/Commands/sendmail.php',
         'App\\Console\\Commands\\UpdateMoonPricing' => __DIR__ . '/../..' . '/app/Console/Commands/UpdateMoonPricing.php',
         'App\\Console\\Commands\\holdingfinances' => __DIR__ . '/../..' . '/app/Console/Commands/holdingfinances.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
-        'App\\HelpDeskTicket' => __DIR__ . '/../..' . '/app/Models/HelpDesk/HelpDeskTicket.php',
-        'App\\HelpDeskTicketResponse' => __DIR__ . '/../..' . '/app/Models/HelpDesk/HelpDeskTicketResponse.php',
         'App\\Http\\Controllers\\AdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/AdminController.php',
-        'App\\Http\\Controllers\\Auth\\ForgotPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ForgotPasswordController.php',
         'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php',
-        'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php',
-        'App\\Http\\Controllers\\Auth\\ResetPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ResetPasswordController.php',
-        'App\\Http\\Controllers\\Auth\\VerificationController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/VerificationController.php',
-        'App\\Http\\Controllers\\CloneSaverController' => __DIR__ . '/../..' . '/app/Http/Controllers/CloneSaverController.php',
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
         'App\\Http\\Controllers\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/DashboardController.php',
         'App\\Http\\Controllers\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/EsiScopeController.php',
+        'App\\Http\\Controllers\\FinancesController' => __DIR__ . '/../..' . '/app/Http/Controllers/FinancesController.php',
         'App\\Http\\Controllers\\FleetsController' => __DIR__ . '/../..' . '/app/Http/Controllers/FleetsController.php',
-        'App\\Http\\Controllers\\JumpBridgeController' => __DIR__ . '/../..' . '/app/Http/Controllers/JumpBridgeController.php',
         'App\\Http\\Controllers\\MoonsAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonsAdminController.php',
         'App\\Http\\Controllers\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonsController.php',
         'App\\Http\\Controllers\\RegisterStructureController' => __DIR__ . '/../..' . '/app/Http/Controllers/RegisterStructureController.php',
@@ -514,11 +506,13 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Library\\Finances\\StructureIndustryTax' => __DIR__ . '/../..' . '/app/Library/Finances/StructureIndustryTax.php',
         'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php',
         'App\\Library\\Moons\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalc.php',
+        'App\\Library\\Moons\\MoonMailer' => __DIR__ . '/../..' . '/app/Library/Moons/MoonMailer.php',
         'App\\Library\\Structures\\JumpBridgeFuel' => __DIR__ . '/../..' . '/app/Library/Structures/JumpBridgeFuel.php',
         'App\\Library\\Structures\\StructureTaxHelper' => __DIR__ . '/../..' . '/app/Library/Structures/StructureTaxHelper.php',
+        'App\\Models\\Admin\\AllowedLogin' => __DIR__ . '/../..' . '/app/Models/Admin/AllowedLogin.php',
         'App\\Models\\Character\\CharacterClone' => __DIR__ . '/../..' . '/app/Models/Charcter/CharacterClone.php',
         'App\\Models\\Character\\CharacterToCorporation' => __DIR__ . '/../..' . '/app/Models/Charcter/CharacterToCorporation.php',
-        'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Config.php',
+        'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Moon/Config.php',
         'App\\Models\\Corporation\\AllianceCorp' => __DIR__ . '/../..' . '/app/Models/Corporation/AllianceCorp.php',
         'App\\Models\\Corporation\\CorpStructure' => __DIR__ . '/../..' . '/app/Models/Corporation/CorpStructure.php',
         'App\\Models\\Corporation\\CorpTaxRatio' => __DIR__ . '/../..' . '/app/Models/Corporation/CorpTaxRatio.php',
@@ -550,6 +544,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Models\\User\\UserPermission' => __DIR__ . '/../..' . '/app/Models/User/UserPermission.php',
         'App\\Models\\User\\UserRole' => __DIR__ . '/../..' . '/app/Models/User/UserRole.php',
         'App\\Models\\User\\UserToCorporation' => __DIR__ . '/../..' . '/app/Models/User/UserToCorporation.php',
+        'App\\MoonRent' => __DIR__ . '/../..' . '/app/Models/Moon/MoonRent.php',
         'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
         'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',