From 220789a4b971aaaf362d0ba53a3c57e366324d1a Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 2 Oct 2017 20:54:22 -0500
Subject: [PATCH 01/34] Push migrations to change existing service structure

---
 ...angeServicesToUseAMoreUniqueIdentifier.php | 50 ++++++++++++++++++
 ...ngeToABetterUniqueServiceConfiguration.php | 51 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
 create mode 100644 database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php

diff --git a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
new file mode 100644
index 000000000..64d31f749
--- /dev/null
+++ b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
@@ -0,0 +1,50 @@
+<?php
+
+use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('services', function (Blueprint $table) {
+            $table->dropUnique(['name']);
+            $table->dropUnique(['file']);
+
+            $table->string('author')->change();
+            $table->char('uuid', 36)->after('id');
+            $table->dropColumn('folder');
+        });
+
+        DB::table('services')->get(['id', 'author', 'uuid'])->each(function ($service) {
+            DB::table('services')->where('id', $service->id)->update([
+               'author' => ($service->author === 'ptrdctyl-v040-11e6-8b77-86f30ca893d3') ? 'support@pterodactyl.io' : 'unknown@unknown-author.com',
+               'uuid' => Uuid::uuid4()->toString(),
+            ]);
+        });
+
+        Schema::table('services', function (Blueprint $table) {
+            $table->unique('uuid');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('services', function (Blueprint $table) {
+            $table->dropColumn('uuid');
+            $table->string('folder')->unique('file');
+            $table->char('author', 36)->change();
+
+            $table->unique('name');
+        });
+    }
+}
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
new file mode 100644
index 000000000..c8159826a
--- /dev/null
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -0,0 +1,51 @@
+<?php
+
+use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeToABetterUniqueServiceConfiguration extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->char('uuid', 36)->after('id');
+            $table->string('author')->after('service_id');
+
+            $table->index(['service_id', 'tag']);
+        });
+
+        DB::table('service_options')->select([
+            'service_options.id',
+            'service_options.author',
+            'service_options.uuid',
+            'services.author AS service_author',
+        ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
+            DB::table('service_options')->where('id', $option->id)->update([
+                'author' => $option->service_author,
+                'uuid' => Uuid::uuid4()->toString(),
+            ]);
+        });
+
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->unique('uuid');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->dropColumn('uuid');
+            $table->dropColumn('author');
+            $table->dropIndex(['service_id', 'tag']);
+        });
+    }
+}

From 493c5888a3c80b38231cf1c3a4f03f42de6d786b Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 2 Oct 2017 22:03:01 -0500
Subject: [PATCH 02/34] Migration change

---
 ...ngeToABetterUniqueServiceConfiguration.php | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
index c8159826a..990a07a63 100644
--- a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -15,21 +15,22 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->char('uuid', 36)->after('id');
-            $table->string('author')->after('service_id');
 
             $table->index(['service_id', 'tag']);
         });
 
-        DB::table('service_options')->select([
-            'service_options.id',
-            'service_options.author',
-            'service_options.uuid',
-            'services.author AS service_author',
-        ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
-            DB::table('service_options')->where('id', $option->id)->update([
-                'author' => $option->service_author,
-                'uuid' => Uuid::uuid4()->toString(),
-            ]);
+        DB::transaction(function () {
+            DB::table('service_options')->select([
+                'service_options.id',
+                'service_options.uuid',
+                'service_options.tag',
+                'services.author AS service_author',
+            ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
+                DB::table('service_options')->where('id', $option->id)->update([
+                    'tag' => $option->service_author . ':' . $option->tag,
+                    'uuid' => Uuid::uuid4()->toString(),
+                ]);
+            });
         });
 
         Schema::table('service_options', function (Blueprint $table) {
@@ -44,8 +45,15 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->dropColumn('uuid');
-            $table->dropColumn('author');
             $table->dropIndex(['service_id', 'tag']);
         });
+
+        DB::transaction(function () {
+            DB::table('service_options')->select(['id', 'author'])->get()->each(function ($option) {
+                DB::table('service_options')->where('id', $option->id)->update([
+                    'tag' => array_get(explode(':', $option->tag), 1),
+                ]);
+            });
+        });
     }
 }

From ae671e6b19083943f31aa55353c4c84b140d3c4b Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 2 Oct 2017 22:51:13 -0500
Subject: [PATCH 03/34] Begin updating UI

---
 .env.example                                  |  4 +--
 .../Environment/AppSettingsCommand.php        |  9 ++---
 .../Repository/ServiceRepositoryInterface.php | 15 ++++++--
 .../Controllers/Admin/ServiceController.php   | 29 ++++++++++-----
 app/Http/Requests/Admin/AdminFormRequest.php  | 11 ++++--
 .../Admin/Service/ServiceFormRequest.php      | 14 ++------
 app/Models/Service.php                        | 18 +++++-----
 app/Models/ServiceOption.php                  | 27 +++++++++++---
 .../Eloquent/ServiceRepository.php            | 36 +++++++++++++------
 .../Options/InstallScriptUpdateService.php    |  2 +-
 .../Options/OptionCreationService.php         | 24 +++++++++++--
 .../Options/OptionDeletionService.php         |  5 +--
 .../Services/Options/OptionUpdateService.php  |  2 +-
 .../Services/ServiceCreationService.php       | 11 +++---
 .../Services/ServiceDeletionService.php       |  2 +-
 .../Services/ServiceUpdateService.php         |  2 +-
 .../admin/services/index.blade.php            |  9 ++++-
 .../pterodactyl/admin/services/new.blade.php  |  7 ----
 .../admin/services/options/new.blade.php      | 13 ++++---
 .../admin/services/options/view.blade.php     | 11 +++---
 .../pterodactyl/admin/services/view.blade.php | 27 ++++++++------
 .../pterodactyl/layouts/admin.blade.php       |  6 ++++
 22 files changed, 182 insertions(+), 102 deletions(-)

diff --git a/.env.example b/.env.example
index 45644374d..4bcc8f12c 100644
--- a/.env.example
+++ b/.env.example
@@ -32,6 +32,4 @@ QUEUE_HIGH=high
 QUEUE_STANDARD=standard
 QUEUE_LOW=low
 
-SQS_KEY=aws-public
-SQS_SECRET=aws-secret
-SQS_QUEUE_PREFIX=aws-queue-prefix
+SERVICE_AUTHOR=undefined@unknown-author.com
diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php
index d3e63af37..a7d602b5f 100644
--- a/app/Console/Commands/Environment/AppSettingsCommand.php
+++ b/app/Console/Commands/Environment/AppSettingsCommand.php
@@ -9,7 +9,6 @@
 
 namespace Pterodactyl\Console\Commands\Environment;
 
-use Ramsey\Uuid\Uuid;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
@@ -38,6 +37,7 @@ class AppSettingsCommand extends Command
      * @var string
      */
     protected $signature = 'p:environment:setup
+                            {--author= : The email that services created on this instance should be linked to.}
                             {--url= : The URL that this Panel is running on.}
                             {--timezone= : The timezone to use for Panel times.}
                             {--cache= : The cache driver backend to use.}
@@ -72,9 +72,10 @@ class AppSettingsCommand extends Command
      */
     public function handle()
     {
-        if (is_null($this->config->get('pterodactyl.service.author'))) {
-            $this->variables['SERVICE_AUTHOR'] = Uuid::uuid4()->toString();
-        }
+        $this->output->comment(trans('command/messages.environment.app.author_help'));
+        $this->variables['SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
+            trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'undefined@unknown-author.com')
+        );
 
         $this->output->comment(trans('command/messages.environment.app.app_url_help'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
diff --git a/app/Contracts/Repository/ServiceRepositoryInterface.php b/app/Contracts/Repository/ServiceRepositoryInterface.php
index 87919ae7a..7f710e624 100644
--- a/app/Contracts/Repository/ServiceRepositoryInterface.php
+++ b/app/Contracts/Repository/ServiceRepositoryInterface.php
@@ -9,6 +9,9 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\Service;
+use Illuminate\Support\Collection;
+
 interface ServiceRepositoryInterface extends RepositoryInterface
 {
     /**
@@ -17,7 +20,15 @@ interface ServiceRepositoryInterface extends RepositoryInterface
      * @param int $id
      * @return \Illuminate\Support\Collection
      */
-    public function getWithOptions($id = null);
+    public function getWithOptions(int $id = null): Collection;
+
+    /**
+     * Return a service or all services and the count of options, packs, and servers for that service.
+     *
+     * @param int|null $id
+     * @return \Illuminate\Support\Collection
+     */
+    public function getWithCounts(int $id = null): Collection;
 
     /**
      * Return a service along with its associated options and the servers relation on those options.
@@ -25,5 +36,5 @@ interface ServiceRepositoryInterface extends RepositoryInterface
      * @param int $id
      * @return mixed
      */
-    public function getWithOptionServers($id);
+    public function getWithOptionServers(int $id): Service;
 }
diff --git a/app/Http/Controllers/Admin/ServiceController.php b/app/Http/Controllers/Admin/ServiceController.php
index 35b5155f6..72332c7b3 100644
--- a/app/Http/Controllers/Admin/ServiceController.php
+++ b/app/Http/Controllers/Admin/ServiceController.php
@@ -9,7 +9,9 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
+use Illuminate\View\View;
 use Pterodactyl\Models\Service;
+use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Services\ServiceUpdateService;
@@ -46,6 +48,15 @@ class ServiceController extends Controller
      */
     protected $updateService;
 
+    /**
+     * ServiceController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                            $alert
+     * @param \Pterodactyl\Services\Services\ServiceCreationService        $creationService
+     * @param \Pterodactyl\Services\Services\ServiceDeletionService        $deletionService
+     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Services\ServiceUpdateService          $updateService
+     */
     public function __construct(
         AlertsMessageBag $alert,
         ServiceCreationService $creationService,
@@ -65,10 +76,10 @@ class ServiceController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function index()
+    public function index(): View
     {
         return view('admin.services.index', [
-            'services' => $this->repository->getWithOptions(),
+            'services' => $this->repository->getWithCounts(),
         ]);
     }
 
@@ -77,7 +88,7 @@ class ServiceController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function create()
+    public function create(): View
     {
         return view('admin.services.new');
     }
@@ -88,7 +99,7 @@ class ServiceController extends Controller
      * @param int $service
      * @return \Illuminate\View\View
      */
-    public function view($service)
+    public function view(int $service): View
     {
         return view('admin.services.view', [
             'service' => $this->repository->getWithOptionServers($service),
@@ -101,7 +112,7 @@ class ServiceController extends Controller
      * @param \Pterodactyl\Models\Service $service
      * @return \Illuminate\View\View
      */
-    public function viewFunctions(Service $service)
+    public function viewFunctions(Service $service): View
     {
         return view('admin.services.functions', ['service' => $service]);
     }
@@ -114,7 +125,7 @@ class ServiceController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function store(ServiceFormRequest $request)
+    public function store(ServiceFormRequest $request): RedirectResponse
     {
         $service = $this->creationService->handle($request->normalize());
         $this->alert->success(trans('admin/services.notices.service_created', ['name' => $service->name]))->flash();
@@ -132,7 +143,7 @@ class ServiceController extends Controller
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(ServiceFormRequest $request, Service $service)
+    public function update(ServiceFormRequest $request, Service $service): RedirectResponse
     {
         $this->updateService->handle($service->id, $request->normalize());
         $this->alert->success(trans('admin/services.notices.service_updated'))->flash();
@@ -150,7 +161,7 @@ class ServiceController extends Controller
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function updateFunctions(ServiceFunctionsFormRequest $request, Service $service)
+    public function updateFunctions(ServiceFunctionsFormRequest $request, Service $service): RedirectResponse
     {
         $this->updateService->handle($service->id, $request->normalize());
         $this->alert->success(trans('admin/services.notices.functions_updated'))->flash();
@@ -166,7 +177,7 @@ class ServiceController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function destroy(Service $service)
+    public function destroy(Service $service): RedirectResponse
     {
         $this->deletionService->handle($service->id);
         $this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
diff --git a/app/Http/Requests/Admin/AdminFormRequest.php b/app/Http/Requests/Admin/AdminFormRequest.php
index 365f40d2b..7d5859981 100644
--- a/app/Http/Requests/Admin/AdminFormRequest.php
+++ b/app/Http/Requests/Admin/AdminFormRequest.php
@@ -13,7 +13,12 @@ use Illuminate\Foundation\Http\FormRequest;
 
 abstract class AdminFormRequest extends FormRequest
 {
-    abstract public function rules();
+    /**
+     * The rules to apply to the incoming form request.
+     *
+     * @return array
+     */
+    abstract public function rules(): array;
 
     /**
      * Determine if the user is an admin and has permission to access this
@@ -21,7 +26,7 @@ abstract class AdminFormRequest extends FormRequest
      *
      * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         if (is_null($this->user())) {
             return false;
@@ -37,7 +42,7 @@ abstract class AdminFormRequest extends FormRequest
      * @param array $only
      * @return array
      */
-    public function normalize($only = [])
+    public function normalize($only = []): array
     {
         return array_merge(
             $this->only($only),
diff --git a/app/Http/Requests/Admin/Service/ServiceFormRequest.php b/app/Http/Requests/Admin/Service/ServiceFormRequest.php
index c5af2b697..672f2d2f9 100644
--- a/app/Http/Requests/Admin/Service/ServiceFormRequest.php
+++ b/app/Http/Requests/Admin/Service/ServiceFormRequest.php
@@ -16,22 +16,12 @@ class ServiceFormRequest extends AdminFormRequest
     /**
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
-        $rules = [
+        return [
             'name' => 'required|string|min:1|max:255',
             'description' => 'required|nullable|string',
-            'folder' => 'required|regex:/^[\w.-]{1,50}$/|unique:services,folder',
             'startup' => 'required|nullable|string',
         ];
-
-        if ($this->method() === 'PATCH') {
-            $service = $this->route()->parameter('service');
-            $rules['folder'] = $rules['folder'] . ',' . $service->id;
-
-            return $rules;
-        }
-
-        return $rules;
     }
 }
diff --git a/app/Models/Service.php b/app/Models/Service.php
index e81a9ba90..0a17f7e42 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -31,7 +31,12 @@ class Service extends Model implements CleansAttributes, ValidableContract
      *
      * @var array
      */
-    protected $fillable = ['name', 'author', 'description', 'folder', 'startup', 'index_file'];
+    protected $fillable = [
+        'name',
+        'description',
+        'startup',
+        'index_file',
+    ];
 
     /**
      * @var array
@@ -40,7 +45,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'required',
         'name' => 'required',
         'description' => 'sometimes',
-        'folder' => 'required',
         'startup' => 'sometimes',
         'index_file' => 'required',
     ];
@@ -49,10 +53,9 @@ class Service extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'author' => 'string|size:36',
+        'author' => 'email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
-        'folder' => 'string|max:255|regex:/^[\w.-]{1,50}$/|unique:services,folder',
         'startup' => 'nullable|string',
         'index_file' => 'string',
     ];
@@ -74,12 +77,7 @@ class Service extends Model implements CleansAttributes, ValidableContract
      */
     public function packs()
     {
-        return $this->hasManyThrough(
-            Pack::class,
-            ServiceOption::class,
-            'service_id',
-            'option_id'
-        );
+        return $this->hasManyThrough(Pack::class, ServiceOption::class, 'service_id', 'option_id');
     }
 
     /**
diff --git a/app/Models/ServiceOption.php b/app/Models/ServiceOption.php
index d59ca8f61..db5ec4c1f 100644
--- a/app/Models/ServiceOption.php
+++ b/app/Models/ServiceOption.php
@@ -31,7 +31,22 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @var array
      */
-    protected $guarded = ['id', 'created_at', 'updated_at'];
+    protected $fillable = [
+        'name',
+        'description',
+        'docker_image',
+        'config_files',
+        'config_startup',
+        'config_logs',
+        'config_stop',
+        'config_from',
+        'startup',
+        'script_is_privileged',
+        'script_install',
+        'script_entry',
+        'script_container',
+        'copy_script_from',
+    ];
 
     /**
      * Cast values to correct type.
@@ -40,7 +55,9 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      */
     protected $casts = [
         'service_id' => 'integer',
+        'config_from' => 'integer',
         'script_is_privileged' => 'boolean',
+        'copy_script_from' => 'integer',
     ];
 
     /**
@@ -48,6 +65,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      */
     protected static $applicationRules = [
         'service_id' => 'required',
+        'author' => 'required',
         'name' => 'required',
         'description' => 'required',
         'tag' => 'required',
@@ -64,13 +82,14 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'service_id' => 'numeric|exists:services,id',
+        'service_id' => 'bail|numeric|exists:services,id',
+        'author' => 'email',
         'name' => 'string|max:255',
         'description' => 'string',
-        'tag' => 'alpha_num|max:60|unique:service_options,tag',
+        'tag' => 'bail|alpha_num|max:60|unique:service_options,tag',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
-        'config_from' => 'nullable|numeric|exists:service_options,id',
+        'config_from' => 'bail|nullable|numeric|exists:service_options,id',
         'config_stop' => 'nullable|string|max:255',
         'config_startup' => 'nullable|json',
         'config_logs' => 'nullable|json',
diff --git a/app/Repositories/Eloquent/ServiceRepository.php b/app/Repositories/Eloquent/ServiceRepository.php
index affe52de4..95d9224e5 100644
--- a/app/Repositories/Eloquent/ServiceRepository.php
+++ b/app/Repositories/Eloquent/ServiceRepository.php
@@ -9,8 +9,8 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
-use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Service;
+use Illuminate\Support\Collection;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
@@ -27,16 +27,14 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     /**
      * {@inheritdoc}
      */
-    public function getWithOptions($id = null)
+    public function getWithOptions(int $id = null): Collection
     {
-        Assert::nullOrNumeric($id, 'First argument passed to getWithOptions must be null or numeric, received %s.');
-
         $instance = $this->getBuilder()->with('options.packs', 'options.variables');
 
         if (! is_null($id)) {
             $instance = $instance->find($id, $this->getColumns());
             if (! $instance) {
-                throw new RecordNotFoundException();
+                throw new RecordNotFoundException;
             }
 
             return $instance;
@@ -48,15 +46,33 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     /**
      * {@inheritdoc}
      */
-    public function getWithOptionServers($id)
+    public function getWithCounts(int $id = null): Collection
     {
-        Assert::numeric($id, 'First argument passed to getWithOptionServers must be numeric, received %s.');
+        $instance = $this->getBuilder()->withCount(['options', 'packs', 'servers']);
 
-        $instance = $this->getBuilder()->with('options.servers')->find($id, $this->getColumns());
-        if (! $instance) {
-            throw new RecordNotFoundException();
+        if (! is_null($id)) {
+            $instance = $instance->find($id, $this->getColumns());
+            if (! $instance) {
+                throw new RecordNotFoundException;
+            }
+
+            return $instance;
         }
 
+        return $instance->get($this->getColumns());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWithOptionServers(int $id): Service
+    {
+        $instance = $this->getBuilder()->with('options.servers')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        /* @var Service $instance */
         return $instance;
     }
 }
diff --git a/app/Services/Services/Options/InstallScriptUpdateService.php b/app/Services/Services/Options/InstallScriptUpdateService.php
index 7b302190e..abb7cfca1 100644
--- a/app/Services/Services/Options/InstallScriptUpdateService.php
+++ b/app/Services/Services/Options/InstallScriptUpdateService.php
@@ -40,7 +40,7 @@ class InstallScriptUpdateService
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException
      */
-    public function handle($option, array $data)
+    public function handle($option, array $data): void
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);
diff --git a/app/Services/Services/Options/OptionCreationService.php b/app/Services/Services/Options/OptionCreationService.php
index d15a813e4..8149a5596 100644
--- a/app/Services/Services/Options/OptionCreationService.php
+++ b/app/Services/Services/Options/OptionCreationService.php
@@ -9,11 +9,19 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\ServiceOption;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionCreationService
 {
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    protected $config;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
      */
@@ -22,10 +30,12 @@ class OptionCreationService
     /**
      * CreationService constructor.
      *
+     * @param \Illuminate\Contracts\Config\Repository                            $config
      * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
      */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
+    public function __construct(ConfigRepository $config, ServiceOptionRepositoryInterface $repository)
     {
+        $this->config = $config;
         $this->repository = $repository;
     }
 
@@ -38,7 +48,7 @@ class OptionCreationService
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
      */
-    public function handle(array $data)
+    public function handle(array $data): ServiceOption
     {
         if (! is_null(array_get($data, 'config_from'))) {
             $results = $this->repository->findCountWhere([
@@ -53,6 +63,14 @@ class OptionCreationService
             $data['config_from'] = null;
         }
 
-        return $this->repository->create($data);
+        if (count($parts = explode(':', array_get($data, 'tag'))) > 1) {
+            $data['tag'] = $this->config->get('pterodactyl.service.author') . ':' . trim(array_pop($parts));
+        } else {
+            $data['tag'] = $this->config->get('pterodactyl.service.author') . ':' . trim(array_get($data, 'tag'));
+        }
+
+        return $this->repository->create(array_merge($data, [
+            'uuid' => Uuid::uuid4()->toString(),
+        ]), true, true);
     }
 }
diff --git a/app/Services/Services/Options/OptionDeletionService.php b/app/Services/Services/Options/OptionDeletionService.php
index 27788ca5c..626c9d756 100644
--- a/app/Services/Services/Options/OptionDeletionService.php
+++ b/app/Services/Services/Options/OptionDeletionService.php
@@ -9,7 +9,6 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
-use Webmozart\Assert\Assert;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
@@ -50,10 +49,8 @@ class OptionDeletionService
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException
      */
-    public function handle($option)
+    public function handle(int $option): int
     {
-        Assert::integerish($option, 'First argument passed to handle must be integer, received %s.');
-
         $servers = $this->serverRepository->findCountWhere([['option_id', '=', $option]]);
         if ($servers > 0) {
             throw new HasActiveServersException(trans('exceptions.service.options.delete_has_servers'));
diff --git a/app/Services/Services/Options/OptionUpdateService.php b/app/Services/Services/Options/OptionUpdateService.php
index 1d2109de5..73c69cc5d 100644
--- a/app/Services/Services/Options/OptionUpdateService.php
+++ b/app/Services/Services/Options/OptionUpdateService.php
@@ -40,7 +40,7 @@ class OptionUpdateService
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
      */
-    public function handle($option, array $data)
+    public function handle($option, array $data): void
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);
diff --git a/app/Services/Services/ServiceCreationService.php b/app/Services/Services/ServiceCreationService.php
index 4d7e77f1a..b0ddc62fb 100644
--- a/app/Services/Services/ServiceCreationService.php
+++ b/app/Services/Services/ServiceCreationService.php
@@ -9,6 +9,8 @@
 
 namespace Pterodactyl\Services\Services;
 
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Service;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
@@ -49,16 +51,15 @@ class ServiceCreationService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function handle(array $data)
+    public function handle(array $data): Service
     {
-        return $this->repository->create(array_merge([
+        return $this->repository->create([
+            'uuid' => Uuid::uuid4()->toString(),
             'author' => $this->config->get('pterodactyl.service.author'),
-        ], [
             'name' => array_get($data, 'name'),
             'description' => array_get($data, 'description'),
-            'folder' => array_get($data, 'folder'),
             'startup' => array_get($data, 'startup'),
             'index_file' => $this->getIndexScript(),
-        ]));
+        ], true, true);
     }
 }
diff --git a/app/Services/Services/ServiceDeletionService.php b/app/Services/Services/ServiceDeletionService.php
index def352b8d..0a88b1209 100644
--- a/app/Services/Services/ServiceDeletionService.php
+++ b/app/Services/Services/ServiceDeletionService.php
@@ -47,7 +47,7 @@ class ServiceDeletionService
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function handle($service)
+    public function handle(int $service): int
     {
         $count = $this->serverRepository->findCountWhere([['service_id', '=', $service]]);
         if ($count > 0) {
diff --git a/app/Services/Services/ServiceUpdateService.php b/app/Services/Services/ServiceUpdateService.php
index 59662e2a5..327c45aa7 100644
--- a/app/Services/Services/ServiceUpdateService.php
+++ b/app/Services/Services/ServiceUpdateService.php
@@ -36,7 +36,7 @@ class ServiceUpdateService
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($service, array $data)
+    public function handle(int $service, array $data): void
     {
         if (! is_null(array_get($data, 'author'))) {
             unset($data['author']);
diff --git a/resources/themes/pterodactyl/admin/services/index.blade.php b/resources/themes/pterodactyl/admin/services/index.blade.php
index cd336f9b7..3584f1f63 100644
--- a/resources/themes/pterodactyl/admin/services/index.blade.php
+++ b/resources/themes/pterodactyl/admin/services/index.blade.php
@@ -18,6 +18,13 @@
 @endsection
 
 @section('content')
+<div class="row">
+    <div class="col-xs-12">
+        <div class="alert alert-danger">
+            Services are a powerful feature of Pterodactyl Panel that allow for extreme flexibility and configuration. Please note that while powerful, modifing a service wrongly can very easily brick your servers and cause more problems. Please avoid editing our default services — those provided by <code>support@pterodactyl.io</code> — unless you are absolutely sure of what you are doing.
+        </div>
+    </div>
+</div>
 <div class="row">
     <div class="col-xs-12">
         <div class="box">
@@ -38,7 +45,7 @@
                     </tr>
                     @foreach($services as $service)
                         <tr>
-                            <td class="middle"><a href="{{ route('admin.services.view', $service->id) }}">{{ $service->name }}</a></td>
+                            <td class="middle"><a href="{{ route('admin.services.view', $service->id) }}" data-toggle="tooltip" data-placement="right" title="{{ $service->author }}">{{ $service->name }}</a></td>
                             <td class="col-xs-6 middle">{{ $service->description }}</td>
                             <td class="text-center middle"><code>{{ $service->options_count }}</code></td>
                             <td class="text-center middle"><code>{{ $service->packs_count }}</code></td>
diff --git a/resources/themes/pterodactyl/admin/services/new.blade.php b/resources/themes/pterodactyl/admin/services/new.blade.php
index 864dadbae..c63bec43b 100644
--- a/resources/themes/pterodactyl/admin/services/new.blade.php
+++ b/resources/themes/pterodactyl/admin/services/new.blade.php
@@ -46,13 +46,6 @@
         <div class="col-md-6">
             <div class="box">
                 <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Folder Name</label>
-                        <div>
-                            <input type="text" name="folder" class="form-control" value="{{ old('folder') }}" />
-                            <p class="text-muted"><small>Service are downloaded by the daemon and stored in a folder using this name. The storage location is <code>/srv/daemon/services/{NAME}</code> by default.</small></p>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="control-label">Default Start Command</label>
                         <div>
diff --git a/resources/themes/pterodactyl/admin/services/options/new.blade.php b/resources/themes/pterodactyl/admin/services/options/new.blade.php
index 2a5f3da9f..79195f008 100644
--- a/resources/themes/pterodactyl/admin/services/options/new.blade.php
+++ b/resources/themes/pterodactyl/admin/services/options/new.blade.php
@@ -33,7 +33,7 @@
                                 <label for="pServiceId" class="form-label">Associated Service</label>
                                 <select name="service_id" id="pServiceId">
                                     @foreach($services as $service)
-                                        <option value="{{ $service->id }}" {{ old('service_id') != $service->id ?: 'selected' }}>{{ $service->name }}</option>
+                                        <option value="{{ $service->id }}" {{ old('service_id') != $service->id ?: 'selected' }}>{{ $service->name }} &lt;{{ $service->author }}&gt;</option>
                                     @endforeach
                                 </select>
                             </div>
@@ -51,16 +51,19 @@
                         <div class="col-sm-6">
                             <div class="form-group">
                                 <label for="pTag" class="form-label">Option Tag</label>
-                                <input type="text" id="pTag" name="tag" value="{{ old('tag') }}" class="form-control" />
+                                <div class="input-group">
+                                    <span class="input-group-addon">{{ config('pterodactyl.service.author') }}:</span>
+                                    <input type="text" id="pTag" name="tag" value="{{ old('tag') }}" class="form-control" />
+                                </div>
                                 <p class="text-muted small">This should be a unique identifer for this service option that is not used for any other service options. Must be alpha-numeric and no more than 60 characters in length.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pDockerImage" class="form-label">Docker Image</label>
+                                <label for="pDockerImage" class="control-label">Docker Image <span class="field-optional"></span></label>
                                 <input type="text" id="pDockerImage" name="docker_image" value="{{ old('docker_image') }}" placeholder="quay.io/pterodactyl/service" class="form-control" />
                                 <p class="text-muted small">The default docker image that should be used for new servers under this service option. This can be left blank to use the parent service's defined image, and can also be changed per-server.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pStartup" class="form-label">Startup Command</label>
+                                <label for="pStartup" class="control-label">Startup Command <span class="field-optional"></span></label>
                                 <textarea id="pStartup" name="startup" class="form-control" rows="4">{{ old('startup') }}</textarea>
                                 <p class="text-muted small">The default statup command that should be used for new servers under this service option. This can be left blank to use the parent service's startup, and can also be changed per-server.</p>
                             </div>
@@ -136,7 +139,7 @@
             data: $.map(_.get(Pterodactyl.services, $(this).val() + '.options', []), function (item) {
                 return {
                     id: item.id,
-                    text: item.name,
+                    text: item.name + ' <' + item.tag + '>',
                 };
             }),
         });
diff --git a/resources/themes/pterodactyl/admin/services/options/view.blade.php b/resources/themes/pterodactyl/admin/services/options/view.blade.php
index b44b96c9a..1f6564d81 100644
--- a/resources/themes/pterodactyl/admin/services/options/view.blade.php
+++ b/resources/themes/pterodactyl/admin/services/options/view.blade.php
@@ -59,17 +59,16 @@
                         </div>
                         <div class="col-sm-6">
                             <div class="form-group">
-                                <label for="pTag" class="form-label">Option Tag</label>
-                                <input type="text" id="pTag" name="tag" value="{{ $option->tag }}" class="form-control" />
-                                <p class="text-muted small">This should be a unique identifer for this service option that is not used for any other service options.</p>
+                                <label class="form-label">Option Tag</label>
+                                <input type="text" disabled value="{{ $option->tag }}" class="form-control" />
                             </div>
                             <div class="form-group">
-                                <label for="pDockerImage" class="form-label">Docker Image</label>
+                                <label for="pDockerImage" class="control-label">Docker Image <span class="field-optional"></label>
                                 <input type="text" id="pDockerImage" name="docker_image" value="{{ $option->docker_image }}" class="form-control" />
                                 <p class="text-muted small">The default docker image that should be used for new servers under this service option. This can be left blank to use the parent service's defined image, and can also be changed per-server.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pStartup" class="form-label">Startup Command</label>
+                                <label for="pStartup" class="control-label">Startup Command <span class="field-optional"></label>
                                 <textarea id="pStartup" name="startup" class="form-control" rows="4" placeholder="{{ $option->service->startup }}">{{ $option->startup }}</textarea>
                                 <p class="text-muted small">The default statup command that should be used for new servers under this service option. This can be left blank to use the parent service's startup, and can also be changed per-server.</p>
                             </div>
@@ -97,7 +96,7 @@
                                 <select name="config_from" id="pConfigFrom" class="form-control">
                                     <option value="0">None</option>
                                     @foreach($option->service->options as $o)
-                                        <option value="{{ $o->id }}" {{ ($option->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }}</option>
+                                        <option value="{{ $o->id }}" {{ ($option->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }} &lt;{{ $option->tag }}&gt;</option>
                                     @endforeach
                                 </select>
                                 <p class="text-muted small">If you would like to default to settings from another option select the option from the menu above.</p>
diff --git a/resources/themes/pterodactyl/admin/services/view.blade.php b/resources/themes/pterodactyl/admin/services/view.blade.php
index f8461e7d2..2a6886f01 100644
--- a/resources/themes/pterodactyl/admin/services/view.blade.php
+++ b/resources/themes/pterodactyl/admin/services/view.blade.php
@@ -44,22 +44,18 @@
                     <div class="form-group">
                         <label class="control-label">Description</label>
                         <div>
-                            <textarea name="description" class="form-control" rows="6">{{ $service->description }}</textarea>
+                            <textarea name="description" class="form-control" rows="7">{{ $service->description }}</textarea>
                         </div>
                     </div>
                 </div>
+                <div class="box-footer">
+                    <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-sm btn-danger muted muted-hover"><i class="fa fa-trash-o"></i></button>
+                </div>
             </div>
         </div>
         <div class="col-md-6">
             <div class="box">
                 <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Folder Name</label>
-                        <div>
-                            <input type="text" name="folder" class="form-control" value="{{ $service->folder }}" />
-                            <p class="text-muted"><small>Service are downloaded by the daemon and stored in a folder using this name. The storage location is <code>/srv/daemon/services/{NAME}</code> by default.</small></p>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="control-label">Default Start Command</label>
                         <div>
@@ -67,10 +63,21 @@
                             <p class="text-muted"><small>The default start command to use when running options under this service. This command can be modified per-option and should include the executable to be called in the container.</small></p>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="control-label">Author</label>
+                        <div>
+                            <input type="text" readonly class="form-control" value="{{ $service->author }}" />
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">UUID</label>
+                        <div>
+                            <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
+                        </div>
+                    </div>
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-sm btn-danger muted muted-hover"><i class="fa fa-trash-o"></i></button>
                     <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Service</button>
                 </div>
             </div>
@@ -86,7 +93,7 @@
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
                     <tr>
-                        <th class="col-sm-4 col-md-3">Name</th>
+                        <th>Name</th>
                         <th>Description</th>
                         <th>Tag</th>
                         <th class="text-center">Servers</th>
diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index bfd97b439..c547e2762 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -197,6 +197,12 @@
                     });
                 </script>
             @endif
+
+            <script>
+                $(function () {
+                    $('[data-toggle="tooltip"]').tooltip()
+                })
+            </script>
         @show
     </body>
 </html>

From 12faf80fafe66fb07e056497aa667eacbb68f97f Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 2 Oct 2017 22:56:12 -0500
Subject: [PATCH 04/34] Disable seeding until more complete

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b0590806e..a29a33663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
 before_script:
   - cp .env.travis .env
   - composer install --no-interaction --prefer-dist --no-suggest --verbose
-  - php artisan migrate --seed -v
+  - php artisan migrate -v
 script:
   - vendor/bin/phpunit --coverage-clover coverage.xml
 notifications:

From 0d739257a9d164a3a97260e095aa45b79c04a84e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 00:01:04 -0500
Subject: [PATCH 05/34] First pass at XML exporter for services

---
 .../Options/OptionShareController.php         |  45 +++++++
 .../Services/Exporter/XMLExporterService.php  | 118 ++++++++++++++++++
 composer.json                                 |   1 +
 composer.lock                                 | 116 ++++++++++++++++-
 .../admin/services/options/view.blade.php     |   3 +-
 .../pterodactyl/admin/services/view.blade.php |   2 +-
 routes/admin.php                              |   1 +
 7 files changed, 283 insertions(+), 3 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/Services/Options/OptionShareController.php
 create mode 100644 app/Services/Services/Exporter/XMLExporterService.php

diff --git a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
new file mode 100644
index 000000000..bdf8c8c41
--- /dev/null
+++ b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Services\Options;
+
+use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Services\Exporter\XMLExporterService;
+
+class OptionShareController extends Controller
+{
+    /**
+     * @var \Pterodactyl\Services\Services\Exporter\XMLExporterService
+     */
+    protected $exporterService;
+
+    /**
+     * OptionShareController constructor.
+     *
+     * @param \Pterodactyl\Services\Services\Exporter\XMLExporterService $exporterService
+     */
+    public function __construct(XMLExporterService $exporterService)
+    {
+        $this->exporterService = $exporterService;
+    }
+
+    /**
+     * @param \Pterodactyl\Models\ServiceOption $option
+     * @return $this
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function export(ServiceOption $option)
+    {
+        return response($this->exporterService->handle($option), 200, [
+            'Content-Type' => 'application/xml',
+        ]);
+    }
+}
diff --git a/app/Services/Services/Exporter/XMLExporterService.php b/app/Services/Services/Exporter/XMLExporterService.php
new file mode 100644
index 000000000..5570a45c5
--- /dev/null
+++ b/app/Services/Services/Exporter/XMLExporterService.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Services\Exporter;
+
+use Carbon\Carbon;
+use Sabre\Xml\Writer;
+use Sabre\Xml\Service;
+use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+
+class XMLExporterService
+{
+    const XML_OPTION_NAMESPACE = '{https://pterodactyl.io/exporter/option/}';
+
+    /**
+     * @var \Carbon\Carbon
+     */
+    protected $carbon;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Sabre\Xml\Service
+     */
+    protected $xml;
+
+    /**
+     * XMLExporterService constructor.
+     *
+     * @param \Carbon\Carbon                                                     $carbon
+     * @param \Sabre\Xml\Service                                                 $xml
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     */
+    public function __construct(
+        Carbon $carbon,
+        Service $xml,
+        ServiceOptionRepositoryInterface $repository
+    ) {
+        $this->carbon = $carbon;
+        $this->repository = $repository;
+        $this->xml = $xml;
+
+        $this->xml->namespaceMap = [
+            str_replace(['{', '}'], '', self::XML_OPTION_NAMESPACE) => 'p',
+        ];
+    }
+
+    /**
+     * Return an XML structure to represent this service option.
+     *
+     * @param int|\Pterodactyl\Models\ServiceOption $option
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($option): string
+    {
+        if (! $option instanceof ServiceOption) {
+            $option = $this->repository->find($option);
+        }
+
+        $struct = [
+            'exported_at' => $this->carbon->now()->toIso8601String(),
+            'name' => $option->name,
+            'author' => array_get(explode(':', $option->tag), 0),
+            'tag' => $option->tag,
+            'description' => $option->description,
+            'image' => $option->docker_image,
+            'config' => [
+                'files' => $option->config_files,
+                'startup' => $option->config_startup,
+                'logs' => $option->config_logs,
+                'stop' => $option->config_stop,
+            ],
+            'scripts' => [
+                'installation' => [
+                    'script' => function (Writer $writer) use ($option) {
+                        return $writer->writeCData($option->copy_script_install);
+                    },
+                ],
+            ],
+        ];
+
+        return $this->xml->write(self::XML_OPTION_NAMESPACE . 'root', $this->recursiveArrayKeyPrepend($struct));
+    }
+
+    /**
+     * @param array  $array
+     * @param string $prepend
+     *
+     * @return array
+     */
+    protected function recursiveArrayKeyPrepend(array $array, $prepend = self::XML_OPTION_NAMESPACE): array
+    {
+        $parsed = [];
+        foreach ($array as $k => &$v) {
+            $k = $prepend . $k;
+
+            if (is_array($v)) {
+                $v = $this->recursiveArrayKeyPrepend($v);
+            }
+
+            $parsed[$k] = $v;
+        }
+
+        return $parsed;
+    }
+}
diff --git a/composer.json b/composer.json
index db04ade72..d0aa38e74 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,7 @@
         "prologue/alerts": "^0.4",
         "ramsey/uuid": "^3.7",
         "s1lentium/iptools": "^1.1",
+        "sabre/xml": "^2.0",
         "sofa/eloquence": "~5.4.1",
         "spatie/laravel-fractal": "^4.0",
         "watson/validating": "^3.0",
diff --git a/composer.lock b/composer.lock
index 4c112e5f4..34bb845a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "46a0a06ec8f3af50ed6ec05c2bb3b9a3",
+    "content-hash": "bc8c88f86ea043406bce2f8fddf704b3",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -2510,6 +2510,120 @@
             ],
             "time": "2016-08-21T15:57:09+00:00"
         },
+        {
+            "name": "sabre/uri",
+            "version": "2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-uri.git",
+                "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-uri/zipball/a42126042c7dcb53e2978dadb6d22574d1359b4c",
+                "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0",
+                "sabre/cs": "~1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
+                "psr-4": {
+                    "Sabre\\Uri\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Functions for making sense out of URIs.",
+            "homepage": "http://sabre.io/uri/",
+            "keywords": [
+                "rfc3986",
+                "uri",
+                "url"
+            ],
+            "time": "2017-02-20T20:02:35+00:00"
+        },
+        {
+            "name": "sabre/xml",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-xml.git",
+                "reference": "054292959a1f2b64c10c9c7a03a816ba1872b8a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/054292959a1f2b64c10c9c7a03a816ba1872b8a3",
+                "reference": "054292959a1f2b64c10c9c7a03a816ba1872b8a3",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "lib-libxml": ">=2.6.20",
+                "php": ">=7.0",
+                "sabre/uri": ">=1.0,<3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "~1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\Xml\\": "lib/"
+                },
+                "files": [
+                    "lib/Deserializer/functions.php",
+                    "lib/Serializer/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Markus Staab",
+                    "email": "markus.staab@redaxo.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "sabre/xml is an XML library that you may not hate.",
+            "homepage": "https://sabre.io/xml/",
+            "keywords": [
+                "XMLReader",
+                "XMLWriter",
+                "dom",
+                "xml"
+            ],
+            "time": "2016-11-16T00:41:01+00:00"
+        },
         {
             "name": "sofa/eloquence",
             "version": "5.4.1",
diff --git a/resources/themes/pterodactyl/admin/services/options/view.blade.php b/resources/themes/pterodactyl/admin/services/options/view.blade.php
index 1f6564d81..641a28be7 100644
--- a/resources/themes/pterodactyl/admin/services/options/view.blade.php
+++ b/resources/themes/pterodactyl/admin/services/options/view.blade.php
@@ -131,7 +131,8 @@
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-danger btn-sm muted muted-hover">
                         <i class="fa fa-trash-o"></i>
                     </button>
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Service</button>
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Option</button>
+                    <a href="{{ route('admin.services.option.export', ['option' => $option->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export Option Configuration</a>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/services/view.blade.php b/resources/themes/pterodactyl/admin/services/view.blade.php
index 2a6886f01..f93e75a73 100644
--- a/resources/themes/pterodactyl/admin/services/view.blade.php
+++ b/resources/themes/pterodactyl/admin/services/view.blade.php
@@ -101,7 +101,7 @@
                     @foreach($service->options as $option)
                         <tr>
                             <td><a href="{{ route('admin.services.option.view', $option->id) }}">{{ $option->name }}</a></td>
-                            <td>{!! $option->description !!}</td>
+                            <td class="col-xs-6">{!! $option->description !!}</td>
                             <td><code>{{ $option->tag }}</code></td>
                             <td class="text-center">{{ $option->servers->count() }}</td>
                         </tr>
diff --git a/routes/admin.php b/routes/admin.php
index d5f16e813..6e1e93703 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -155,6 +155,7 @@ Route::group(['prefix' => 'services'], function () {
     Route::get('/view/{service}/functions', 'ServiceController@viewFunctions')->name('admin.services.view.functions');
     Route::get('/option/new', 'OptionController@create')->name('admin.services.option.new');
     Route::get('/option/{option}', 'OptionController@viewConfiguration')->name('admin.services.option.view');
+    Route::get('/option/{option}/export', 'Services\Options\OptionShareController@export')->name('admin.services.option.export');
     Route::get('/option/{option}/variables', 'VariableController@view')->name('admin.services.option.variables');
     Route::get('/option/{option}/scripts', 'OptionController@viewScripts')->name('admin.services.option.scripts');
 

From d608c313c3a6763987b36325f81eabfbfd9fe232 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 20:18:27 -0500
Subject: [PATCH 06/34] Complete the service option export configuration

---
 .../ServiceOptionRepositoryInterface.php      | 18 +++--
 .../Controllers/Admin/OptionController.php    |  2 +-
 .../Options/OptionShareController.php         | 10 ++-
 app/Models/ServiceOption.php                  | 66 ++++++++++++++++---
 .../Eloquent/ServiceOptionRepository.php      | 43 +++++++++---
 .../Services/Exporter/XMLExporterService.php  | 42 ++++++++----
 6 files changed, 141 insertions(+), 40 deletions(-)

diff --git a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
index 825c63d8b..331073e87 100644
--- a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
+++ b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
@@ -9,23 +9,29 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\ServiceOption;
+
 interface ServiceOptionRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return a service option with the variables relation attached.
      *
      * @param int $id
-     * @return mixed
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithVariables($id);
+    public function getWithVariables(int $id): ServiceOption;
 
     /**
-     * Return a service option with the copyFrom relation loaded onto the model.
+     * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
      *
      * @param int $id
-     * @return mixed
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCopyFrom($id);
+    public function getWithCopyAttributes(int $id): ServiceOption;
 
     /**
      * Confirm a copy script belongs to the same service as the item trying to use it.
@@ -34,5 +40,5 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface
      * @param int $service
      * @return bool
      */
-    public function isCopiableScript($copyFromId, $service);
+    public function isCopiableScript(int $copyFromId, int $service): bool;
 }
diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
index f35c47119..3919fe9bf 100644
--- a/app/Http/Controllers/Admin/OptionController.php
+++ b/app/Http/Controllers/Admin/OptionController.php
@@ -163,7 +163,7 @@ class OptionController extends Controller
      */
     public function viewScripts($option)
     {
-        $option = $this->serviceOptionRepository->getWithCopyFrom($option);
+        $option = $this->serviceOptionRepository->getWithCopyAttributes($option);
         $copyOptions = $this->serviceOptionRepository->findWhere([
             ['copy_script_from', '=', null],
             ['service_id', '=', $option->service_id],
diff --git a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
index bdf8c8c41..f46ee669d 100644
--- a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
+++ b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
@@ -11,6 +11,7 @@ namespace Pterodactyl\Http\Controllers\Admin\Services\Options;
 
 use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
+use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Services\Exporter\XMLExporterService;
 
 class OptionShareController extends Controller
@@ -32,13 +33,16 @@ class OptionShareController extends Controller
 
     /**
      * @param \Pterodactyl\Models\ServiceOption $option
-     * @return $this
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function export(ServiceOption $option)
+    public function export(ServiceOption $option): Response
     {
-        return response($this->exporterService->handle($option), 200, [
+        return response($this->exporterService->handle($option->id), 200, [
+            'Content-Transfer-Encoding' => 'binary',
+            'Content-Description' => 'File Transfer',
+            'Content-Disposition' => 'attachment; filename=' . kebab_case($option->name) . '.xml',
             'Content-Type' => 'application/xml',
         ]);
     }
diff --git a/app/Models/ServiceOption.php b/app/Models/ServiceOption.php
index db5ec4c1f..1dd98c322 100644
--- a/app/Models/ServiceOption.php
+++ b/app/Models/ServiceOption.php
@@ -114,7 +114,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @return string
      */
-    public function getDisplayStartupAttribute($value)
+    public function getDisplayStartupAttribute()
     {
         return (is_null($this->startup)) ? $this->service->startup : $this->startup;
     }
@@ -125,9 +125,9 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @return string
      */
-    public function getCopyScriptInstallAttribute($value)
+    public function getCopyScriptInstallAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_install : $this->copyFrom->script_install;
+        return (is_null($this->copy_script_from)) ? $this->script_install : $this->scriptFrom->script_install;
     }
 
     /**
@@ -136,9 +136,9 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @return string
      */
-    public function getCopyScriptEntryAttribute($value)
+    public function getCopyScriptEntryAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_entry : $this->copyFrom->script_entry;
+        return (is_null($this->copy_script_from)) ? $this->script_entry : $this->scriptFrom->script_entry;
     }
 
     /**
@@ -147,9 +147,49 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @return string
      */
-    public function getCopyScriptContainerAttribute($value)
+    public function getCopyScriptContainerAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_container : $this->copyFrom->script_container;
+        return (is_null($this->copy_script_from)) ? $this->script_container : $this->scriptFrom->script_container;
+    }
+
+    /**
+     * Return the file configuration for a service option.
+     *
+     * @return string
+     */
+    public function getInheritConfigFilesAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_files : $this->configFrom->config_files;
+    }
+
+    /**
+     * Return the startup configuration for a service option.
+     *
+     * @return string
+     */
+    public function getInheritConfigStartupAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_startup : $this->configFrom->config_startup;
+    }
+
+    /**
+     * Return the log reading configuration for a service option.
+     *
+     * @return string
+     */
+    public function getInheritConfigLogsAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_logs : $this->configFrom->config_logs;
+    }
+
+    /**
+     * Return the stop command configuration for a service option.
+     *
+     * @return string
+     */
+    public function getInheritConfigStopAttribute()
+    {
+        return is_null($this->config_from) ? $this->config_stop : $this->configFrom->config_stop;
     }
 
     /**
@@ -197,8 +237,18 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function copyFrom()
+    public function scriptFrom()
     {
         return $this->belongsTo(self::class, 'copy_script_from');
     }
+
+    /**
+     * Get the parent service option from which to copy configuration settings.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function configFrom()
+    {
+        return $this->belongsTo(self::class, 'config_from');
+    }
 }
diff --git a/app/Repositories/Eloquent/ServiceOptionRepository.php b/app/Repositories/Eloquent/ServiceOptionRepository.php
index a2bcd0eb8..623899890 100644
--- a/app/Repositories/Eloquent/ServiceOptionRepository.php
+++ b/app/Repositories/Eloquent/ServiceOptionRepository.php
@@ -10,6 +10,7 @@
 namespace Pterodactyl\Repositories\Eloquent;
 
 use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 
 class ServiceOptionRepository extends EloquentRepository implements ServiceOptionRepositoryInterface
@@ -23,25 +24,51 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
     }
 
     /**
-     * {@inheritdoc}
+     * Return a service option with the variables relation attached.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithVariables($id)
+    public function getWithVariables(int $id): ServiceOption
     {
-        return $this->getBuilder()->with('variables')->find($id, $this->getColumns());
+        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        $instance = $this->getBuilder()->with('variables')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
     }
 
     /**
-     * {@inheritdoc}
+     * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCopyFrom($id)
+    public function getWithCopyAttributes(int $id): ServiceOption
     {
-        return $this->getBuilder()->with('copyFrom')->find($id, $this->getColumns());
+        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
     }
 
     /**
-     * {@inheritdoc}
+     * Confirm a copy script belongs to the same service as the item trying to use it.
+     *
+     * @param int $copyFromId
+     * @param int $service
+     * @return bool
      */
-    public function isCopiableScript($copyFromId, $service)
+    public function isCopiableScript(int $copyFromId, int $service): bool
     {
         return $this->getBuilder()->whereNull('copy_script_from')
             ->where('id', '=', $copyFromId)
diff --git a/app/Services/Services/Exporter/XMLExporterService.php b/app/Services/Services/Exporter/XMLExporterService.php
index 5570a45c5..ca621fc2e 100644
--- a/app/Services/Services/Exporter/XMLExporterService.php
+++ b/app/Services/Services/Exporter/XMLExporterService.php
@@ -9,10 +9,10 @@
 
 namespace Pterodactyl\Services\Services\Exporter;
 
+use Closure;
 use Carbon\Carbon;
 use Sabre\Xml\Writer;
 use Sabre\Xml\Service;
-use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 
 class XMLExporterService
@@ -58,35 +58,36 @@ class XMLExporterService
     /**
      * Return an XML structure to represent this service option.
      *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
+     * @param int $option
      * @return string
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($option): string
+    public function handle(int $option): string
     {
-        if (! $option instanceof ServiceOption) {
-            $option = $this->repository->find($option);
-        }
+        $option = $this->repository->getWithCopyAttributes($option);
 
         $struct = [
+            'meta' => [
+                'version' => 'PTDL_v1',
+            ],
             'exported_at' => $this->carbon->now()->toIso8601String(),
             'name' => $option->name,
             'author' => array_get(explode(':', $option->tag), 0),
             'tag' => $option->tag,
-            'description' => $option->description,
+            'description' => $this->writeCData($option->description),
             'image' => $option->docker_image,
             'config' => [
-                'files' => $option->config_files,
-                'startup' => $option->config_startup,
-                'logs' => $option->config_logs,
-                'stop' => $option->config_stop,
+                'files' => $this->writeCData($option->inherit_config_files),
+                'startup' => $this->writeCData($option->inherit_config_startup),
+                'logs' => $this->writeCData($option->inherit_config_logs),
+                'stop' => $option->inherit_config_stop,
             ],
             'scripts' => [
                 'installation' => [
-                    'script' => function (Writer $writer) use ($option) {
-                        return $writer->writeCData($option->copy_script_install);
-                    },
+                    'script' => $this->writeCData($option->copy_script_install),
+                    'container' => $option->copy_script_container,
+                    'entrypoint' => $option->copy_script_entry,
                 ],
             ],
         ];
@@ -115,4 +116,17 @@ class XMLExporterService
 
         return $parsed;
     }
+
+    /**
+     * Return a closure to be used by the XML writer to generate a string wrapped in CDATA tags.
+     *
+     * @param string $value
+     * @return \Closure
+     */
+    protected function writeCData(string $value): Closure
+    {
+        return function (Writer $writer) use ($value) {
+            return $writer->writeCData($value);
+        };
+    }
 }

From 6269a08db7565c905983703ce7e403b86aa0ec93 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 23:31:04 -0500
Subject: [PATCH 07/34] Finalize service option import/export

---
 .../ServiceOptionRepositoryInterface.php      |  10 ++
 .../Repository/ServiceRepositoryInterface.php |  17 ++-
 .../DuplicateOptionTagException.php           |  16 +++
 .../Options/OptionShareController.php         |  43 +++++-
 .../Admin/Service/OptionImportFormRequest.php |  26 ++++
 app/Models/ServiceOption.php                  |   5 +-
 .../Eloquent/ServiceOptionRepository.php      |  19 +++
 .../Eloquent/ServiceRepository.php            |  26 +++-
 .../Services/Exporter/XMLExporterService.php  | 132 ------------------
 .../Sharing/ServiceOptionExporterService.php  |  87 ++++++++++++
 .../Sharing/ServiceOptionImporterService.php  | 123 ++++++++++++++++
 composer.json                                 |   1 -
 composer.lock                                 | 116 +--------------
 resources/lang/en/exceptions.php              |   5 +
 .../admin/services/index.blade.php            |  49 ++++++-
 routes/admin.php                              |   1 +
 16 files changed, 405 insertions(+), 271 deletions(-)
 create mode 100644 app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
 create mode 100644 app/Http/Requests/Admin/Service/OptionImportFormRequest.php
 delete mode 100644 app/Services/Services/Exporter/XMLExporterService.php
 create mode 100644 app/Services/Services/Sharing/ServiceOptionExporterService.php
 create mode 100644 app/Services/Services/Sharing/ServiceOptionImporterService.php

diff --git a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
index 331073e87..c7acd5a45 100644
--- a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
+++ b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
@@ -33,6 +33,16 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface
      */
     public function getWithCopyAttributes(int $id): ServiceOption;
 
+    /**
+     * Return all of the data needed to export a service.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithExportAttributes(int $id): ServiceOption;
+
     /**
      * Confirm a copy script belongs to the same service as the item trying to use it.
      *
diff --git a/app/Contracts/Repository/ServiceRepositoryInterface.php b/app/Contracts/Repository/ServiceRepositoryInterface.php
index 7f710e624..c514c1cf7 100644
--- a/app/Contracts/Repository/ServiceRepositoryInterface.php
+++ b/app/Contracts/Repository/ServiceRepositoryInterface.php
@@ -10,7 +10,6 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Pterodactyl\Models\Service;
-use Illuminate\Support\Collection;
 
 interface ServiceRepositoryInterface extends RepositoryInterface
 {
@@ -18,23 +17,29 @@ interface ServiceRepositoryInterface extends RepositoryInterface
      * Return a service or all services with their associated options, variables, and packs.
      *
      * @param int $id
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptions(int $id = null): Collection;
+    public function getWithOptions(int $id = null);
 
     /**
      * Return a service or all services and the count of options, packs, and servers for that service.
      *
      * @param int|null $id
-     * @return \Illuminate\Support\Collection
+     * @return \Pterodactyl\Models\Service|\Illuminate\Database\Eloquent\Collection
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCounts(int $id = null): Collection;
+    public function getWithCounts(int $id = null);
 
     /**
      * Return a service along with its associated options and the servers relation on those options.
      *
      * @param int $id
-     * @return mixed
+     * @return \Pterodactyl\Models\Service
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithOptionServers(int $id): Service;
 }
diff --git a/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php b/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
new file mode 100644
index 000000000..070beda42
--- /dev/null
+++ b/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Exceptions\Service\ServiceOption;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class DuplicateOptionTagException extends DisplayException
+{
+}
diff --git a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
index f46ee669d..76f58eb70 100644
--- a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
+++ b/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
@@ -9,26 +9,38 @@
 
 namespace Pterodactyl\Http\Controllers\Admin\Services\Options;
 
+use Illuminate\Http\RedirectResponse;
 use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
-use Pterodactyl\Services\Services\Exporter\XMLExporterService;
+use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
+use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
+use Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService;
 
 class OptionShareController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Exporter\XMLExporterService
+     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService
      */
     protected $exporterService;
 
+    /**
+     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService
+     */
+    protected $importerService;
+
     /**
      * OptionShareController constructor.
      *
-     * @param \Pterodactyl\Services\Services\Exporter\XMLExporterService $exporterService
+     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService $exporterService
+     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService $importerService
      */
-    public function __construct(XMLExporterService $exporterService)
-    {
+    public function __construct(
+        ServiceOptionExporterService $exporterService,
+        ServiceOptionImporterService $importerService
+    ) {
         $this->exporterService = $exporterService;
+        $this->importerService = $importerService;
     }
 
     /**
@@ -42,8 +54,25 @@ class OptionShareController extends Controller
         return response($this->exporterService->handle($option->id), 200, [
             'Content-Transfer-Encoding' => 'binary',
             'Content-Description' => 'File Transfer',
-            'Content-Disposition' => 'attachment; filename=' . kebab_case($option->name) . '.xml',
-            'Content-Type' => 'application/xml',
+            'Content-Disposition' => 'attachment; filename=' . kebab_case($option->name) . '.json',
+            'Content-Type' => 'application/json',
         ]);
     }
+
+    /**
+     * Import a new service option using an XML file.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     */
+    public function import(OptionImportFormRequest $request): RedirectResponse
+    {
+        $option = $this->importerService->handle($request->file('import_file'), $request->input('import_to_service'));
+
+        return redirect()->route('admin.services.option.view', ['option' => $option->id]);
+    }
 }
diff --git a/app/Http/Requests/Admin/Service/OptionImportFormRequest.php b/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
new file mode 100644
index 000000000..8e90087ca
--- /dev/null
+++ b/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Requests\Admin\Service;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class OptionImportFormRequest extends AdminFormRequest
+{
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
+            'import_to_service' => 'bail|required|integer|exists:services,id',
+        ];
+    }
+}
diff --git a/app/Models/ServiceOption.php b/app/Models/ServiceOption.php
index 1dd98c322..f4bc72eaa 100644
--- a/app/Models/ServiceOption.php
+++ b/app/Models/ServiceOption.php
@@ -65,7 +65,6 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      */
     protected static $applicationRules = [
         'service_id' => 'required',
-        'author' => 'required',
         'name' => 'required',
         'description' => 'required',
         'tag' => 'required',
@@ -83,10 +82,10 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      */
     protected static $dataIntegrityRules = [
         'service_id' => 'bail|numeric|exists:services,id',
-        'author' => 'email',
+        'uuid' => 'string|size:36',
         'name' => 'string|max:255',
         'description' => 'string',
-        'tag' => 'bail|alpha_num|max:60|unique:service_options,tag',
+        'tag' => 'bail|string|max:150',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
         'config_from' => 'bail|nullable|numeric|exists:service_options,id',
diff --git a/app/Repositories/Eloquent/ServiceOptionRepository.php b/app/Repositories/Eloquent/ServiceOptionRepository.php
index 623899890..5d8bec31d 100644
--- a/app/Repositories/Eloquent/ServiceOptionRepository.php
+++ b/app/Repositories/Eloquent/ServiceOptionRepository.php
@@ -61,6 +61,25 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
         return $instance;
     }
 
+    /**
+     * Return all of the data needed to export a service.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithExportAttributes(int $id): ServiceOption
+    {
+        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom', 'variables')->find($id, $this->getColumns());
+        if (! $instance) {
+            throw new RecordNotFoundException;
+        }
+
+        return $instance;
+    }
+
     /**
      * Confirm a copy script belongs to the same service as the item trying to use it.
      *
diff --git a/app/Repositories/Eloquent/ServiceRepository.php b/app/Repositories/Eloquent/ServiceRepository.php
index 95d9224e5..1a4fe659c 100644
--- a/app/Repositories/Eloquent/ServiceRepository.php
+++ b/app/Repositories/Eloquent/ServiceRepository.php
@@ -10,7 +10,6 @@
 namespace Pterodactyl\Repositories\Eloquent;
 
 use Pterodactyl\Models\Service;
-use Illuminate\Support\Collection;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
@@ -25,9 +24,14 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     }
 
     /**
-     * {@inheritdoc}
+     * Return a service or all services with their associated options, variables, and packs.
+     *
+     * @param int $id
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptions(int $id = null): Collection
+    public function getWithOptions(int $id = null)
     {
         $instance = $this->getBuilder()->with('options.packs', 'options.variables');
 
@@ -44,9 +48,14 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     }
 
     /**
-     * {@inheritdoc}
+     * Return a service or all services and the count of options, packs, and servers for that service.
+     *
+     * @param int|null $id
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCounts(int $id = null): Collection
+    public function getWithCounts(int $id = null)
     {
         $instance = $this->getBuilder()->withCount(['options', 'packs', 'servers']);
 
@@ -63,7 +72,12 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     }
 
     /**
-     * {@inheritdoc}
+     * Return a service along with its associated options and the servers relation on those options.
+     *
+     * @param int $id
+     * @return \Pterodactyl\Models\Service
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithOptionServers(int $id): Service
     {
diff --git a/app/Services/Services/Exporter/XMLExporterService.php b/app/Services/Services/Exporter/XMLExporterService.php
deleted file mode 100644
index ca621fc2e..000000000
--- a/app/Services/Services/Exporter/XMLExporterService.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Exporter;
-
-use Closure;
-use Carbon\Carbon;
-use Sabre\Xml\Writer;
-use Sabre\Xml\Service;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-
-class XMLExporterService
-{
-    const XML_OPTION_NAMESPACE = '{https://pterodactyl.io/exporter/option/}';
-
-    /**
-     * @var \Carbon\Carbon
-     */
-    protected $carbon;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var \Sabre\Xml\Service
-     */
-    protected $xml;
-
-    /**
-     * XMLExporterService constructor.
-     *
-     * @param \Carbon\Carbon                                                     $carbon
-     * @param \Sabre\Xml\Service                                                 $xml
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(
-        Carbon $carbon,
-        Service $xml,
-        ServiceOptionRepositoryInterface $repository
-    ) {
-        $this->carbon = $carbon;
-        $this->repository = $repository;
-        $this->xml = $xml;
-
-        $this->xml->namespaceMap = [
-            str_replace(['{', '}'], '', self::XML_OPTION_NAMESPACE) => 'p',
-        ];
-    }
-
-    /**
-     * Return an XML structure to represent this service option.
-     *
-     * @param int $option
-     * @return string
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function handle(int $option): string
-    {
-        $option = $this->repository->getWithCopyAttributes($option);
-
-        $struct = [
-            'meta' => [
-                'version' => 'PTDL_v1',
-            ],
-            'exported_at' => $this->carbon->now()->toIso8601String(),
-            'name' => $option->name,
-            'author' => array_get(explode(':', $option->tag), 0),
-            'tag' => $option->tag,
-            'description' => $this->writeCData($option->description),
-            'image' => $option->docker_image,
-            'config' => [
-                'files' => $this->writeCData($option->inherit_config_files),
-                'startup' => $this->writeCData($option->inherit_config_startup),
-                'logs' => $this->writeCData($option->inherit_config_logs),
-                'stop' => $option->inherit_config_stop,
-            ],
-            'scripts' => [
-                'installation' => [
-                    'script' => $this->writeCData($option->copy_script_install),
-                    'container' => $option->copy_script_container,
-                    'entrypoint' => $option->copy_script_entry,
-                ],
-            ],
-        ];
-
-        return $this->xml->write(self::XML_OPTION_NAMESPACE . 'root', $this->recursiveArrayKeyPrepend($struct));
-    }
-
-    /**
-     * @param array  $array
-     * @param string $prepend
-     *
-     * @return array
-     */
-    protected function recursiveArrayKeyPrepend(array $array, $prepend = self::XML_OPTION_NAMESPACE): array
-    {
-        $parsed = [];
-        foreach ($array as $k => &$v) {
-            $k = $prepend . $k;
-
-            if (is_array($v)) {
-                $v = $this->recursiveArrayKeyPrepend($v);
-            }
-
-            $parsed[$k] = $v;
-        }
-
-        return $parsed;
-    }
-
-    /**
-     * Return a closure to be used by the XML writer to generate a string wrapped in CDATA tags.
-     *
-     * @param string $value
-     * @return \Closure
-     */
-    protected function writeCData(string $value): Closure
-    {
-        return function (Writer $writer) use ($value) {
-            return $writer->writeCData($value);
-        };
-    }
-}
diff --git a/app/Services/Services/Sharing/ServiceOptionExporterService.php b/app/Services/Services/Sharing/ServiceOptionExporterService.php
new file mode 100644
index 000000000..744d298a4
--- /dev/null
+++ b/app/Services/Services/Sharing/ServiceOptionExporterService.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Services\Sharing;
+
+use Carbon\Carbon;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+
+class ServiceOptionExporterService
+{
+    /**
+     * @var \Carbon\Carbon
+     */
+    protected $carbon;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * XMLExporterService constructor.
+     *
+     * @param \Carbon\Carbon                                                     $carbon
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     */
+    public function __construct(
+        Carbon $carbon,
+        ServiceOptionRepositoryInterface $repository
+    ) {
+        $this->carbon = $carbon;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return an XML structure to represent this service option.
+     *
+     * @param int $option
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle(int $option): string
+    {
+        $option = $this->repository->getWithExportAttributes($option);
+
+        $struct = [
+            '_comment' => 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO',
+            'meta' => [
+                'version' => 'PTDL_v1',
+            ],
+            'exported_at' => $this->carbon->now()->toIso8601String(),
+            'name' => $option->name,
+            'author' => array_get(explode(':', $option->tag), 0),
+            'tag' => $option->tag,
+            'description' => $option->description,
+            'image' => $option->docker_image,
+            'startup' => $option->display_startup,
+            'config' => [
+                'files' => $option->inherit_config_files,
+                'startup' => $option->inherit_config_startup,
+                'logs' => $option->inherit_config_logs,
+                'stop' => $option->inherit_config_stop,
+            ],
+            'scripts' => [
+                'installation' => [
+                    'script' => $option->copy_script_install,
+                    'container' => $option->copy_script_container,
+                    'entrypoint' => $option->copy_script_entry,
+                ],
+            ],
+            'variables' => $option->variables->transform(function ($item) {
+                return collect($item->toArray())->except([
+                    'id', 'option_id', 'created_at', 'updated_at',
+                ])->toArray();
+            }),
+        ];
+
+        return json_encode($struct, JSON_PRETTY_PRINT);
+    }
+}
diff --git a/app/Services/Services/Sharing/ServiceOptionImporterService.php b/app/Services/Services/Sharing/ServiceOptionImporterService.php
new file mode 100644
index 000000000..4061af285
--- /dev/null
+++ b/app/Services/Services/Sharing/ServiceOptionImporterService.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Services\Sharing;
+
+use Ramsey\Uuid\Uuid;
+use Illuminate\Http\UploadedFile;
+use Pterodactyl\Models\ServiceOption;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\ServiceOption\DuplicateOptionTagException;
+
+class ServiceOptionImporterService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     */
+    protected $serviceRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
+     */
+    protected $serviceVariableRepository;
+
+    /**
+     * XMLImporterService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                             $connection
+     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface         $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface   $repository
+     * @param \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface $serviceVariableRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        ServiceRepositoryInterface $serviceRepository,
+        ServiceOptionRepositoryInterface $repository,
+        ServiceVariableRepositoryInterface $serviceVariableRepository
+    ) {
+        $this->connection = $connection;
+        $this->repository = $repository;
+        $this->serviceRepository = $serviceRepository;
+        $this->serviceVariableRepository = $serviceVariableRepository;
+    }
+
+    /**
+     * Take an uploaded XML file and parse it into a new service option.
+     *
+     * @param \Illuminate\Http\UploadedFile $file
+     * @param int                           $service
+     * @return \Pterodactyl\Models\ServiceOption
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     */
+    public function handle(UploadedFile $file, int $service): ServiceOption
+    {
+        if (! $file->isValid() || ! $file->isFile()) {
+            throw new InvalidFileUploadException(trans('exceptions.service.exporter.import_file_error'));
+        }
+
+        $parsed = json_decode($file->openFile()->fread($file->getSize()));
+
+        if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
+            throw new InvalidFileUploadException(trans('exceptions.service.exporter.invalid_json_provided'));
+        }
+
+        $service = $this->serviceRepository->getWithOptions($service);
+        $service->options->each(function ($option) use ($parsed) {
+            if ($option->tag === object_get($parsed, 'tag')) {
+                throw new DuplicateOptionTagException(trans('exceptions.service.options.duplicate_tag'));
+            }
+        });
+
+        $this->connection->beginTransaction();
+        $option = $this->repository->create([
+            'uuid' => Uuid::uuid4()->toString(),
+            'service_id' => $service->id,
+            'name' => object_get($parsed, 'name'),
+            'description' => object_get($parsed, 'description'),
+            'tag' => object_get($parsed, 'tag'),
+            'docker_image' => object_get($parsed, 'image'),
+            'config_files' => object_get($parsed, 'config.files'),
+            'config_startup' => object_get($parsed, 'config.startup'),
+            'config_logs' => object_get($parsed, 'config.logs'),
+            'config_stop' => object_get($parsed, 'config.stop'),
+            'startup' => object_get($parsed, 'startup'),
+            'script_install' => object_get($parsed, 'scripts.installation.script'),
+            'script_entry' => object_get($parsed, 'scripts.installation.entrypoint'),
+            'script_container' => object_get($parsed, 'scripts.installation.container'),
+            'copy_script_from' => null,
+        ], true, true);
+
+        collect($parsed->variables)->each(function ($variable) use ($option) {
+            $this->serviceVariableRepository->create(array_merge((array) $variable, [
+                'option_id' => $option->id,
+            ]));
+        });
+
+        $this->connection->commit();
+
+        return $option;
+    }
+}
diff --git a/composer.json b/composer.json
index d0aa38e74..db04ade72 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,6 @@
         "prologue/alerts": "^0.4",
         "ramsey/uuid": "^3.7",
         "s1lentium/iptools": "^1.1",
-        "sabre/xml": "^2.0",
         "sofa/eloquence": "~5.4.1",
         "spatie/laravel-fractal": "^4.0",
         "watson/validating": "^3.0",
diff --git a/composer.lock b/composer.lock
index 34bb845a4..4c112e5f4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "bc8c88f86ea043406bce2f8fddf704b3",
+    "content-hash": "46a0a06ec8f3af50ed6ec05c2bb3b9a3",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -2510,120 +2510,6 @@
             ],
             "time": "2016-08-21T15:57:09+00:00"
         },
-        {
-            "name": "sabre/uri",
-            "version": "2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fruux/sabre-uri.git",
-                "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-uri/zipball/a42126042c7dcb53e2978dadb6d22574d1359b4c",
-                "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0",
-                "sabre/cs": "~1.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
-                "psr-4": {
-                    "Sabre\\Uri\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Evert Pot",
-                    "email": "me@evertpot.com",
-                    "homepage": "http://evertpot.com/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Functions for making sense out of URIs.",
-            "homepage": "http://sabre.io/uri/",
-            "keywords": [
-                "rfc3986",
-                "uri",
-                "url"
-            ],
-            "time": "2017-02-20T20:02:35+00:00"
-        },
-        {
-            "name": "sabre/xml",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fruux/sabre-xml.git",
-                "reference": "054292959a1f2b64c10c9c7a03a816ba1872b8a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/054292959a1f2b64c10c9c7a03a816ba1872b8a3",
-                "reference": "054292959a1f2b64c10c9c7a03a816ba1872b8a3",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlreader": "*",
-                "ext-xmlwriter": "*",
-                "lib-libxml": ">=2.6.20",
-                "php": ">=7.0",
-                "sabre/uri": ">=1.0,<3.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "*",
-                "sabre/cs": "~1.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Sabre\\Xml\\": "lib/"
-                },
-                "files": [
-                    "lib/Deserializer/functions.php",
-                    "lib/Serializer/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Evert Pot",
-                    "email": "me@evertpot.com",
-                    "homepage": "http://evertpot.com/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Markus Staab",
-                    "email": "markus.staab@redaxo.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "sabre/xml is an XML library that you may not hate.",
-            "homepage": "https://sabre.io/xml/",
-            "keywords": [
-                "XMLReader",
-                "XMLWriter",
-                "dom",
-                "xml"
-            ],
-            "time": "2016-11-16T00:41:01+00:00"
-        },
         {
             "name": "sofa/eloquence",
             "version": "5.4.1",
diff --git a/resources/lang/en/exceptions.php b/resources/lang/en/exceptions.php
index 2a8f1e047..7d42e1621 100644
--- a/resources/lang/en/exceptions.php
+++ b/resources/lang/en/exceptions.php
@@ -21,6 +21,7 @@ return [
     'service' => [
         'delete_has_servers' => 'A service with active servers attached to it cannot be deleted from the Panel.',
         'options' => [
+            'duplicate_tag' => 'A service option with that tag already exists for this service.',
             'delete_has_servers' => 'A service option with active servers attached to it cannot be deleted from the Panel.',
             'invalid_copy_id' => 'The service option selected for copying a script from either does not exist, or is copying a script itself.',
             'must_be_child' => 'The "Copy Settings From" directive for this option must be a child option for the selected service.',
@@ -30,6 +31,10 @@ return [
             'env_not_unique' => 'The environment variable :name must be unique to this service option.',
             'reserved_name' => 'The environment variable :name is protected and cannot be assigned to a variable.',
         ],
+        'exporter' => [
+            'import_file_error' => 'The XML file provided was not valid.',
+            'invalid_json_provided' => 'The JSON file provided is not in a format that can be recognized.',
+        ],
     ],
     'packs' => [
         'delete_has_servers' => 'Cannot delete a pack that is attached to active servers.',
diff --git a/resources/themes/pterodactyl/admin/services/index.blade.php b/resources/themes/pterodactyl/admin/services/index.blade.php
index 3584f1f63..a1cd88212 100644
--- a/resources/themes/pterodactyl/admin/services/index.blade.php
+++ b/resources/themes/pterodactyl/admin/services/index.blade.php
@@ -31,7 +31,8 @@
             <div class="box-header with-border">
                 <h3 class="box-title">Configured Service</h3>
                 <div class="box-tools">
-                    <a href="{{ route('admin.services.new') }}"><button class="btn btn-primary btn-sm">Create New</button></a>
+                    <a href="#" class="btn btn-sm btn-success" data-toggle="modal" data-target="#importServiceOptionModal" role="button"><i class="fa fa-upload"></i> Import Service Option</a>
+                    <a href="{{ route('admin.services.new') }}" class="btn btn-primary btn-sm">Create New</a>
                 </div>
             </div>
             <div class="box-body table-responsive no-padding">
@@ -57,4 +58,50 @@
         </div>
     </div>
 </div>
+<div class="modal fade" tabindex="-1" role="dialog" id="importServiceOptionModal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">Import a Service Option</h4>
+            </div>
+            <form action="{{ route('admin.services.option.import') }}" enctype="multipart/form-data" method="POST">
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label class="control-label" for="pImportFile">Service File <span class="field-required"></span></label>
+                        <div>
+                            <input id="pImportFile" type="file" name="import_file" class="form-control" accept="application/json" />
+                            <p class="small text-muted">Select the <code>.json</code> file for the new service option that you wish to import.</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label" for="pImportToService">Associated Service <span class="field-required"></span></label>
+                        <div>
+                            <select id="pImportToService" name="import_to_service">
+                                @foreach($services as $service)
+                                   <option value="{{ $service->id }}">{{ $service->name }} &lt;{{ $service->author }}&gt;</option>
+                                @endforeach
+                            </select>
+                            <p class="small text-muted">Select the service that this option will be associated with from the dropdown. If you wish to associate it with a new service you will need to create that service before continuing.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    {{ csrf_field() }}
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Import</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('footer-scripts')
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('#pImportToService').select2();
+        });
+    </script>
 @endsection
diff --git a/routes/admin.php b/routes/admin.php
index 6e1e93703..568fa0199 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -160,6 +160,7 @@ Route::group(['prefix' => 'services'], function () {
     Route::get('/option/{option}/scripts', 'OptionController@viewScripts')->name('admin.services.option.scripts');
 
     Route::post('/new', 'ServiceController@store');
+    Route::post('/import', 'Services\Options\OptionShareController@import')->name('admin.services.option.import');
     Route::post('/option/new', 'OptionController@store');
     Route::post('/option/{option}/variables', 'VariableController@store');
 

From 9b79d9c756de51b4e0d2e9e7a0032103023f2c7a Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 23:33:46 -0500
Subject: [PATCH 08/34] Delete service variables when the option is deleted.

---
 ...cadeDeletionWhenServiceOptionIsDeleted.php | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php

diff --git a/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php b/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php
new file mode 100644
index 000000000..3b19e3d99
--- /dev/null
+++ b/database/migrations/2017_10_03_233202_CascadeDeletionWhenServiceOptionIsDeleted.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CascadeDeletionWhenServiceOptionIsDeleted extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('service_variables', function (Blueprint $table) {
+            $table->dropForeign(['option_id']);
+
+            $table->foreign('option_id')->references('id')->on('service_options')->onDelete('CASCADE');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('service_variables', function (Blueprint $table) {
+            $table->dropForeign(['option_id']);
+
+            $table->foreign('option_id')->references('id')->on('service_options');
+        });
+    }
+}

From 8952043600eecf4171a68822e4be94be3784d996 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 23:36:39 -0500
Subject: [PATCH 09/34] Fix some test runner issues

---
 app/Http/Requests/Admin/AdminFormRequest.php                | 2 +-
 app/Http/Requests/Admin/Service/OptionImportFormRequest.php | 2 +-
 app/Http/Requests/Admin/Service/ServiceFormRequest.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/Admin/AdminFormRequest.php b/app/Http/Requests/Admin/AdminFormRequest.php
index 7d5859981..887583c7d 100644
--- a/app/Http/Requests/Admin/AdminFormRequest.php
+++ b/app/Http/Requests/Admin/AdminFormRequest.php
@@ -18,7 +18,7 @@ abstract class AdminFormRequest extends FormRequest
      *
      * @return array
      */
-    abstract public function rules(): array;
+    abstract public function rules();
 
     /**
      * Determine if the user is an admin and has permission to access this
diff --git a/app/Http/Requests/Admin/Service/OptionImportFormRequest.php b/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
index 8e90087ca..5c464c658 100644
--- a/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
+++ b/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
@@ -16,7 +16,7 @@ class OptionImportFormRequest extends AdminFormRequest
     /**
      * @return array
      */
-    public function rules(): array
+    public function rules()
     {
         return [
             'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
diff --git a/app/Http/Requests/Admin/Service/ServiceFormRequest.php b/app/Http/Requests/Admin/Service/ServiceFormRequest.php
index 672f2d2f9..e469ecd54 100644
--- a/app/Http/Requests/Admin/Service/ServiceFormRequest.php
+++ b/app/Http/Requests/Admin/Service/ServiceFormRequest.php
@@ -16,7 +16,7 @@ class ServiceFormRequest extends AdminFormRequest
     /**
      * @return array
      */
-    public function rules(): array
+    public function rules()
     {
         return [
             'name' => 'required|string|min:1|max:255',

From 29ac1662b669aa0f81d8f4101fe098729f0f3eae Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 23:54:24 -0500
Subject: [PATCH 10/34] Fix failing tests

---
 .../Options/OptionCreationServiceTest.php     | 75 +++++++++++++++----
 .../Services/ServiceCreationServiceTest.php   | 16 +++-
 2 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
index dac7e7dd3..c15db8f07 100644
--- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
@@ -12,7 +12,9 @@ namespace Tests\Unit\Services\Services\Options;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
+use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\ServiceOption;
+use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Services\Services\Options\OptionCreationService;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
@@ -20,12 +22,12 @@ use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundExcep
 class OptionCreationServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Models\ServiceOption
+     * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
      */
-    protected $model;
+    protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -34,6 +36,11 @@ class OptionCreationServiceTest extends TestCase
      */
     protected $service;
 
+    /**
+     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
+     */
+    protected $uuid;
+
     /**
      * Setup tests.
      */
@@ -41,10 +48,11 @@ class OptionCreationServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->model = factory(ServiceOption::class)->make();
+        $this->config = m::mock(Repository::class);
         $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->uuid = m::mock('overload:' . Uuid::class);
 
-        $this->service = new OptionCreationService($this->repository);
+        $this->service = new OptionCreationService($this->config, $this->repository);
     }
 
     /**
@@ -52,14 +60,48 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelWithoutUsingConfigFrom()
     {
-        $this->repository->shouldReceive('create')->with(['name' => $this->model->name, 'config_from' => null])
-            ->once()->andReturn($this->model);
+        $model = factory(ServiceOption::class)->make();
 
-        $response = $this->service->handle(['name' => $this->model->name]);
+        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
+        $this->repository->shouldReceive('create')->with([
+            'name' => $model->name,
+            'config_from' => null,
+            'tag' => 'test@example.com:' . $model->tag,
+            'uuid' => 'uuid-string',
+        ], true, true)->once()->andReturn($model);
+
+        $response = $this->service->handle(['name' => $model->name, 'tag' => $model->tag]);
 
         $this->assertNotEmpty($response);
         $this->assertNull(object_get($response, 'config_from'));
-        $this->assertEquals($this->model->name, $response->name);
+        $this->assertEquals($model->name, $response->name);
+    }
+
+    /**
+     * Test that passing a bad tag into the function will set the correct tag.
+     */
+    public function testCreateNewModelUsingLongTagForm()
+    {
+        $model = factory(ServiceOption::class)->make([
+            'tag' => 'test@example.com:tag',
+        ]);
+
+        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
+        $this->repository->shouldReceive('create')->with([
+            'name' => $model->name,
+            'config_from' => null,
+            'tag' => $model->tag,
+            'uuid' => 'uuid-string',
+        ], true, true)->once()->andReturn($model);
+
+        $response = $this->service->handle(['name' => $model->name, 'tag' => 'bad@example.com:tag']);
+
+        $this->assertNotEmpty($response);
+        $this->assertNull(object_get($response, 'config_from'));
+        $this->assertEquals($model->name, $response->name);
+        $this->assertEquals('test@example.com:tag', $response->tag);
     }
 
     /**
@@ -67,10 +109,14 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelUsingConfigFrom()
     {
+        $model = factory(ServiceOption::class)->make();
+
         $data = [
-            'name' => $this->model->name,
-            'service_id' => $this->model->service_id,
+            'name' => $model->name,
+            'service_id' => $model->service_id,
+            'tag' => 'test@example.com:tag',
             'config_from' => 1,
+            'uuid' => 'uuid-string',
         ];
 
         $this->repository->shouldReceive('findCountWhere')->with([
@@ -78,13 +124,14 @@ class OptionCreationServiceTest extends TestCase
             ['id', '=', $data['config_from']],
         ])->once()->andReturn(1);
 
-        $this->repository->shouldReceive('create')->with($data)
-            ->once()->andReturn($this->model);
+        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
+        $this->repository->shouldReceive('create')->with($data, true, true)->once()->andReturn($model);
 
         $response = $this->service->handle($data);
 
         $this->assertNotEmpty($response);
-        $this->assertEquals($response, $this->model);
+        $this->assertEquals($response, $model);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/ServiceCreationServiceTest.php b/tests/Unit/Services/Services/ServiceCreationServiceTest.php
index c1e64d9b9..0abc4febf 100644
--- a/tests/Unit/Services/Services/ServiceCreationServiceTest.php
+++ b/tests/Unit/Services/Services/ServiceCreationServiceTest.php
@@ -11,6 +11,7 @@ namespace Tests\Unit\Services\Services;
 
 use Mockery as m;
 use Tests\TestCase;
+use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Service;
 use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
@@ -22,12 +23,12 @@ class ServiceCreationServiceTest extends TestCase
     use CreatesServiceIndex;
 
     /**
-     * @var \Illuminate\Contracts\Config\Repository
+     * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
      */
     protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -36,6 +37,11 @@ class ServiceCreationServiceTest extends TestCase
      */
     protected $service;
 
+    /**
+     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
+     */
+    protected $uuid;
+
     /**
      * Setup tests.
      */
@@ -45,6 +51,7 @@ class ServiceCreationServiceTest extends TestCase
 
         $this->config = m::mock(Repository::class);
         $this->repository = m::mock(ServiceRepositoryInterface::class);
+        $this->uuid = m::mock('overload:' . Uuid::class);
 
         $this->service = new ServiceCreationService($this->config, $this->repository);
     }
@@ -62,15 +69,16 @@ class ServiceCreationServiceTest extends TestCase
             'startup' => $model->startup,
         ];
 
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
         $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('0000-author');
         $this->repository->shouldReceive('create')->with([
+            'uuid' => 'uuid-0000',
             'author' => '0000-author',
             'name' => $data['name'],
             'description' => $data['description'],
-            'folder' => $data['folder'],
             'startup' => $data['startup'],
             'index_file' => $this->getIndexScript(),
-        ])->once()->andReturn($model);
+        ], true, true)->once()->andReturn($model);
 
         $response = $this->service->handle($data);
         $this->assertInstanceOf(Service::class, $response);

From 3e689cf21255ef6ef54fa5af3e501b1632d09479 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 3 Oct 2017 23:57:13 -0500
Subject: [PATCH 11/34] Please fix failing tests? :hand:

---
 app/Http/Requests/Admin/AdminFormRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Admin/AdminFormRequest.php b/app/Http/Requests/Admin/AdminFormRequest.php
index 887583c7d..7f7ce8cb7 100644
--- a/app/Http/Requests/Admin/AdminFormRequest.php
+++ b/app/Http/Requests/Admin/AdminFormRequest.php
@@ -26,7 +26,7 @@ abstract class AdminFormRequest extends FormRequest
      *
      * @return bool
      */
-    public function authorize(): bool
+    public function authorize()
     {
         if (is_null($this->user())) {
             return false;
@@ -42,7 +42,7 @@ abstract class AdminFormRequest extends FormRequest
      * @param array $only
      * @return array
      */
-    public function normalize($only = []): array
+    public function normalize($only = [])
     {
         return array_merge(
             $this->only($only),

From d95a63c09bda5df31fdc0255d66b91301233599e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 4 Oct 2017 22:41:15 -0500
Subject: [PATCH 12/34] Today Dane learned about Mockery::subset, tomorrow we
 take over Canada.

In other news, why could no one have mentioned this a few months ago. Would have been nice.
---
 database/factories/ModelFactory.php           |   5 +-
 .../ServiceOptionImporterServiceTest.php      | 202 ++++++++++++++++++
 2 files changed, 204 insertions(+), 3 deletions(-)
 create mode 100644 tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 1d069a26d..d61f46cc0 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -103,10 +103,11 @@ $factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $f
 $factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
+        'uuid' => $faker->unique()->uuid,
         'service_id' => $faker->unique()->randomNumber(),
         'name' => $faker->name,
         'description' => implode(' ', $faker->sentences(3)),
-        'tag' => $faker->unique()->randomNumber(5),
+        'tag' => 'test@testfactory.com:' . $faker->unique()->randomNumber(8),
     ];
 });
 
@@ -120,8 +121,6 @@ $factory->define(Pterodactyl\Models\ServiceVariable::class, function (Faker\Gene
         'user_viewable' => 0,
         'user_editable' => 0,
         'rules' => 'required|string',
-        'created_at' => \Carbon\Carbon::now(),
-        'updated_at' => \Carbon\Carbon::now(),
     ];
 });
 
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php b/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
new file mode 100644
index 000000000..6dbdc5a53
--- /dev/null
+++ b/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Unit\Services\Services\Sharing;
+
+use Mockery as m;
+use Tests\TestCase;
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Service;
+use Illuminate\Http\UploadedFile;
+use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\ServiceVariable;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService;
+use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\ServiceOption\DuplicateOptionTagException;
+
+class ServiceOptionImporterServiceTest extends TestCase
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
+     */
+    protected $connection;
+
+    /**
+     * @var \Illuminate\Http\UploadedFile|\Mockery\Mock
+     */
+    protected $file;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService
+     */
+    protected $service;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface|\Mockery\Mock
+     */
+    protected $serviceRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface|\Mockery\Mock
+     */
+    protected $serviceVariableRepository;
+
+    /**
+     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
+     */
+    protected $uuid;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->connection = m::mock(ConnectionInterface::class);
+        $this->file = m::mock(UploadedFile::class);
+        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->serviceRepository = m::mock(ServiceRepositoryInterface::class);
+        $this->serviceVariableRepository = m::mock(ServiceVariableRepositoryInterface::class);
+        $this->uuid = m::mock('overload:' . Uuid::class);
+
+        $this->service = new ServiceOptionImporterService(
+            $this->connection, $this->serviceRepository, $this->repository, $this->serviceVariableRepository
+        );
+    }
+
+    /**
+     * Test that a service option can be successfully imported.
+     */
+    public function testServiceOptionIsImported()
+    {
+        $option = factory(ServiceOption::class)->make();
+        $service = factory(Service::class)->make();
+        $service->options = collect([factory(ServiceOption::class)->make()]);
+
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'PTDL_v1'],
+            'name' => $option->name,
+            'tag' => $option->tag,
+            'variables' => [
+                $variable = factory(ServiceVariable::class)->make(),
+            ],
+        ]));
+        $this->serviceRepository->shouldReceive('getWithOptions')->with($service->id)->once()->andReturn($service);
+
+        $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn($option->uuid);
+        $this->repository->shouldReceive('create')->with(m::subset([
+            'uuid' => $option->uuid,
+            'service_id' => $service->id,
+            'name' => $option->name,
+            'tag' => $option->tag,
+        ]), true, true)->once()->andReturn($option);
+
+        $this->serviceVariableRepository->shouldReceive('create')->with(m::subset([
+            'option_id' => $option->id,
+            'env_variable' => $variable->env_variable,
+        ]))->once()->andReturnNull();
+        $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
+
+        $response = $this->service->handle($this->file, $service->id);
+        $this->assertNotEmpty($response);
+        $this->assertInstanceOf(ServiceOption::class, $response);
+        $this->assertSame($option, $response);
+    }
+
+    /**
+     * Test that an exception is thrown if the file is invalid.
+     */
+    public function testExceptionIsThrownIfFileIsInvalid()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(false);
+        try {
+            $this->service->handle($this->file, 1234);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.service.exporter.import_file_error'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if the file is not a file.
+     */
+    public function testExceptionIsThrownIfFileIsNotAFile()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(false);
+
+        try {
+            $this->service->handle($this->file, 1234);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.service.exporter.import_file_error'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if the JSON metadata is invalid.
+     */
+    public function testExceptionIsThrownIfJsonMetaDataIsInvalid()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'hodor'],
+        ]));
+
+        try {
+            $this->service->handle($this->file, 1234);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.service.exporter.invalid_json_provided'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if a duplicate tag exists.
+     */
+    public function testExceptionIsThrownIfDuplicateTagExists()
+    {
+        $option = factory(ServiceOption::class)->make();
+        $service = factory(Service::class)->make();
+        $service->options = collect([factory(ServiceOption::class)->make(['tag' => $option->tag])]);
+
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'PTDL_v1'],
+            'tag' => $option->tag,
+        ]));
+        $this->serviceRepository->shouldReceive('getWithOptions')->with($service->id)->once()->andReturn($service);
+
+        try {
+            $this->service->handle($this->file, $service->id);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(DuplicateOptionTagException::class, $exception);
+            $this->assertEquals(trans('exceptions.service.options.duplicate_tag'), $exception->getMessage());
+        }
+    }
+}

From 609bf3284386bc9947026eb9668751eaa0bcbd0d Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 4 Oct 2017 23:42:04 -0500
Subject: [PATCH 13/34] Add test for service option exporter

---
 app/helpers.php                               | 28 +++++++
 database/factories/ModelFactory.php           |  1 +
 .../NestedObjectAssertionsTrait.php           | 47 +++++++++++
 .../ServiceOptionExporterServiceTest.php      | 78 +++++++++++++++++++
 4 files changed, 154 insertions(+)
 create mode 100644 tests/Assertions/NestedObjectAssertionsTrait.php
 create mode 100644 tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php

diff --git a/app/helpers.php b/app/helpers.php
index 26dd1b8e0..0c9004695 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -43,3 +43,31 @@ if (! function_exists('is_digit')) {
         return is_bool($value) ? false : ctype_digit(strval($value));
     }
 }
+
+if (! function_exists('object_get_strict')) {
+    /**
+     * Get an object using dot notation. An object key with a value of null is still considered valid
+     * and will not trigger the response of a default value (unlike object_get).
+     *
+     * @param object $object
+     * @param string $key
+     * @param null   $default
+     * @return mixed
+     */
+    function object_get_strict($object, $key, $default = null)
+    {
+        if (is_null($key) || trim($key) == '') {
+            return $object;
+        }
+
+        foreach (explode('.', $key) as $segment) {
+            if (! is_object($object) || ! property_exists($object, $segment)) {
+                return value($default);
+            }
+
+            $object = $object->{$segment};
+        }
+
+        return $object;
+    }
+}
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index d61f46cc0..d8d14526b 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -107,6 +107,7 @@ $factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Genera
         'service_id' => $faker->unique()->randomNumber(),
         'name' => $faker->name,
         'description' => implode(' ', $faker->sentences(3)),
+        'startup' => 'java -jar test.jar',
         'tag' => 'test@testfactory.com:' . $faker->unique()->randomNumber(8),
     ];
 });
diff --git a/tests/Assertions/NestedObjectAssertionsTrait.php b/tests/Assertions/NestedObjectAssertionsTrait.php
new file mode 100644
index 000000000..b402696d8
--- /dev/null
+++ b/tests/Assertions/NestedObjectAssertionsTrait.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Assertions;
+
+use PHPUnit\Framework\Assert;
+use PHPUnit_Util_InvalidArgumentHelper;
+
+trait NestedObjectAssertionsTrait
+{
+    /**
+     * Assert that an object value matches an expected value.
+     *
+     * @param string $key
+     * @param mixed  $expected
+     * @param object $object
+     */
+    public function assertObjectNestedValueEquals(string $key, $expected, $object)
+    {
+        if (! is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'object');
+        }
+
+        Assert::assertEquals($expected, object_get_strict($object, $key, '__TEST_FAILURE'), 'Assert that an object value equals a provided value.');
+    }
+
+    /**
+     * Assert that an object contains a nested key.
+     *
+     * @param string $key
+     * @param object $object
+     */
+    public function assertObjectHasNestedAttribute(string $key, $object)
+    {
+        if (! is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
+        }
+
+        Assert::assertNotEquals('__TEST_FAILURE', object_get_strict($object, $key, '__TEST_FAILURE'), 'Assert that an object contains a nested key.');
+    }
+}
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
new file mode 100644
index 000000000..381e1c015
--- /dev/null
+++ b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Unit\Services\Services\Sharing;
+
+use Mockery as m;
+use Carbon\Carbon;
+use Tests\TestCase;
+use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\ServiceVariable;
+use Tests\Assertions\NestedObjectAssertionsTrait;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
+
+class ServiceOptionExporterServiceTest extends TestCase
+{
+    use NestedObjectAssertionsTrait;
+
+    /**
+     * @var \Carbon\Carbon
+     */
+    protected $carbon;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService
+     */
+    protected $service;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        Carbon::setTestNow(Carbon::now());
+        $this->carbon = new Carbon();
+        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+
+        $this->service = new ServiceOptionExporterService($this->carbon, $this->repository);
+    }
+
+    public function testJsonStructureIsExported()
+    {
+        $option = factory(ServiceOption::class)->make();
+        $option->variables = collect([$variable = factory(ServiceVariable::class)->make()]);
+
+        $this->repository->shouldReceive('getWithExportAttributes')->with($option->id)->once()->andReturn($option);
+
+        $response = $this->service->handle($option->id);
+        $this->assertNotEmpty($response);
+
+        $data = json_decode($response);
+        $this->assertEquals(JSON_ERROR_NONE, json_last_error());
+        $this->assertObjectHasNestedAttribute('meta.version', $data);
+        $this->assertObjectNestedValueEquals('meta.version', 'PTDL_v1', $data);
+        $this->assertObjectHasNestedAttribute('exported_at', $data);
+        $this->assertObjectNestedValueEquals('exported_at', Carbon::now()->toIso8601String(), $data);
+        $this->assertObjectHasNestedAttribute('scripts.installation.script', $data);
+        $this->assertObjectHasNestedAttribute('scripts.installation.container', $data);
+        $this->assertObjectHasNestedAttribute('scripts.installation.entrypoint', $data);
+        $this->assertObjectHasAttribute('variables', $data);
+        $this->assertArrayHasKey('0', $data->variables);
+        $this->assertObjectHasAttribute('name', $data->variables[0]);
+        $this->assertObjectNestedValueEquals('name', $variable->name, $data->variables[0]);
+    }
+}

From fbd5c25ed0b1ef0cbce4a67d2f06920ddd7e9acc Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 4 Oct 2017 23:52:25 -0500
Subject: [PATCH 14/34] Finalize tests

---
 CHANGELOG.md                                                | 1 +
 .../Services/Options/InstallScriptUpdateService.php         | 2 +-
 app/Services/Services/Options/OptionUpdateService.php       | 2 +-
 app/Services/Services/ServiceUpdateService.php              | 2 +-
 .../Services/Services/Options/OptionCreationServiceTest.php | 6 ++++--
 .../Services/Sharing/ServiceOptionExporterServiceTest.php   | 3 +++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d74573ba2..f70fbeb7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * New CLI command to disabled 2-Factor Authentication on an account if necessary.
 * Ability to delete users and locations via the CLI.
 * You can now require 2FA for all users, admins only, or at will using a simple configuration in the Admin CP.
+* Added ability to export and import service options and their associated settings and environment variables via the Admin CP.
 
 ### Changed
 * Theme colors and login pages updated to give a more unique feel to the project.
diff --git a/app/Services/Services/Options/InstallScriptUpdateService.php b/app/Services/Services/Options/InstallScriptUpdateService.php
index abb7cfca1..7b302190e 100644
--- a/app/Services/Services/Options/InstallScriptUpdateService.php
+++ b/app/Services/Services/Options/InstallScriptUpdateService.php
@@ -40,7 +40,7 @@ class InstallScriptUpdateService
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException
      */
-    public function handle($option, array $data): void
+    public function handle($option, array $data)
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);
diff --git a/app/Services/Services/Options/OptionUpdateService.php b/app/Services/Services/Options/OptionUpdateService.php
index 73c69cc5d..1d2109de5 100644
--- a/app/Services/Services/Options/OptionUpdateService.php
+++ b/app/Services/Services/Options/OptionUpdateService.php
@@ -40,7 +40,7 @@ class OptionUpdateService
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
      */
-    public function handle($option, array $data): void
+    public function handle($option, array $data)
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);
diff --git a/app/Services/Services/ServiceUpdateService.php b/app/Services/Services/ServiceUpdateService.php
index 327c45aa7..c6f5e322f 100644
--- a/app/Services/Services/ServiceUpdateService.php
+++ b/app/Services/Services/ServiceUpdateService.php
@@ -36,7 +36,7 @@ class ServiceUpdateService
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(int $service, array $data): void
+    public function handle(int $service, array $data)
     {
         if (! is_null(array_get($data, 'author'))) {
             unset($data['author']);
diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
index c15db8f07..8238f858d 100644
--- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
@@ -60,14 +60,16 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelWithoutUsingConfigFrom()
     {
-        $model = factory(ServiceOption::class)->make();
+        $model = factory(ServiceOption::class)->make([
+            'tag' => str_random(10),
+        ]);
 
         $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
         $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
         $this->repository->shouldReceive('create')->with([
             'name' => $model->name,
-            'config_from' => null,
             'tag' => 'test@example.com:' . $model->tag,
+            'config_from' => null,
             'uuid' => 'uuid-string',
         ], true, true)->once()->andReturn($model);
 
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
index 381e1c015..aa5e35737 100644
--- a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
+++ b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
@@ -51,6 +51,9 @@ class ServiceOptionExporterServiceTest extends TestCase
         $this->service = new ServiceOptionExporterService($this->carbon, $this->repository);
     }
 
+    /**
+     * Test that a JSON structure is returned.
+     */
     public function testJsonStructureIsExported()
     {
         $option = factory(ServiceOption::class)->make();

From 366221fa3f1f92e9955333820c8802cb4e0c296f Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 5 Oct 2017 20:13:01 -0500
Subject: [PATCH 15/34] ;

---
 resources/themes/pterodactyl/layouts/admin.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index c547e2762..115f952fa 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -200,7 +200,7 @@
 
             <script>
                 $(function () {
-                    $('[data-toggle="tooltip"]').tooltip()
+                    $('[data-toggle="tooltip"]').tooltip();
                 })
             </script>
         @show

From 38075c6b9fde2e7234094ab4a1b0e4d124cda7f3 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Thu, 5 Oct 2017 23:09:43 -0500
Subject: [PATCH 16/34] Update panel to send correct service option
 configuration to the daemon.

---
 .../Commands/Server/RebuildServerCommand.php  | 32 +++----
 .../Daemon/ServerRepositoryInterface.php      |  9 +-
 .../ServiceOptionRepositoryInterface.php      | 15 +++-
 .../API/Remote/OptionRetrievalController.php  | 74 +++++++++++++++++
 app/Repositories/Daemon/ServerRepository.php  | 54 +++---------
 .../Eloquent/ServerRepository.php             |  6 +-
 .../Eloquent/ServiceOptionRepository.php      | 21 ++++-
 .../ServerConfigurationStructureService.php   | 83 +++++++++++++++++++
 .../Servers/ServerCreationService.php         | 11 ++-
 .../OptionConfigurationFileService.php        | 51 ++++++++++++
 routes/api-remote.php                         |  7 +-
 routes/daemon.php                             |  2 -
 12 files changed, 282 insertions(+), 83 deletions(-)
 create mode 100644 app/Http/Controllers/API/Remote/OptionRetrievalController.php
 create mode 100644 app/Services/Servers/ServerConfigurationStructureService.php
 create mode 100644 app/Services/Services/Options/OptionConfigurationFileService.php

diff --git a/app/Console/Commands/Server/RebuildServerCommand.php b/app/Console/Commands/Server/RebuildServerCommand.php
index 562b10bd9..c6b562b06 100644
--- a/app/Console/Commands/Server/RebuildServerCommand.php
+++ b/app/Console/Commands/Server/RebuildServerCommand.php
@@ -12,12 +12,17 @@ namespace Pterodactyl\Console\Commands\Server;
 use Webmozart\Assert\Assert;
 use Illuminate\Console\Command;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Services\Servers\EnvironmentService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class RebuildServerCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
+     */
+    protected $configurationStructureService;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
@@ -28,11 +33,6 @@ class RebuildServerCommand extends Command
      */
     protected $description = 'Rebuild a single server, all servers on a node, or all servers on the panel.';
 
-    /**
-     * @var \Pterodactyl\Services\Servers\EnvironmentService
-     */
-    protected $environmentService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
      */
@@ -49,18 +49,18 @@ class RebuildServerCommand extends Command
      * RebuildServerCommand constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonRepository
-     * @param \Pterodactyl\Services\Servers\EnvironmentService                   $environmentService
+     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService  $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $repository
      */
     public function __construct(
         DaemonServerRepositoryInterface $daemonRepository,
-        EnvironmentService $environmentService,
+        ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository
     ) {
         parent::__construct();
 
+        $this->configurationStructureService = $configurationStructureService;
         $this->daemonRepository = $daemonRepository;
-        $this->environmentService = $environmentService;
         $this->repository = $repository;
     }
 
@@ -74,19 +74,7 @@ class RebuildServerCommand extends Command
 
         $servers->each(function ($server) use ($bar) {
             $bar->clear();
-            $json = [
-                'build' => [
-                    'image' => $server->image,
-                    'env|overwrite' => $this->environmentService->process($server),
-                ],
-                'service' => [
-                    'type' => $server->option->service->folder,
-                    'option' => $server->option->tag,
-                    'pack' => object_get($server, 'pack.uuid'),
-                    'skip_scripts' => $server->skip_scripts,
-                ],
-                'rebuild' => true,
-            ];
+            $json = array_merge($this->configurationStructureService->handle($server), ['rebuild' => true]);
 
             try {
                 $this->daemonRepository->setNode($server->node_id)->setAccessServer($server->uuid)->update($json);
diff --git a/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php b/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php
index c64853b8c..6b7a86d45 100644
--- a/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php
+++ b/app/Contracts/Repository/Daemon/ServerRepositoryInterface.php
@@ -9,17 +9,20 @@
 
 namespace Pterodactyl\Contracts\Repository\Daemon;
 
+use Psr\Http\Message\ResponseInterface;
+
 interface ServerRepositoryInterface extends BaseRepositoryInterface
 {
     /**
      * Create a new server on the daemon for the panel.
      *
-     * @param int   $id
+     * @param array $structure
      * @param array $overrides
-     * @param bool  $start
      * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function create($id, array $overrides = [], $start = false);
+    public function create(array $structure, array $overrides = []): ResponseInterface;
 
     /**
      * Update server details on the daemon.
diff --git a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
index c7acd5a45..310b385ea 100644
--- a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
+++ b/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
@@ -10,6 +10,7 @@
 namespace Pterodactyl\Contracts\Repository;
 
 use Pterodactyl\Models\ServiceOption;
+use Illuminate\Database\Eloquent\Collection;
 
 interface ServiceOptionRepositoryInterface extends RepositoryInterface
 {
@@ -23,15 +24,21 @@ interface ServiceOptionRepositoryInterface extends RepositoryInterface
      */
     public function getWithVariables(int $id): ServiceOption;
 
+    /**
+     * Return all of the service options and their relations to be used in the daemon API.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getAllWithCopyAttributes(): Collection;
+
     /**
      * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
      *
-     * @param int $id
+     * @param int|string $value
+     * @param string     $column
      * @return \Pterodactyl\Models\ServiceOption
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCopyAttributes(int $id): ServiceOption;
+    public function getWithCopyAttributes($value, string $column = 'id'): ServiceOption;
 
     /**
      * Return all of the data needed to export a service.
diff --git a/app/Http/Controllers/API/Remote/OptionRetrievalController.php b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
new file mode 100644
index 000000000..fdd715ca9
--- /dev/null
+++ b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\API\Remote;
+
+use Illuminate\Http\JsonResponse;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Services\Services\Options\OptionConfigurationFileService;
+
+class OptionRetrievalController extends Controller
+{
+    /**
+     * @var \Pterodactyl\Services\Services\Options\OptionConfigurationFileService
+     */
+    protected $configurationFileService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * OptionUpdateController constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface    $repository
+     * @param \Pterodactyl\Services\Services\Options\OptionConfigurationFileService $configurationFileService
+     */
+    public function __construct(
+        ServiceOptionRepositoryInterface $repository,
+        OptionConfigurationFileService $configurationFileService
+    ) {
+        $this->configurationFileService = $configurationFileService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a JSON array of service options and the SHA1 hash of thier configuration file.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $options = $this->repository->getAllWithCopyAttributes();
+
+        $response = [];
+        $options->each(function ($option) use (&$response) {
+            $response[$option->uuid] = sha1(json_encode($this->configurationFileService->handle($option)));
+        });
+
+        return response()->json($response);
+    }
+
+    /**
+     * Return the configuration file for a single service option for the Daemon.
+     *
+     * @param string $uuid
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function download(string $uuid): JsonResponse
+    {
+        $option = $this->repository->getWithCopyAttributes($uuid, 'uuid');
+
+        return response()->json($this->configurationFileService->handle($option));
+    }
+}
diff --git a/app/Repositories/Daemon/ServerRepository.php b/app/Repositories/Daemon/ServerRepository.php
index c1690eb1a..3515b26e4 100644
--- a/app/Repositories/Daemon/ServerRepository.php
+++ b/app/Repositories/Daemon/ServerRepository.php
@@ -10,61 +10,29 @@
 namespace Pterodactyl\Repositories\Daemon;
 
 use Webmozart\Assert\Assert;
-use Pterodactyl\Services\Servers\EnvironmentService;
+use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface as DatabaseServerRepositoryInterface;
 
 class ServerRepository extends BaseRepository implements ServerRepositoryInterface
 {
     /**
-     * {@inheritdoc}
+     * Create a new server on the daemon for the panel.
+     *
+     * @param array $structure
+     * @param array $overrides
+     * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \GuzzleHttp\Exception\RequestException
      */
-    public function create($id, array $overrides = [], $start = false)
+    public function create(array $structure, array $overrides = []): ResponseInterface
     {
-        Assert::numeric($id, 'First argument passed to create must be numeric, received %s.');
-        Assert::boolean($start, 'Third argument passed to create must be boolean, received %s.');
-
-        $repository = $this->app->make(DatabaseServerRepositoryInterface::class);
-        $environment = $this->app->make(EnvironmentService::class);
-
-        $server = $repository->getDataForCreation($id);
-
-        $data = [
-            'uuid' => (string) $server->uuid,
-            'user' => $server->username,
-            'build' => [
-                'default' => [
-                    'ip' => $server->allocation->ip,
-                    'port' => $server->allocation->port,
-                ],
-                'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
-                    return $item->pluck('port');
-                })->toArray(),
-                'env' => $environment->process($server),
-                'memory' => (int) $server->memory,
-                'swap' => (int) $server->swap,
-                'io' => (int) $server->io,
-                'cpu' => (int) $server->cpu,
-                'disk' => (int) $server->disk,
-                'image' => $server->image,
-            ],
-            'service' => [
-                'type' => $server->option->service->folder,
-                'option' => $server->option->tag,
-                'pack' => object_get($server, 'pack.uuid'),
-                'skip_scripts' => $server->skip_scripts,
-            ],
-            'rebuild' => false,
-            'start_on_completion' => $start,
-        ];
-
         // Loop through overrides.
         foreach ($overrides as $key => $value) {
-            array_set($data, $key, $value);
+            array_set($structure, $key, $value);
         }
 
         return $this->getHttpClient()->request('POST', 'servers', [
-            'json' => $data,
+            'json' => $structure,
         ]);
     }
 
diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php
index 5c86e4a89..2443f6b25 100644
--- a/app/Repositories/Eloquent/ServerRepository.php
+++ b/app/Repositories/Eloquent/ServerRepository.php
@@ -47,7 +47,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
         Assert::nullOrIntegerish($server, 'First argument passed to getDataForRebuild must be null or integer, received %s.');
         Assert::nullOrIntegerish($node, 'Second argument passed to getDataForRebuild must be null or integer, received %s.');
 
-        $instance = $this->getBuilder()->with('node', 'option.service', 'pack');
+        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'option', 'node');
 
         if (! is_null($server) && is_null($node)) {
             $instance = $instance->where('id', '=', $server);
@@ -111,9 +111,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDataForCreation($id)
     {
-        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'option.service')
-                         ->find($id, $this->getColumns());
-
+        $instance = $this->getBuilder()->with(['allocation', 'allocations', 'pack', 'option'])->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException();
         }
diff --git a/app/Repositories/Eloquent/ServiceOptionRepository.php b/app/Repositories/Eloquent/ServiceOptionRepository.php
index 5d8bec31d..852726e52 100644
--- a/app/Repositories/Eloquent/ServiceOptionRepository.php
+++ b/app/Repositories/Eloquent/ServiceOptionRepository.php
@@ -9,7 +9,9 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
+use Webmozart\Assert\Assert;
 use Pterodactyl\Models\ServiceOption;
+use Illuminate\Database\Eloquent\Collection;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 
@@ -42,18 +44,31 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
         return $instance;
     }
 
+    /**
+     * Return all of the service options and their relations to be used in the daemon API.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getAllWithCopyAttributes(): Collection
+    {
+        return $this->getBuilder()->with('scriptFrom', 'configFrom')->get($this->getColumns());
+    }
+
     /**
      * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
      *
-     * @param int $id
+     * @param int|string $value
+     * @param string     $column
      * @return \Pterodactyl\Models\ServiceOption
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCopyAttributes(int $id): ServiceOption
+    public function getWithCopyAttributes($value, string $column = 'id'): ServiceOption
     {
+        Assert::true((is_digit($value) || is_string($value)), 'First argument passed to getWithCopyAttributes must be an integer or string, received %s.');
+
         /** @var \Pterodactyl\Models\ServiceOption $instance */
-        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom')->find($id, $this->getColumns());
+        $instance = $this->getBuilder()->with('scriptFrom', 'configFrom')->where($column, '=', $value)->first($this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
         }
diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php
new file mode 100644
index 000000000..78fee994a
--- /dev/null
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Servers;
+
+use Pterodactyl\Models\Server;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+
+class ServerConfigurationStructureService
+{
+    const REQUIRED_RELATIONS = ['allocation', 'allocations', 'pack', 'option'];
+
+    /**
+     * @var \Pterodactyl\Services\Servers\EnvironmentService
+     */
+    protected $environment;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * ServerConfigurationStructureService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Servers\EnvironmentService            $environment
+     */
+    public function __construct(
+        ServerRepositoryInterface $repository,
+        EnvironmentService $environment
+    ) {
+        $this->repository = $repository;
+        $this->environment = $environment;
+    }
+
+    /**
+     * @param int|\Pterodactyl\Models\Server $server
+     * @return array
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($server): array
+    {
+        if (! $server instanceof Server || array_diff(self::REQUIRED_RELATIONS, $server->getRelations())) {
+            $server = $this->repository->getDataForCreation(is_digit($server) ? $server : $server->id);
+        }
+
+        return [
+            'uuid' => $server->uuid,
+            'user' => $server->username,
+            'build' => [
+                'default' => [
+                    'ip' => $server->allocation->ip,
+                    'port' => $server->allocation->port,
+                ],
+                'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
+                    return $item->pluck('port');
+                })->toArray(),
+                'env' => $this->environment->process($server),
+                'memory' => (int) $server->memory,
+                'swap' => (int) $server->swap,
+                'io' => (int) $server->io,
+                'cpu' => (int) $server->cpu,
+                'disk' => (int) $server->disk,
+                'image' => $server->image,
+            ],
+            'keys' => [],
+            'service' => [
+                'option' => $server->option->uuid,
+                'pack' => object_get($server, 'pack.uuid'),
+                'skip_scripts' => $server->skip_scripts,
+            ],
+            'rebuild' => false,
+            'suspended' => (int) $server->suspended,
+        ];
+    }
+}
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 122bac629..6ddf4496a 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -29,6 +29,11 @@ class ServerCreationService
      */
     protected $allocationRepository;
 
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
+     */
+    protected $configurationStructureService;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
@@ -81,6 +86,7 @@ class ServerCreationService
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface  $daemonServerRepository
      * @param \Illuminate\Database\DatabaseManager                                $database
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface           $nodeRepository
+     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService   $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $repository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface           $userRepository
@@ -93,6 +99,7 @@ class ServerCreationService
         DaemonServerRepositoryInterface $daemonServerRepository,
         DatabaseManager $database,
         NodeRepositoryInterface $nodeRepository,
+        ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         UserRepositoryInterface $userRepository,
@@ -102,6 +109,7 @@ class ServerCreationService
     ) {
         $this->allocationRepository = $allocationRepository;
         $this->daemonServerRepository = $daemonServerRepository;
+        $this->configurationStructureService = $configurationStructureService;
         $this->database = $database;
         $this->nodeRepository = $nodeRepository;
         $this->repository = $repository;
@@ -175,10 +183,11 @@ class ServerCreationService
         }
 
         $this->serverVariableRepository->insert($records);
+        $structure = $this->configurationStructureService->handle($server->id);
 
         // Create the server on the daemon & commit it to the database.
         try {
-            $this->daemonServerRepository->setNode($server->node_id)->create($server->id);
+            $this->daemonServerRepository->setNode($server->node_id)->create($structure, ['start_on_completion' => (bool) $data['start_on_completion']]);
             $this->database->commit();
         } catch (RequestException $exception) {
             $response = $exception->getResponse();
diff --git a/app/Services/Services/Options/OptionConfigurationFileService.php b/app/Services/Services/Options/OptionConfigurationFileService.php
new file mode 100644
index 000000000..c21f435dd
--- /dev/null
+++ b/app/Services/Services/Options/OptionConfigurationFileService.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Services\Options;
+
+use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+
+class OptionConfigurationFileService
+{
+    protected $repository;
+
+    /**
+     * OptionConfigurationFileService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     */
+    public function __construct(ServiceOptionRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a service configuration file to be used by the daemon.
+     *
+     * @param int|\Pterodactyl\Models\ServiceOption $option
+     * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle($option): array
+    {
+        if (! $option instanceof ServiceOption) {
+            $option = $this->repository->getWithCopyAttributes($option);
+        }
+
+        return [
+            'startup' => json_decode($option->inherit_config_startup),
+            'stop' => $option->inherit_config_stop,
+            'configs' => json_decode($option->inherit_config_files),
+            'log' => json_decode($option->inherit_config_logs),
+            'query' => 'none',
+        ];
+    }
+}
diff --git a/routes/api-remote.php b/routes/api-remote.php
index 54e5d8da4..39a371b2e 100644
--- a/routes/api-remote.php
+++ b/routes/api-remote.php
@@ -6,4 +6,9 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
-Route::get('/authenticate/{token}', 'ValidateKeyController@index')->name('post.api.remote.authenticate');
+Route::get('/authenticate/{token}', 'ValidateKeyController@index')->name('api.remote.authenticate');
+
+Route::group(['prefix' => '/options'], function () {
+    Route::get('/', 'OptionRetrievalController@index')->name('api.remote.services');
+    Route::get('/{uuid}', 'OptionRetrievalController@download')->name('api.remote.services.download');
+});
diff --git a/routes/daemon.php b/routes/daemon.php
index e6d34e971..96dd4e682 100644
--- a/routes/daemon.php
+++ b/routes/daemon.php
@@ -6,8 +6,6 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
-Route::get('/services', 'ServiceController@listServices')->name('daemon.services');
-Route::get('/services/pull/{service}/{file}', 'ServiceController@pull')->name('daemon.pull');
 Route::get('/packs/pull/{uuid}', 'PackController@pull')->name('daemon.pack.pull');
 Route::get('/packs/pull/{uuid}/hash', 'PackController@hash')->name('daemon.pack.hash');
 Route::get('/details/option/{server}', 'OptionController@details')->name('daemon.option.details');

From 675e780946fd5853e82678cde049e9bd801f7a1e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 6 Oct 2017 00:16:22 -0500
Subject: [PATCH 17/34] Fix test failures

---
 app/Exceptions/DisplayException.php           |   5 +-
 .../Connection/DaemonConnectionException.php  |  31 +++++
 .../Servers/ServerCreationService.php         |  50 +++-----
 .../Servers/ServerCreationServiceTest.php     | 117 +++++++-----------
 4 files changed, 100 insertions(+), 103 deletions(-)
 create mode 100644 app/Exceptions/Http/Connection/DaemonConnectionException.php

diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php
index 72fb86c71..80c5771a5 100644
--- a/app/Exceptions/DisplayException.php
+++ b/app/Exceptions/DisplayException.php
@@ -14,6 +14,9 @@ use Throwable;
 
 class DisplayException extends PterodactylException
 {
+    const LEVEL_WARNING = 'warning';
+    const LEVEL_ERROR = 'error';
+
     /**
      * @var string
      */
@@ -27,7 +30,7 @@ class DisplayException extends PterodactylException
      * @param string         $level
      * @internal param mixed $log
      */
-    public function __construct($message, Throwable $previous = null, $level = 'error')
+    public function __construct($message, Throwable $previous = null, $level = self::LEVEL_ERROR)
     {
         $this->level = $level;
 
diff --git a/app/Exceptions/Http/Connection/DaemonConnectionException.php b/app/Exceptions/Http/Connection/DaemonConnectionException.php
new file mode 100644
index 000000000..5718af63f
--- /dev/null
+++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Exceptions\Http\Connection;
+
+use GuzzleHttp\Exception\GuzzleException;
+use Pterodactyl\Exceptions\DisplayException;
+
+class DaemonConnectionException extends DisplayException
+{
+    /**
+     * Throw a displayable exception caused by a daemon connection error.
+     *
+     * @param \GuzzleHttp\Exception\GuzzleException $previous
+     */
+    public function __construct(GuzzleException $previous)
+    {
+        /** @var \GuzzleHttp\Psr7\Response|null $response */
+        $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
+
+        parent::__construct(trans('admin/server.exceptions.daemon_exception', [
+            'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
+        ]), $previous, DisplayException::LEVEL_WARNING);
+    }
+}
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 6ddf4496a..1a8f63006 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -10,15 +10,14 @@
 namespace Pterodactyl\Services\Servers;
 
 use Ramsey\Uuid\Uuid;
-use Illuminate\Log\Writer;
-use Illuminate\Database\DatabaseManager;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Exceptions\DisplayException;
+use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
@@ -34,16 +33,16 @@ class ServerCreationService
      */
     protected $configurationStructureService;
 
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
      */
     protected $daemonServerRepository;
 
-    /**
-     * @var \Illuminate\Database\DatabaseManager
-     */
-    protected $database;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
      */
@@ -74,17 +73,12 @@ class ServerCreationService
      */
     protected $validatorService;
 
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
     /**
      * CreationService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface     $allocationRepository
+     * @param \Illuminate\Database\ConnectionInterface                            $connection
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface  $daemonServerRepository
-     * @param \Illuminate\Database\DatabaseManager                                $database
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface           $nodeRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService   $configurationStructureService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $repository
@@ -92,32 +86,29 @@ class ServerCreationService
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface           $userRepository
      * @param \Pterodactyl\Services\Servers\UsernameGenerationService             $usernameService
      * @param \Pterodactyl\Services\Servers\VariableValidatorService              $validatorService
-     * @param \Illuminate\Log\Writer                                              $writer
      */
     public function __construct(
         AllocationRepositoryInterface $allocationRepository,
+        ConnectionInterface $connection,
         DaemonServerRepositoryInterface $daemonServerRepository,
-        DatabaseManager $database,
         NodeRepositoryInterface $nodeRepository,
         ServerConfigurationStructureService $configurationStructureService,
         ServerRepositoryInterface $repository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         UserRepositoryInterface $userRepository,
         UsernameGenerationService $usernameService,
-        VariableValidatorService $validatorService,
-        Writer $writer
+        VariableValidatorService $validatorService
     ) {
         $this->allocationRepository = $allocationRepository;
-        $this->daemonServerRepository = $daemonServerRepository;
         $this->configurationStructureService = $configurationStructureService;
-        $this->database = $database;
+        $this->connection = $connection;
+        $this->daemonServerRepository = $daemonServerRepository;
         $this->nodeRepository = $nodeRepository;
         $this->repository = $repository;
         $this->serverVariableRepository = $serverVariableRepository;
         $this->userRepository = $userRepository;
         $this->usernameService = $usernameService;
         $this->validatorService = $validatorService;
-        $this->writer = $writer;
     }
 
     /**
@@ -136,7 +127,7 @@ class ServerCreationService
         $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['option_id']);
         $uniqueShort = str_random(8);
 
-        $this->database->beginTransaction();
+        $this->connection->beginTransaction();
 
         $server = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
@@ -187,16 +178,13 @@ class ServerCreationService
 
         // Create the server on the daemon & commit it to the database.
         try {
-            $this->daemonServerRepository->setNode($server->node_id)->create($structure, ['start_on_completion' => (bool) $data['start_on_completion']]);
-            $this->database->commit();
+            $this->daemonServerRepository->setNode($server->node_id)->create($structure, [
+                'start_on_completion' => (bool) array_get($data, 'start_on_completion', false),
+            ]);
+            $this->connection->commit();
         } catch (RequestException $exception) {
-            $response = $exception->getResponse();
-            $this->writer->warning($exception);
-            $this->database->rollBack();
-
-            throw new DisplayException(trans('admin/server.exceptions.daemon_exception', [
-                'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
+            $this->connection->rollBack();
+            throw new DaemonConnectionException($exception);
         }
 
         return $server;
diff --git a/tests/Unit/Services/Servers/ServerCreationServiceTest.php b/tests/Unit/Services/Servers/ServerCreationServiceTest.php
index 5244dfe3b..0b22486e5 100644
--- a/tests/Unit/Services/Servers/ServerCreationServiceTest.php
+++ b/tests/Unit/Services/Servers/ServerCreationServiceTest.php
@@ -9,14 +9,12 @@
 
 namespace Tests\Unit\Services\Servers;
 
-use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Illuminate\Log\Writer;
 use phpmock\phpunit\PHPMock;
-use Illuminate\Database\DatabaseManager;
 use GuzzleHttp\Exception\RequestException;
-use Pterodactyl\Exceptions\DisplayException;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Services\Servers\ServerCreationService;
 use Pterodactyl\Services\Servers\VariableValidatorService;
 use Pterodactyl\Services\Servers\UsernameGenerationService;
@@ -24,20 +22,35 @@ use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
+/**
+ * @preserveGlobalState disabled
+ */
 class ServerCreationServiceTest extends TestCase
 {
     use PHPMock;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface|\Mockery\Mock
      */
     protected $allocationRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService|\Mockery\Mock
+     */
+    protected $configurationStructureService;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $daemonServerRepository;
 
@@ -66,27 +79,22 @@ class ServerCreationServiceTest extends TestCase
     ];
 
     /**
-     * @var \Illuminate\Database\DatabaseManager
-     */
-    protected $database;
-
-    /**
-     * @var \GuzzleHttp\Exception\RequestException
+     * @var \GuzzleHttp\Exception\RequestException|\Mockery\Mock
      */
     protected $exception;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface|\Mockery\Mock
      */
     protected $nodeRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface|\Mockery\Mock
      */
     protected $serverVariableRepository;
 
@@ -96,30 +104,25 @@ class ServerCreationServiceTest extends TestCase
     protected $service;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface|\Mockery\Mock
      */
     protected $userRepository;
 
     /**
-     * @var \Pterodactyl\Services\Servers\UsernameGenerationService
+     * @var \Pterodactyl\Services\Servers\UsernameGenerationService|\Mockery\Mock
      */
     protected $usernameService;
 
     /**
-     * @var \Pterodactyl\Services\Servers\VariableValidatorService
+     * @var \Pterodactyl\Services\Servers\VariableValidatorService|\Mockery\Mock
      */
     protected $validatorService;
 
     /**
-     * @var \Ramsey\Uuid\Uuid
+     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
      */
     protected $uuid;
 
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
     /**
      * Setup tests.
      */
@@ -128,8 +131,9 @@ class ServerCreationServiceTest extends TestCase
         parent::setUp();
 
         $this->allocationRepository = m::mock(AllocationRepositoryInterface::class);
+        $this->configurationStructureService = m::mock(ServerConfigurationStructureService::class);
+        $this->connection = m::mock(ConnectionInterface::class);
         $this->daemonServerRepository = m::mock(DaemonServerRepositoryInterface::class);
-        $this->database = m::mock(DatabaseManager::class);
         $this->exception = m::mock(RequestException::class);
         $this->nodeRepository = m::mock(NodeRepositoryInterface::class);
         $this->repository = m::mock(ServerRepositoryInterface::class);
@@ -138,25 +142,21 @@ class ServerCreationServiceTest extends TestCase
         $this->usernameService = m::mock(UsernameGenerationService::class);
         $this->validatorService = m::mock(VariableValidatorService::class);
         $this->uuid = m::mock('overload:Ramsey\Uuid\Uuid');
-        $this->writer = m::mock(Writer::class);
 
         $this->getFunctionMock('\\Pterodactyl\\Services\\Servers', 'str_random')
             ->expects($this->any())->willReturn('random_string');
 
-        $this->getFunctionMock('\\Ramsey\\Uuid\\Uuid', 'uuid4')
-            ->expects($this->any())->willReturn('s');
-
         $this->service = new ServerCreationService(
             $this->allocationRepository,
+            $this->connection,
             $this->daemonServerRepository,
-            $this->database,
             $this->nodeRepository,
+            $this->configurationStructureService,
             $this->repository,
             $this->serverVariableRepository,
             $this->userRepository,
             $this->usernameService,
-            $this->validatorService,
-            $this->writer
+            $this->validatorService
         );
     }
 
@@ -169,37 +169,12 @@ class ServerCreationServiceTest extends TestCase
             ->shouldReceive('setFields')->with($this->data['environment'])->once()->andReturnSelf()
             ->shouldReceive('validate')->with($this->data['option_id'])->once()->andReturnSelf();
 
-        $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('toString')->withNoArgs()->once()->andReturn('uuid-0000');
+        $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
         $this->usernameService->shouldReceive('generate')->with($this->data['name'], 'random_string')
             ->once()->andReturn('user_name');
 
-        $this->repository->shouldReceive('create')->with([
-            'uuid' => 'uuid-0000',
-            'uuidShort' => 'random_string',
-            'node_id' => $this->data['node_id'],
-            'name' => $this->data['name'],
-            'description' => $this->data['description'],
-            'skip_scripts' => false,
-            'suspended' => false,
-            'owner_id' => $this->data['owner_id'],
-            'memory' => $this->data['memory'],
-            'swap' => $this->data['swap'],
-            'disk' => $this->data['disk'],
-            'io' => $this->data['io'],
-            'cpu' => $this->data['cpu'],
-            'oom_disabled' => false,
-            'allocation_id' => $this->data['allocation_id'],
-            'service_id' => $this->data['service_id'],
-            'option_id' => $this->data['option_id'],
-            'pack_id' => null,
-            'startup' => $this->data['startup'],
-            'daemonSecret' => 'random_string',
-            'image' => $this->data['docker_image'],
-            'username' => 'user_name',
-            'sftp_password' => null,
-        ])->once()->andReturn((object) [
+        $this->repository->shouldReceive('create')->withAnyArgs()->once()->andReturn((object) [
             'node_id' => 1,
             'id' => 1,
         ]);
@@ -216,9 +191,12 @@ class ServerCreationServiceTest extends TestCase
             'variable_id' => 1,
             'variable_value' => 'var1-value',
         ]])->once()->andReturnNull();
+
+        $this->configurationStructureService->shouldReceive('handle')->with(1)->once()->andReturn(['test' => 'struct']);
+
         $this->daemonServerRepository->shouldReceive('setNode')->with(1)->once()->andReturnSelf()
-            ->shouldReceive('create')->with(1)->once()->andReturnNull();
-        $this->database->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
+            ->shouldReceive('create')->with(['test' => 'struct'], ['start_on_completion' => false])->once()->andReturnNull();
+        $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
 
         $response = $this->service->create($this->data);
 
@@ -232,9 +210,9 @@ class ServerCreationServiceTest extends TestCase
     public function testExceptionShouldBeThrownIfTheRequestFails()
     {
         $this->validatorService->shouldReceive('isAdmin->setFields->validate->getResults')->once()->andReturn([]);
-        $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4->toString')->once()->andReturn('uuid-0000');
+        $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
         $this->usernameService->shouldReceive('generate')->once()->andReturn('user_name');
+        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
         $this->repository->shouldReceive('create')->once()->andReturn((object) [
             'node_id' => 1,
             'id' => 1,
@@ -242,18 +220,15 @@ class ServerCreationServiceTest extends TestCase
 
         $this->allocationRepository->shouldReceive('assignAllocationsToServer')->once()->andReturnNull();
         $this->serverVariableRepository->shouldReceive('insert')->with([])->once()->andReturnNull();
+        $this->configurationStructureService->shouldReceive('handle')->once()->andReturnNull();
         $this->daemonServerRepository->shouldReceive('setNode->create')->once()->andThrow($this->exception);
         $this->exception->shouldReceive('getResponse')->withNoArgs()->once()->andReturnNull();
-        $this->writer->shouldReceive('warning')->with($this->exception)->once()->andReturnNull();
-        $this->database->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
+        $this->connection->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
 
         try {
             $this->service->create($this->data);
-        } catch (Exception $exception) {
-            $this->assertInstanceOf(DisplayException::class, $exception);
-            $this->assertEquals(trans('admin/server.exceptions.daemon_exception', [
-                'code' => 'E_CONN_REFUSED',
-            ]), $exception->getMessage());
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(DaemonConnectionException::class, $exception);
         }
     }
 }

From 0b3c0f6d5a91e8625642f362afda26e12d09a255 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 6 Oct 2017 20:39:11 -0500
Subject: [PATCH 18/34] Ah yes, lets just spend 30 minutes trying to get a
 migration to run correctly.

---
 ...10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php | 5 +++--
 ...0_02_202007_ChangeToABetterUniqueServiceConfiguration.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
index 64d31f749..d7e9caa86 100644
--- a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
+++ b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
@@ -41,10 +41,11 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
     {
         Schema::table('services', function (Blueprint $table) {
             $table->dropColumn('uuid');
-            $table->string('folder')->unique('file');
-            $table->char('author', 36)->change();
+            $table->string('folder')->nullable();
+            $table->string('author', 36)->change();
 
             $table->unique('name');
+            $table->unique('folder', 'services_file_unique');
         });
     }
 }
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
index 990a07a63..96a968144 100644
--- a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -49,7 +49,7 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
         });
 
         DB::transaction(function () {
-            DB::table('service_options')->select(['id', 'author'])->get()->each(function ($option) {
+            DB::table('service_options')->select(['id', 'tag'])->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
                     'tag' => array_get(explode(':', $option->tag), 1),
                 ]);

From 344c1a988535a94d69a4bd3098c6dd069c55c274 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 6 Oct 2017 21:22:32 -0500
Subject: [PATCH 19/34] First push before :egg:

---
 app/Models/Service.php                        |  6 --
 app/Models/ServiceOption.php                  | 11 ---
 .../Sharing/ServiceOptionExporterService.php  |  2 -
 database/factories/ModelFactory.php           |  7 +-
 ...22_RemoveDaemonSecretFromSubusersTable.php |  6 +-
 ...angeServicesToUseAMoreUniqueIdentifier.php |  4 +
 ...ngeToABetterUniqueServiceConfiguration.php |  9 +--
 .../admin/services/functions.blade.php        | 73 -------------------
 .../pterodactyl/admin/services/new.blade.php  | 15 +---
 .../pterodactyl/admin/services/view.blade.php | 59 ++++++---------
 routes/admin.php                              |  2 -
 11 files changed, 36 insertions(+), 158 deletions(-)
 delete mode 100644 resources/themes/pterodactyl/admin/services/functions.blade.php

diff --git a/app/Models/Service.php b/app/Models/Service.php
index 0a17f7e42..e6c69bede 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -34,8 +34,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
     protected $fillable = [
         'name',
         'description',
-        'startup',
-        'index_file',
     ];
 
     /**
@@ -45,8 +43,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'required',
         'name' => 'required',
         'description' => 'sometimes',
-        'startup' => 'sometimes',
-        'index_file' => 'required',
     ];
 
     /**
@@ -56,8 +52,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
-        'startup' => 'nullable|string',
-        'index_file' => 'string',
     ];
 
     /**
diff --git a/app/Models/ServiceOption.php b/app/Models/ServiceOption.php
index f4bc72eaa..e424227fc 100644
--- a/app/Models/ServiceOption.php
+++ b/app/Models/ServiceOption.php
@@ -107,17 +107,6 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
         'docker_image' => null,
     ];
 
-    /**
-     * Returns the display startup string for the option and will use the parent
-     * service one if the option does not have one defined.
-     *
-     * @return string
-     */
-    public function getDisplayStartupAttribute()
-    {
-        return (is_null($this->startup)) ? $this->service->startup : $this->startup;
-    }
-
     /**
      * Returns the install script for the option; if option is copying from another
      * it will return the copied script.
diff --git a/app/Services/Services/Sharing/ServiceOptionExporterService.php b/app/Services/Services/Sharing/ServiceOptionExporterService.php
index 744d298a4..8f2d1ebf5 100644
--- a/app/Services/Services/Sharing/ServiceOptionExporterService.php
+++ b/app/Services/Services/Sharing/ServiceOptionExporterService.php
@@ -58,10 +58,8 @@ class ServiceOptionExporterService
             'exported_at' => $this->carbon->now()->toIso8601String(),
             'name' => $option->name,
             'author' => array_get(explode(':', $option->tag), 0),
-            'tag' => $option->tag,
             'description' => $option->description,
             'image' => $option->docker_image,
-            'startup' => $option->display_startup,
             'config' => [
                 'files' => $option->inherit_config_files,
                 'startup' => $option->inherit_config_startup,
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index d8d14526b..46895d70d 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -91,12 +91,10 @@ $factory->define(Pterodactyl\Models\Node::class, function (Faker\Generator $fake
 $factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
-        'author' => $faker->unique()->uuid,
+        'uuid' => $faker->unique()->uuid,
+        'author' => 'testauthor@example.com',
         'name' => $faker->word,
         'description' => null,
-        'folder' => strtolower($faker->unique()->word),
-        'startup' => 'java -jar test.jar',
-        'index_file' => 'indexjs',
     ];
 });
 
@@ -108,7 +106,6 @@ $factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Genera
         'name' => $faker->name,
         'description' => implode(' ', $faker->sentences(3)),
         'startup' => 'java -jar test.jar',
-        'tag' => 'test@testfactory.com:' . $faker->unique()->randomNumber(8),
     ];
 });
 
diff --git a/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php b/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
index a0c5e6d10..d4d2dd695 100644
--- a/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
+++ b/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
@@ -42,12 +42,16 @@ class RemoveDaemonSecretFromSubusersTable extends Migration
     public function down()
     {
         Schema::table('subusers', function (Blueprint $table) {
-            $table->char('daemonSecret', 36)->after('server_id')->unique();
+            $table->char('daemonSecret', 36)->after('server_id');
         });
 
         $subusers = DB::table('subusers')->get();
         $subusers->each(function ($subuser) {
             DB::table('daemon_keys')->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
         });
+
+        Schema::table('subusers', function (Blueprint $table) {
+            $table->unique('daemonSecret');
+        });
     }
 }
diff --git a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
index d7e9caa86..6bb36813d 100644
--- a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
+++ b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
@@ -20,6 +20,8 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
             $table->string('author')->change();
             $table->char('uuid', 36)->after('id');
             $table->dropColumn('folder');
+            $table->dropColumn('startup');
+            $table->dropColumn('index_file');
         });
 
         DB::table('services')->get(['id', 'author', 'uuid'])->each(function ($service) {
@@ -42,6 +44,8 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
         Schema::table('services', function (Blueprint $table) {
             $table->dropColumn('uuid');
             $table->string('folder')->nullable();
+            $table->text('startup')->nullable();
+            $table->text('index_file');
             $table->string('author', 36)->change();
 
             $table->unique('name');
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
index 96a968144..7ce854c56 100644
--- a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -15,19 +15,16 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->char('uuid', 36)->after('id');
-
-            $table->index(['service_id', 'tag']);
+            $table->dropColumn('tag');
         });
 
         DB::transaction(function () {
             DB::table('service_options')->select([
                 'service_options.id',
                 'service_options.uuid',
-                'service_options.tag',
                 'services.author AS service_author',
             ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
-                    'tag' => $option->service_author . ':' . $option->tag,
                     'uuid' => Uuid::uuid4()->toString(),
                 ]);
             });
@@ -45,13 +42,13 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->dropColumn('uuid');
-            $table->dropIndex(['service_id', 'tag']);
+            $table->string('tag');
         });
 
         DB::transaction(function () {
             DB::table('service_options')->select(['id', 'tag'])->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
-                    'tag' => array_get(explode(':', $option->tag), 1),
+                    'tag' => str_random(10),
                 ]);
             });
         });
diff --git a/resources/themes/pterodactyl/admin/services/functions.blade.php b/resources/themes/pterodactyl/admin/services/functions.blade.php
deleted file mode 100644
index 12ba8af3a..000000000
--- a/resources/themes/pterodactyl/admin/services/functions.blade.php
+++ /dev/null
@@ -1,73 +0,0 @@
-{{-- Pterodactyl - Panel --}}
-{{-- Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com> --}}
-
-{{-- This software is licensed under the terms of the MIT license. --}}
-{{-- https://opensource.org/licenses/MIT --}}
-@extends('layouts.admin')
-
-@section('title')
-    Service &rarr; {{ $service->name }} &rarr; Functions
-@endsection
-
-@section('content-header')
-    <h1>{{ $service->name }}<small>Extend the default daemon functions using this service file.</small></h1>
-    <ol class="breadcrumb">
-        <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li><a href="{{ route('admin.services.view', $service->id) }}">{{ $service->name }}</a></li>
-        <li class="active">Functions</li>
-    </ol>
-@endsection
-
-@section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.services.view', $service->id) }}">Overview</a></li>
-                <li class="active"><a href="{{ route('admin.services.view.functions', $service->id) }}">Functions</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-xs-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">Functions Control</h3>
-            </div>
-            <form action="{{ route('admin.services.view.functions', $service->id) }}" method="POST">
-                <div class="box-body no-padding">
-                    <div id="editor_index"style="height:500px">{{ $service->index_file }}</div>
-                    <textarea name="index_file" class="hidden"></textarea>
-                </div>
-                <div class="box-footer">
-                    {!! csrf_field() !!}
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-sm btn-success pull-right">Save File</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-@endsection
-
-@section('footer-scripts')
-    @parent
-    {!! Theme::js('vendor/ace/ace.js') !!}
-    {!! Theme::js('vendor/ace/ext-modelist.js') !!}
-    <script>
-    $(document).ready(function () {
-        const Editor = ace.edit('editor_index');
-        const Modelist = ace.require('ace/ext/modelist')
-
-        Editor.setTheme('ace/theme/chrome');
-        Editor.getSession().setMode('ace/mode/javascript');
-        Editor.getSession().setUseWrapMode(true);
-        Editor.setShowPrintMargin(false);
-
-        $('form').on('submit', function (e) {
-            $('textarea[name="index_file"]').val(Editor.getValue());
-        });
-    });
-    </script>
-@endsection
diff --git a/resources/themes/pterodactyl/admin/services/new.blade.php b/resources/themes/pterodactyl/admin/services/new.blade.php
index c63bec43b..cb48991ec 100644
--- a/resources/themes/pterodactyl/admin/services/new.blade.php
+++ b/resources/themes/pterodactyl/admin/services/new.blade.php
@@ -21,7 +21,7 @@
 @section('content')
 <form action="{{ route('admin.services.new') }}" method="POST">
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-12">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">New Service</h3>
@@ -41,19 +41,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
-        <div class="col-md-6">
-            <div class="box">
-                <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Default Start Command</label>
-                        <div>
-                            <textarea name="startup" class="form-control" rows="2">{{ old('startup') }}</textarea>
-                            <p class="text-muted"><small>The default start command to use when running options under this service. This command can be modified per-option and should include the executable to be called in the container.</small></p>
-                        </div>
-                    </div>
-                </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
                     <button type="input" class="btn btn-primary pull-right">Save Service</button>
diff --git a/resources/themes/pterodactyl/admin/services/view.blade.php b/resources/themes/pterodactyl/admin/services/view.blade.php
index f93e75a73..fba791b59 100644
--- a/resources/themes/pterodactyl/admin/services/view.blade.php
+++ b/resources/themes/pterodactyl/admin/services/view.blade.php
@@ -20,70 +20,53 @@
 
 @section('content')
 <div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li class="active"><a href="{{ route('admin.services.view', $service->id) }}">Overview</a></li>
-                <li><a href="{{ route('admin.services.view.functions', $service->id) }}">Functions</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<form action="{{ route('admin.services.view', $service->id) }}" method="POST">
-    <div class="row">
+    <form action="{{ route('admin.services.view', $service->id) }}" method="POST">
         <div class="col-md-6">
             <div class="box">
                 <div class="box-body">
                     <div class="form-group">
-                        <label class="control-label">Name</label>
+                        <label class="control-label">Name <span class="field-required"></span></label>
                         <div>
                             <input type="text" name="name" class="form-control" value="{{ $service->name }}" />
                             <p class="text-muted"><small>This should be a descriptive category name that emcompasses all of the options within the service.</small></p>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label">Description</label>
+                        <label class="control-label">Description <span class="field-required"></span></label>
                         <div>
                             <textarea name="description" class="form-control" rows="7">{{ $service->description }}</textarea>
                         </div>
                     </div>
                 </div>
                 <div class="box-footer">
+                    {!! csrf_field() !!}
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Option</button>
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-sm btn-danger muted muted-hover"><i class="fa fa-trash-o"></i></button>
                 </div>
             </div>
         </div>
-        <div class="col-md-6">
-            <div class="box">
-                <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Default Start Command</label>
-                        <div>
-                            <textarea name="startup" class="form-control" rows="2">{{ $service->startup }}</textarea>
-                            <p class="text-muted"><small>The default start command to use when running options under this service. This command can be modified per-option and should include the executable to be called in the container.</small></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label">Author</label>
-                        <div>
-                            <input type="text" readonly class="form-control" value="{{ $service->author }}" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label">UUID</label>
-                        <div>
-                            <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
-                        </div>
+    </form>
+    <div class="col-md-6">
+        <div class="box">
+            <div class="box-body">
+                <div class="form-group">
+                    <label class="control-label">Author</label>
+                    <div>
+                        <input type="text" readonly class="form-control" value="{{ $service->author }}" />
+                        <p class="text-muted small">The author of this service option. Please direct questions and issues to them unless this is an official option authored by <code>support@pterodactyl.io</code>.</p>
                     </div>
                 </div>
-                <div class="box-footer">
-                    {!! csrf_field() !!}
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Service</button>
+                <div class="form-group">
+                    <label class="control-label">UUID</label>
+                    <div>
+                        <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
+                        <p class="text-muted small">A unique identifier that all servers using this option are assigned for identification purposes.</p>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</form>
+</div>
 <div class="row">
     <div class="col-xs-12">
         <div class="box box-primary">
diff --git a/routes/admin.php b/routes/admin.php
index 568fa0199..31cb8a9aa 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -152,7 +152,6 @@ Route::group(['prefix' => 'services'], function () {
     Route::get('/', 'ServiceController@index')->name('admin.services');
     Route::get('/new', 'ServiceController@create')->name('admin.services.new');
     Route::get('/view/{service}', 'ServiceController@view')->name('admin.services.view');
-    Route::get('/view/{service}/functions', 'ServiceController@viewFunctions')->name('admin.services.view.functions');
     Route::get('/option/new', 'OptionController@create')->name('admin.services.option.new');
     Route::get('/option/{option}', 'OptionController@viewConfiguration')->name('admin.services.option.view');
     Route::get('/option/{option}/export', 'Services\Options\OptionShareController@export')->name('admin.services.option.export');
@@ -165,7 +164,6 @@ Route::group(['prefix' => 'services'], function () {
     Route::post('/option/{option}/variables', 'VariableController@store');
 
     Route::patch('/view/{service}', 'ServiceController@update');
-    Route::patch('/view/{service}/functions', 'ServiceController@updateFunctions');
     Route::patch('/option/{option}', 'OptionController@editConfiguration');
     Route::patch('/option/{option}/scripts', 'OptionController@updateScripts');
     Route::patch('/option/{option}/variables/{variable}', 'VariableController@update')->name('admin.services.option.variables.edit');

From df87ea08670793f09aed8a4151f9b06697638e2c Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 6 Oct 2017 23:57:53 -0500
Subject: [PATCH 20/34] This breaks literally the entire panel.

---
 ...terface.php => EggRepositoryInterface.php} |  24 +--
 ...php => EggVariableRepositoryInterface.php} |   2 +-
 ...erface.php => NestRepositoryInterface.php} |  20 +--
 .../Repository/PackRepositoryInterface.php    |   4 +-
 .../ServiceVariableRepositoryInterface.php    |  14 --
 .../DuplicateOptionTagException.php           |  16 --
 .../API/Admin/ServiceController.php           |   6 +-
 .../API/Remote/OptionRetrievalController.php  |   8 +-
 .../Controllers/Admin/Nests/EggController.php |  32 ++++
 .../EggShareController.php}                   |  34 ++--
 .../Admin/Nests/NestController.php            | 160 ++++++++++++++++++
 .../Controllers/Admin/OptionController.php    |  46 ++---
 app/Http/Controllers/Admin/PackController.php |  24 +--
 .../Controllers/Admin/ServersController.php   |   8 +-
 .../Controllers/Admin/ServiceController.php   |  60 +++----
 .../Controllers/Admin/VariableController.php  |  26 +--
 .../Controllers/Daemon/ServiceController.php  |  10 +-
 .../Controllers/Server/ServerController.php   |   2 +-
 .../StoreNestFormRequest.php}                 |   5 +-
 .../Service/OptionVariableFormRequest.php     |   4 +-
 .../Service/ServiceOptionFormRequest.php      |   4 +-
 app/Models/{ServiceOption.php => Egg.php}     |  48 +++---
 .../{ServiceVariable.php => EggVariable.php}  |  11 +-
 app/Models/{Service.php => Nest.php}          |  16 +-
 app/Models/Pack.php                           |  17 +-
 app/Models/Server.php                         |  24 +--
 app/Models/ServerVariable.php                 |   2 +-
 app/Providers/RepositoryServiceProvider.php   |  21 +--
 ...OptionRepository.php => EggRepository.php} |  36 ++--
 ...pository.php => EggVariableRepository.php} |   8 +-
 ...rviceRepository.php => NestRepository.php} |  32 ++--
 app/Repositories/Eloquent/NodeRepository.php  |   2 +-
 app/Repositories/Eloquent/PackRepository.php  |   4 +-
 .../Eloquent/ServerRepository.php             |  18 +-
 .../Eloquent/ServiceVariableRepository.php    |  24 ---
 .../Eggs/Sharing/EggExporterService.php       |  76 +++++++++
 .../Sharing/EggImporterService.php}           |  77 ++++-----
 .../NestCreationService.php}                  |  29 ++--
 .../NestDeletionService.php}                  |  26 +--
 .../NestUpdateService.php}                    |  22 +--
 .../Servers/VariableValidatorService.php      |   8 +-
 .../Options/InstallScriptUpdateService.php    |  16 +-
 .../OptionConfigurationFileService.php        |  12 +-
 .../Options/OptionCreationService.php         |  16 +-
 .../Options/OptionDeletionService.php         |  10 +-
 .../Services/Options/OptionUpdateService.php  |  16 +-
 .../Sharing/ServiceOptionExporterService.php  |  85 ----------
 .../Variables/VariableCreationService.php     |  20 +--
 .../Variables/VariableUpdateService.php       |  10 +-
 app/Traits/Services/CreatesServiceIndex.php   |  56 ------
 app/Transformers/Admin/OptionTransformer.php  |  12 +-
 app/Transformers/Admin/ServiceTransformer.php |  10 +-
 .../Admin/ServiceVariableTransformer.php      |   6 +-
 database/factories/ModelFactory.php           |  10 +-
 ...5_212803_DeleteServiceExecutableOption.php |  26 ---
 ...03_10_173607_MigrateToNewServiceSystem.php |   6 +-
 ..._ChangeServiceVariablesValidationRules.php |   5 +-
 ...150648_MoveFunctionsFromFileToDatabase.php |   5 +-
 ...ngeToABetterUniqueServiceConfiguration.php |   3 +
 ...10_06_214026_ServicesToNestsConversion.php |  59 +++++++
 ..._214053_ServiceOptionsToEggsConversion.php |  93 ++++++++++
 ...rviceVariablesToEggVariablesConversion.php |  43 +++++
 .../seeds/MinecraftServiceTableSeeder.php     |  40 ++---
 database/seeds/RustServiceTableSeeder.php     |  56 +++---
 database/seeds/SourceServiceTableSeeder.php   |  50 +++---
 database/seeds/TerrariaServiceTableSeeder.php |  14 +-
 database/seeds/VoiceServiceTableSeeder.php    |  20 +--
 resources/lang/en/admin/nests.php             |  31 ++++
 resources/lang/en/admin/services.php          |  32 ----
 resources/lang/en/exceptions.php              |  21 ++-
 .../{services/options => eggs}/view.blade.php |  68 ++++----
 .../admin/{services => nests}/index.blade.php |  44 ++---
 .../admin/{services => nests}/new.blade.php   |  14 +-
 .../admin/{services => nests}/view.blade.php  |  38 +++--
 .../pterodactyl/layouts/admin.blade.php       |   6 +-
 routes/admin.php                              |  44 ++---
 .../Servers/VariableValidatorServiceTest.php  |  16 +-
 .../InstallScriptUpdateServiceTest.php        |  12 +-
 .../Options/OptionCreationServiceTest.php     |  14 +-
 .../Options/OptionDeletionServiceTest.php     |   6 +-
 .../Options/OptionUpdateServiceTest.php       |  12 +-
 .../Services/ServiceCreationServiceTest.php   |  18 +-
 .../Services/ServiceDeletionServiceTest.php   |  12 +-
 .../Services/ServiceUpdateServiceTest.php     |  12 +-
 .../ServiceOptionExporterServiceTest.php      |  14 +-
 .../ServiceOptionImporterServiceTest.php      |  40 ++---
 .../Variables/VariableCreationServiceTest.php |  26 +--
 .../Variables/VariableUpdateServiceTest.php   |   8 +-
 88 files changed, 1205 insertions(+), 992 deletions(-)
 rename app/Contracts/Repository/{ServiceOptionRepositoryInterface.php => EggRepositoryInterface.php} (58%)
 rename app/Contracts/Repository/{OptionVariableRepositoryInterface.php => EggVariableRepositoryInterface.php} (78%)
 rename app/Contracts/Repository/{ServiceRepositoryInterface.php => NestRepositoryInterface.php} (53%)
 delete mode 100644 app/Contracts/Repository/ServiceVariableRepositoryInterface.php
 delete mode 100644 app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
 create mode 100644 app/Http/Controllers/Admin/Nests/EggController.php
 rename app/Http/Controllers/Admin/{Services/Options/OptionShareController.php => Nests/EggShareController.php} (55%)
 create mode 100644 app/Http/Controllers/Admin/Nests/NestController.php
 rename app/Http/Requests/Admin/{Service/ServiceFormRequest.php => Nest/StoreNestFormRequest.php} (76%)
 rename app/Models/{ServiceOption.php => Egg.php} (77%)
 rename app/Models/{ServiceVariable.php => EggVariable.php} (86%)
 rename app/Models/{Service.php => Nest.php} (75%)
 rename app/Repositories/Eloquent/{ServiceOptionRepository.php => EggRepository.php} (68%)
 rename app/Repositories/Eloquent/{OptionVariableRepository.php => EggVariableRepository.php} (57%)
 rename app/Repositories/Eloquent/{ServiceRepository.php => NestRepository.php} (60%)
 delete mode 100644 app/Repositories/Eloquent/ServiceVariableRepository.php
 create mode 100644 app/Services/Eggs/Sharing/EggExporterService.php
 rename app/Services/{Services/Sharing/ServiceOptionImporterService.php => Eggs/Sharing/EggImporterService.php} (54%)
 rename app/Services/{Services/ServiceCreationService.php => Nests/NestCreationService.php} (59%)
 rename app/Services/{Services/ServiceDeletionService.php => Nests/NestDeletionService.php} (59%)
 rename app/Services/{Services/ServiceUpdateService.php => Nests/NestUpdateService.php} (50%)
 delete mode 100644 app/Services/Services/Sharing/ServiceOptionExporterService.php
 delete mode 100644 app/Traits/Services/CreatesServiceIndex.php
 create mode 100644 database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
 create mode 100644 database/migrations/2017_10_06_214053_ServiceOptionsToEggsConversion.php
 create mode 100644 database/migrations/2017_10_06_215741_ServiceVariablesToEggVariablesConversion.php
 create mode 100644 resources/lang/en/admin/nests.php
 delete mode 100644 resources/lang/en/admin/services.php
 rename resources/themes/pterodactyl/admin/{services/options => eggs}/view.blade.php (66%)
 rename resources/themes/pterodactyl/admin/{services => nests}/index.blade.php (63%)
 rename resources/themes/pterodactyl/admin/{services => nests}/new.blade.php (79%)
 rename resources/themes/pterodactyl/admin/{services => nests}/view.blade.php (72%)

diff --git a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php b/app/Contracts/Repository/EggRepositoryInterface.php
similarity index 58%
rename from app/Contracts/Repository/ServiceOptionRepositoryInterface.php
rename to app/Contracts/Repository/EggRepositoryInterface.php
index 310b385ea..364fd0c6d 100644
--- a/app/Contracts/Repository/ServiceOptionRepositoryInterface.php
+++ b/app/Contracts/Repository/EggRepositoryInterface.php
@@ -9,49 +9,49 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
 use Illuminate\Database\Eloquent\Collection;
 
-interface ServiceOptionRepositoryInterface extends RepositoryInterface
+interface EggRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return a service option with the variables relation attached.
+     * Return an egg with the variables relation attached.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithVariables(int $id): ServiceOption;
+    public function getWithVariables(int $id): Egg;
 
     /**
-     * Return all of the service options and their relations to be used in the daemon API.
+     * Return all eggs and their relations to be used in the daemon API.
      *
      * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getAllWithCopyAttributes(): Collection;
 
     /**
-     * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
      *
      * @param int|string $value
      * @param string     $column
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      */
-    public function getWithCopyAttributes($value, string $column = 'id'): ServiceOption;
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg;
 
     /**
      * Return all of the data needed to export a service.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithExportAttributes(int $id): ServiceOption;
+    public function getWithExportAttributes(int $id): Egg;
 
     /**
-     * Confirm a copy script belongs to the same service as the item trying to use it.
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
      *
      * @param int $copyFromId
      * @param int $service
diff --git a/app/Contracts/Repository/OptionVariableRepositoryInterface.php b/app/Contracts/Repository/EggVariableRepositoryInterface.php
similarity index 78%
rename from app/Contracts/Repository/OptionVariableRepositoryInterface.php
rename to app/Contracts/Repository/EggVariableRepositoryInterface.php
index cb3bdc606..afaf7463b 100644
--- a/app/Contracts/Repository/OptionVariableRepositoryInterface.php
+++ b/app/Contracts/Repository/EggVariableRepositoryInterface.php
@@ -9,6 +9,6 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-interface OptionVariableRepositoryInterface extends RepositoryInterface
+interface EggVariableRepositoryInterface extends RepositoryInterface
 {
 }
diff --git a/app/Contracts/Repository/ServiceRepositoryInterface.php b/app/Contracts/Repository/NestRepositoryInterface.php
similarity index 53%
rename from app/Contracts/Repository/ServiceRepositoryInterface.php
rename to app/Contracts/Repository/NestRepositoryInterface.php
index c514c1cf7..b06f9730b 100644
--- a/app/Contracts/Repository/ServiceRepositoryInterface.php
+++ b/app/Contracts/Repository/NestRepositoryInterface.php
@@ -9,37 +9,37 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 
-interface ServiceRepositoryInterface extends RepositoryInterface
+interface NestRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return a service or all services with their associated options, variables, and packs.
+     * Return a nest or all nests with their associated eggs, variables, and packs.
      *
      * @param int $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptions(int $id = null);
+    public function getWithEggs(int $id = null);
 
     /**
-     * Return a service or all services and the count of options, packs, and servers for that service.
+     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
      *
      * @param int|null $id
-     * @return \Pterodactyl\Models\Service|\Illuminate\Database\Eloquent\Collection
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithCounts(int $id = null);
 
     /**
-     * Return a service along with its associated options and the servers relation on those options.
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\Service
+     * @return \Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptionServers(int $id): Service;
+    public function getWithEggServers(int $id): Nest;
 }
diff --git a/app/Contracts/Repository/PackRepositoryInterface.php b/app/Contracts/Repository/PackRepositoryInterface.php
index e634716c2..d6ad80785 100644
--- a/app/Contracts/Repository/PackRepositoryInterface.php
+++ b/app/Contracts/Repository/PackRepositoryInterface.php
@@ -14,12 +14,12 @@ use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
 interface PackRepositoryInterface extends RepositoryInterface, SearchableInterface
 {
     /**
-     * Return a paginated listing of packs with their associated option and server count.
+     * Return a paginated listing of packs with their associated egg and server count.
      *
      * @param int $paginate
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    public function paginateWithOptionAndServerCount($paginate = 50);
+    public function paginateWithEggAndServerCount($paginate = 50);
 
     /**
      * Return a pack with the associated server models attached to it.
diff --git a/app/Contracts/Repository/ServiceVariableRepositoryInterface.php b/app/Contracts/Repository/ServiceVariableRepositoryInterface.php
deleted file mode 100644
index e65e8a45f..000000000
--- a/app/Contracts/Repository/ServiceVariableRepositoryInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Contracts\Repository;
-
-interface ServiceVariableRepositoryInterface extends RepositoryInterface
-{
-}
diff --git a/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php b/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
deleted file mode 100644
index 070beda42..000000000
--- a/app/Exceptions/Service/ServiceOption/DuplicateOptionTagException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
-
-use Pterodactyl\Exceptions\DisplayException;
-
-class DuplicateOptionTagException extends DisplayException
-{
-}
diff --git a/app/Http/Controllers/API/Admin/ServiceController.php b/app/Http/Controllers/API/Admin/ServiceController.php
index 2751e37a5..44e3565ee 100644
--- a/app/Http/Controllers/API/Admin/ServiceController.php
+++ b/app/Http/Controllers/API/Admin/ServiceController.php
@@ -11,7 +11,7 @@ namespace Pterodactyl\Http\Controllers\API\Admin;
 
 use Fractal;
 use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Transformers\Admin\ServiceTransformer;
 
@@ -28,7 +28,7 @@ class ServiceController extends Controller
         $this->authorize('service-list', $request->apiKey());
 
         return Fractal::create()
-            ->collection(Service::all())
+            ->collection(Nest::all())
             ->transformWith(new ServiceTransformer($request))
             ->withResourceName('service')
             ->toArray();
@@ -45,7 +45,7 @@ class ServiceController extends Controller
     {
         $this->authorize('service-view', $request->apiKey());
 
-        $service = Service::findOrFail($id);
+        $service = Nest::findOrFail($id);
         $fractal = Fractal::create()->item($service);
 
         if ($request->input('include')) {
diff --git a/app/Http/Controllers/API/Remote/OptionRetrievalController.php b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
index fdd715ca9..46b4dfb3e 100644
--- a/app/Http/Controllers/API/Remote/OptionRetrievalController.php
+++ b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
@@ -11,7 +11,7 @@ namespace Pterodactyl\Http\Controllers\API\Remote;
 
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionConfigurationFileService;
 
 class OptionRetrievalController extends Controller
@@ -22,18 +22,18 @@ class OptionRetrievalController extends Controller
     protected $configurationFileService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
      * OptionUpdateController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface    $repository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface              $repository
      * @param \Pterodactyl\Services\Services\Options\OptionConfigurationFileService $configurationFileService
      */
     public function __construct(
-        ServiceOptionRepositoryInterface $repository,
+        EggRepositoryInterface $repository,
         OptionConfigurationFileService $configurationFileService
     ) {
         $this->configurationFileService = $configurationFileService;
diff --git a/app/Http/Controllers/Admin/Nests/EggController.php b/app/Http/Controllers/Admin/Nests/EggController.php
new file mode 100644
index 000000000..831305db4
--- /dev/null
+++ b/app/Http/Controllers/Admin/Nests/EggController.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggController extends Controller
+{
+    protected $repository;
+
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function view(Egg $egg): View
+    {
+        return view('admin.eggs.view', [
+            'egg' => $egg,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php
similarity index 55%
rename from app/Http/Controllers/Admin/Services/Options/OptionShareController.php
rename to app/Http/Controllers/Admin/Nests/EggShareController.php
index 76f58eb70..88d7883d7 100644
--- a/app/Http/Controllers/Admin/Services/Options/OptionShareController.php
+++ b/app/Http/Controllers/Admin/Nests/EggShareController.php
@@ -7,54 +7,54 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Controllers\Admin\Services\Options;
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
 
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\RedirectResponse;
-use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
+use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
+use Pterodactyl\Services\Services\Sharing\EggImporterService;
 use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService;
 
-class OptionShareController extends Controller
+class EggShareController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
      */
     protected $exporterService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService
+     * @var \Pterodactyl\Services\Services\Sharing\EggImporterService
      */
     protected $importerService;
 
     /**
      * OptionShareController constructor.
      *
-     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService $exporterService
-     * @param \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService     $exporterService
+     * @param \Pterodactyl\Services\Services\Sharing\EggImporterService $importerService
      */
     public function __construct(
-        ServiceOptionExporterService $exporterService,
-        ServiceOptionImporterService $importerService
+        EggExporterService $exporterService,
+        EggImporterService $importerService
     ) {
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
     }
 
     /**
-     * @param \Pterodactyl\Models\ServiceOption $option
+     * @param \Pterodactyl\Models\Egg $egg
      * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function export(ServiceOption $option): Response
+    public function export(Egg $egg): Response
     {
-        return response($this->exporterService->handle($option->id), 200, [
+        return response($this->exporterService->handle($egg->id), 200, [
             'Content-Transfer-Encoding' => 'binary',
             'Content-Description' => 'File Transfer',
-            'Content-Disposition' => 'attachment; filename=' . kebab_case($option->name) . '.json',
+            'Content-Disposition' => 'attachment; filename=egg-' . kebab_case($egg->name) . '.json',
             'Content-Type' => 'application/json',
         ]);
     }
@@ -71,8 +71,8 @@ class OptionShareController extends Controller
      */
     public function import(OptionImportFormRequest $request): RedirectResponse
     {
-        $option = $this->importerService->handle($request->file('import_file'), $request->input('import_to_service'));
+        $egg = $this->importerService->handle($request->file('import_file'), $request->input('import_to_nest'));
 
-        return redirect()->route('admin.services.option.view', ['option' => $option->id]);
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }
 }
diff --git a/app/Http/Controllers/Admin/Nests/NestController.php b/app/Http/Controllers/Admin/Nests/NestController.php
new file mode 100644
index 000000000..204236025
--- /dev/null
+++ b/app/Http/Controllers/Admin/Nests/NestController.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Nests\NestUpdateService;
+use Pterodactyl\Services\Nests\NestCreationService;
+use Pterodactyl\Services\Nests\NestDeletionService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest;
+
+class NestController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestCreationService
+     */
+    protected $nestCreationService;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestDeletionService
+     */
+    protected $nestDeletionService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Nests\NestUpdateService
+     */
+    protected $nestUpdateService;
+
+    /**
+     * NestController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
+     * @param \Pterodactyl\Services\Nests\NestCreationService           $nestCreationService
+     * @param \Pterodactyl\Services\Nests\NestDeletionService           $nestDeletionService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Nests\NestUpdateService             $nestUpdateService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        NestCreationService $nestCreationService,
+        NestDeletionService $nestDeletionService,
+        NestRepositoryInterface $repository,
+        NestUpdateService $nestUpdateService
+    ) {
+        $this->alert = $alert;
+        $this->nestDeletionService = $nestDeletionService;
+        $this->nestCreationService = $nestCreationService;
+        $this->nestUpdateService = $nestUpdateService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Render nest listing page.
+     *
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function index(): View
+    {
+        return view('admin.nests.index', [
+            'nests' => $this->repository->getWithCounts(),
+        ]);
+    }
+
+    /**
+     * Render nest creation page.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function create(): View
+    {
+        return view('admin.nests.new');
+    }
+
+    /**
+     * Handle the storage of a new nest.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function store(StoreNestFormRequest $request): RedirectResponse
+    {
+        $nest = $this->nestCreationService->handle($request->normalize());
+        $this->alert->success(trans('admin/nests.notices.created', ['name' => $nest->name]))->flash();
+
+        return redirect()->route('admin.nests.view', $nest->id);
+    }
+
+    /**
+     * Return details about a nest including all of the eggs and servers per egg.
+     *
+     * @param int $nest
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function view(int $nest): View
+    {
+        return view('admin.nests.view', [
+            'nest' => $this->repository->getWithEggServers($nest),
+        ]);
+    }
+
+    /**
+     * Handle request to update a nest.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest $request
+     * @param int                                                        $nest
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function update(StoreNestFormRequest $request, int $nest): RedirectResponse
+    {
+        $this->nestUpdateService->handle($nest, $request->normalize());
+        $this->alert->success(trans('admin/nests.notices.updated'))->flash();
+
+        return redirect()->route('admin.nests.view', $nest);
+    }
+
+    /**
+     * Handle request to delete a nest.
+     *
+     * @param \Pterodactyl\Models\Nest $nest
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+     */
+    public function destroy($nest): RedirectResponse
+    {
+        $this->nestDeletionService->handle($nest);
+        $this->alert->success(trans('admin/nests.notices.deleted'))->flash();
+
+        return redirect()->route('admin.nests');
+    }
+}
diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
index 3919fe9bf..40e7b4f49 100644
--- a/app/Http/Controllers/Admin/OptionController.php
+++ b/app/Http/Controllers/Admin/OptionController.php
@@ -10,18 +10,18 @@
 namespace Pterodactyl\Http\Controllers\Admin;
 
 use Javascript;
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\Request;
 use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
 use Pterodactyl\Services\Services\Options\OptionUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionCreationService;
 use Pterodactyl\Services\Services\Options\OptionDeletionService;
 use Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest;
 use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
@@ -53,25 +53,25 @@ class OptionController extends Controller
     protected $optionUpdateService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $serviceRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $serviceOptionRepository;
 
     /**
      * OptionController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                                  $alert
-     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService  $installScriptUpdateService
-     * @param \Pterodactyl\Services\Services\Options\OptionCreationService       $optionCreationService
-     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService       $optionDeletionService
-     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService         $optionUpdateService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface       $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $serviceOptionRepository
+     * @param \Prologue\Alerts\AlertsMessageBag                                 $alert
+     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService $installScriptUpdateService
+     * @param \Pterodactyl\Services\Services\Options\OptionCreationService      $optionCreationService
+     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService      $optionDeletionService
+     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService        $optionUpdateService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface         $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface          $serviceOptionRepository
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -79,8 +79,8 @@ class OptionController extends Controller
         OptionCreationService $optionCreationService,
         OptionDeletionService $optionDeletionService,
         OptionUpdateService $optionUpdateService,
-        ServiceRepositoryInterface $serviceRepository,
-        ServiceOptionRepositoryInterface $serviceOptionRepository
+        NestRepositoryInterface $serviceRepository,
+        EggRepositoryInterface $serviceOptionRepository
     ) {
         $this->alert = $alert;
         $this->installScriptUpdateService = $installScriptUpdateService;
@@ -129,12 +129,12 @@ class OptionController extends Controller
     /**
      * Delete a given option from the database.
      *
-     * @param \Pterodactyl\Models\ServiceOption $option
+     * @param \Pterodactyl\Models\Egg $option
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function destroy(ServiceOption $option)
+    public function destroy(Egg $option)
     {
         $this->optionDeletionService->handle($option->id);
         $this->alert->success(trans('admin/services.options.notices.option_deleted'))->flash();
@@ -145,10 +145,10 @@ class OptionController extends Controller
     /**
      * Display option overview page.
      *
-     * @param \Pterodactyl\Models\ServiceOption $option
+     * @param \Pterodactyl\Models\Egg $option
      * @return \Illuminate\View\View
      */
-    public function viewConfiguration(ServiceOption $option)
+    public function viewConfiguration(Egg $option)
     {
         return view('admin.services.options.view', ['option' => $option]);
     }
@@ -181,14 +181,14 @@ class OptionController extends Controller
     /**
      * Handles POST when editing a configration for a service option.
      *
-     * @param \Illuminate\Http\Request          $request
-     * @param \Pterodactyl\Models\ServiceOption $option
+     * @param \Illuminate\Http\Request $request
+     * @param \Pterodactyl\Models\Egg  $option
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function editConfiguration(Request $request, ServiceOption $option)
+    public function editConfiguration(Request $request, Egg $option)
     {
         try {
             $this->optionUpdateService->handle($option, $request->all());
@@ -204,13 +204,13 @@ class OptionController extends Controller
      * Handles POST when updating script for a service option.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request
-     * @param \Pterodactyl\Models\ServiceOption                         $option
+     * @param \Pterodactyl\Models\Egg                                   $option
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function updateScripts(EditOptionScript $request, ServiceOption $option)
+    public function updateScripts(EditOptionScript $request, Egg $option)
     {
         try {
             $this->installScriptUpdateService->handle($option, $request->normalize());
diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php
index 4ef6cbecf..e25e3d3b9 100644
--- a/app/Http/Controllers/Admin/PackController.php
+++ b/app/Http/Controllers/Admin/PackController.php
@@ -19,9 +19,9 @@ use Pterodactyl\Services\Packs\PackCreationService;
 use Pterodactyl\Services\Packs\PackDeletionService;
 use Pterodactyl\Http\Requests\Admin\PackFormRequest;
 use Pterodactyl\Services\Packs\TemplateUploadService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
 class PackController extends Controller
 {
@@ -61,7 +61,7 @@ class PackController extends Controller
     protected $updateService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $serviceRepository;
 
@@ -73,15 +73,15 @@ class PackController extends Controller
     /**
      * PackController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                            $alert
-     * @param \Illuminate\Contracts\Config\Repository                      $config
-     * @param \Pterodactyl\Services\Packs\ExportPackService                $exportService
-     * @param \Pterodactyl\Services\Packs\PackCreationService              $creationService
-     * @param \Pterodactyl\Services\Packs\PackDeletionService              $deletionService
-     * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface    $repository
-     * @param \Pterodactyl\Services\Packs\PackUpdateService                $updateService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $serviceRepository
-     * @param \Pterodactyl\Services\Packs\TemplateUploadService            $templateUploadService
+     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
+     * @param \Illuminate\Contracts\Config\Repository                   $config
+     * @param \Pterodactyl\Services\Packs\ExportPackService             $exportService
+     * @param \Pterodactyl\Services\Packs\PackCreationService           $creationService
+     * @param \Pterodactyl\Services\Packs\PackDeletionService           $deletionService
+     * @param \Pterodactyl\Contracts\Repository\PackRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Packs\PackUpdateService             $updateService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $serviceRepository
+     * @param \Pterodactyl\Services\Packs\TemplateUploadService         $templateUploadService
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -91,7 +91,7 @@ class PackController extends Controller
         PackDeletionService $deletionService,
         PackRepositoryInterface $repository,
         PackUpdateService $updateService,
-        ServiceRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $serviceRepository,
         TemplateUploadService $templateUploadService
     ) {
         $this->alert = $alert;
diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
index 529d692b3..0b46bb380 100644
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@@ -25,11 +25,11 @@ use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Database\DatabaseManagementService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\StartupModificationService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
@@ -112,7 +112,7 @@ class ServersController extends Controller
     protected $service;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $serviceRepository;
 
@@ -144,7 +144,7 @@ class ServersController extends Controller
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $nodeRepository
      * @param \Pterodactyl\Services\Servers\ReinstallServerService            $reinstallService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface     $repository
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface    $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $serviceRepository
      * @param \Pterodactyl\Services\Servers\StartupModificationService        $startupModificationService
      * @param \Pterodactyl\Services\Servers\SuspensionService                 $suspensionService
      */
@@ -164,7 +164,7 @@ class ServersController extends Controller
         NodeRepositoryInterface $nodeRepository,
         ReinstallServerService $reinstallService,
         ServerRepositoryInterface $repository,
-        ServiceRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $serviceRepository,
         StartupModificationService $startupModificationService,
         SuspensionService $suspensionService
     ) {
diff --git a/app/Http/Controllers/Admin/ServiceController.php b/app/Http/Controllers/Admin/ServiceController.php
index 72332c7b3..bdcfabaf2 100644
--- a/app/Http/Controllers/Admin/ServiceController.php
+++ b/app/Http/Controllers/Admin/ServiceController.php
@@ -10,15 +10,15 @@
 namespace Pterodactyl\Http\Controllers\Admin;
 
 use Illuminate\View\View;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Services\Services\ServiceUpdateService;
-use Pterodactyl\Services\Services\ServiceCreationService;
-use Pterodactyl\Services\Services\ServiceDeletionService;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Services\Services\NestUpdateService;
+use Pterodactyl\Services\Services\NestCreationService;
+use Pterodactyl\Services\Services\NestDeletionService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest;
 use Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest;
 
 class ServiceController extends Controller
@@ -29,40 +29,40 @@ class ServiceController extends Controller
     protected $alert;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceCreationService
+     * @var \Pterodactyl\Services\Services\NestCreationService
      */
     protected $creationService;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceDeletionService
+     * @var \Pterodactyl\Services\Services\NestDeletionService
      */
     protected $deletionService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceUpdateService
+     * @var \Pterodactyl\Services\Services\NestUpdateService
      */
     protected $updateService;
 
     /**
      * ServiceController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                            $alert
-     * @param \Pterodactyl\Services\Services\ServiceCreationService        $creationService
-     * @param \Pterodactyl\Services\Services\ServiceDeletionService        $deletionService
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
-     * @param \Pterodactyl\Services\Services\ServiceUpdateService          $updateService
+     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
+     * @param \Pterodactyl\Services\Services\NestCreationService        $creationService
+     * @param \Pterodactyl\Services\Services\NestDeletionService        $deletionService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Services\NestUpdateService          $updateService
      */
     public function __construct(
         AlertsMessageBag $alert,
-        ServiceCreationService $creationService,
-        ServiceDeletionService $deletionService,
-        ServiceRepositoryInterface $repository,
-        ServiceUpdateService $updateService
+        NestCreationService $creationService,
+        NestDeletionService $deletionService,
+        NestRepositoryInterface $repository,
+        NestUpdateService $updateService
     ) {
         $this->alert = $alert;
         $this->creationService = $creationService;
@@ -109,10 +109,10 @@ class ServiceController extends Controller
     /**
      * Return function editing view for a service.
      *
-     * @param \Pterodactyl\Models\Service $service
+     * @param \Pterodactyl\Models\Nest $service
      * @return \Illuminate\View\View
      */
-    public function viewFunctions(Service $service): View
+    public function viewFunctions(Nest $service): View
     {
         return view('admin.services.functions', ['service' => $service]);
     }
@@ -120,12 +120,12 @@ class ServiceController extends Controller
     /**
      * Handle post action for new service.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request
+     * @param \Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function store(ServiceFormRequest $request): RedirectResponse
+    public function store(StoreNestFormRequest $request): RedirectResponse
     {
         $service = $this->creationService->handle($request->normalize());
         $this->alert->success(trans('admin/services.notices.service_created', ['name' => $service->name]))->flash();
@@ -136,14 +136,14 @@ class ServiceController extends Controller
     /**
      * Edits configuration for a specific service.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFormRequest $request
-     * @param \Pterodactyl\Models\Service                                 $service
+     * @param \Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest $request
+     * @param \Pterodactyl\Models\Nest                                      $service
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(ServiceFormRequest $request, Service $service): RedirectResponse
+    public function update(StoreNestFormRequest $request, Nest $service): RedirectResponse
     {
         $this->updateService->handle($service->id, $request->normalize());
         $this->alert->success(trans('admin/services.notices.service_updated'))->flash();
@@ -155,13 +155,13 @@ class ServiceController extends Controller
      * Update the functions file for a service.
      *
      * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest $request
-     * @param \Pterodactyl\Models\Service                                          $service
+     * @param \Pterodactyl\Models\Nest                                             $service
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function updateFunctions(ServiceFunctionsFormRequest $request, Service $service): RedirectResponse
+    public function updateFunctions(ServiceFunctionsFormRequest $request, Nest $service): RedirectResponse
     {
         $this->updateService->handle($service->id, $request->normalize());
         $this->alert->success(trans('admin/services.notices.functions_updated'))->flash();
@@ -172,12 +172,12 @@ class ServiceController extends Controller
     /**
      * Delete a service from the panel.
      *
-     * @param \Pterodactyl\Models\Service $service
+     * @param \Pterodactyl\Models\Nest $service
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function destroy(Service $service): RedirectResponse
+    public function destroy(Nest $service): RedirectResponse
     {
         $this->deletionService->handle($service->id);
         $this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
diff --git a/app/Http/Controllers/Admin/VariableController.php b/app/Http/Controllers/Admin/VariableController.php
index 786dd756b..dc62ee71f 100644
--- a/app/Http/Controllers/Admin/VariableController.php
+++ b/app/Http/Controllers/Admin/VariableController.php
@@ -9,15 +9,15 @@
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
 use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest;
 use Pterodactyl\Repositories\Eloquent\ServiceVariableRepository;
 use Pterodactyl\Services\Services\Variables\VariableUpdateService;
 use Pterodactyl\Services\Services\Variables\VariableCreationService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 
 class VariableController extends Controller
 {
@@ -32,7 +32,7 @@ class VariableController extends Controller
     protected $creationService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $serviceOptionRepository;
 
@@ -48,7 +48,7 @@ class VariableController extends Controller
 
     public function __construct(
         AlertsMessageBag $alert,
-        ServiceOptionRepositoryInterface $serviceOptionRepository,
+        EggRepositoryInterface $serviceOptionRepository,
         ServiceVariableRepository $serviceVariableRepository,
         VariableCreationService $creationService,
         VariableUpdateService $updateService
@@ -64,13 +64,13 @@ class VariableController extends Controller
      * Handles POST request to create a new option variable.
      *
      * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\ServiceOption                          $option
+     * @param \Pterodactyl\Models\Egg                                    $option
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
      */
-    public function store(OptionVariableFormRequest $request, ServiceOption $option)
+    public function store(OptionVariableFormRequest $request, Egg $option)
     {
         $this->creationService->handle($option->id, $request->normalize());
         $this->alert->success(trans('admin/services.variables.notices.variable_created'))->flash();
@@ -95,8 +95,8 @@ class VariableController extends Controller
      * Handles POST when editing a configration for a service variable.
      *
      * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\ServiceOption                          $option
-     * @param \Pterodactyl\Models\ServiceVariable                        $variable
+     * @param \Pterodactyl\Models\Egg                                    $option
+     * @param \Pterodactyl\Models\EggVariable                            $variable
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -104,7 +104,7 @@ class VariableController extends Controller
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
      */
-    public function update(OptionVariableFormRequest $request, ServiceOption $option, ServiceVariable $variable)
+    public function update(OptionVariableFormRequest $request, Egg $option, EggVariable $variable)
     {
         $this->updateService->handle($variable, $request->normalize());
         $this->alert->success(trans('admin/services.variables.notices.variable_updated', [
@@ -117,11 +117,11 @@ class VariableController extends Controller
     /**
      * Delete a service variable from the system.
      *
-     * @param \Pterodactyl\Models\ServiceOption   $option
-     * @param \Pterodactyl\Models\ServiceVariable $variable
+     * @param \Pterodactyl\Models\Egg         $option
+     * @param \Pterodactyl\Models\EggVariable $variable
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function delete(ServiceOption $option, ServiceVariable $variable)
+    public function delete(Egg $option, EggVariable $variable)
     {
         $this->serviceVariableRepository->delete($variable->id);
         $this->alert->success(trans('admin/services.variables.notices.variable_deleted', [
diff --git a/app/Http/Controllers/Daemon/ServiceController.php b/app/Http/Controllers/Daemon/ServiceController.php
index 62f379395..e37f76dac 100644
--- a/app/Http/Controllers/Daemon/ServiceController.php
+++ b/app/Http/Controllers/Daemon/ServiceController.php
@@ -9,9 +9,9 @@
 
 namespace Pterodactyl\Http\Controllers\Daemon;
 
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Http\Controllers\Controller;
 
 class ServiceController extends Controller
@@ -27,7 +27,7 @@ class ServiceController extends Controller
     public function listServices(Request $request)
     {
         $response = [];
-        foreach (Service::all() as $service) {
+        foreach (Nest::all() as $service) {
             $response[$service->folder] = [
                 'main.json' => sha1($this->getConfiguration($service->id)->toJson()),
                 'index.js' => sha1($service->index_file),
@@ -47,7 +47,7 @@ class ServiceController extends Controller
      */
     public function pull(Request $request, $folder, $file)
     {
-        $service = Service::where('folder', $folder)->firstOrFail();
+        $service = Nest::where('folder', $folder)->firstOrFail();
 
         if ($file === 'index.js') {
             return response($service->index_file)->header('Content-Type', 'text/plain');
@@ -67,7 +67,7 @@ class ServiceController extends Controller
      */
     protected function getConfiguration($id)
     {
-        $options = ServiceOption::where('service_id', $id)->get();
+        $options = Egg::where('service_id', $id)->get();
 
         return $options->mapWithKeys(function ($item) use ($options) {
             return [
diff --git a/app/Http/Controllers/Server/ServerController.php b/app/Http/Controllers/Server/ServerController.php
index acaf582f4..9b4208319 100644
--- a/app/Http/Controllers/Server/ServerController.php
+++ b/app/Http/Controllers/Server/ServerController.php
@@ -54,7 +54,7 @@ class ServerController extends Controller
         $this->authorize('view-startup', $server);
 
         $server->load(['node', 'allocation', 'variables']);
-        $variables = Models\ServiceVariable::where('option_id', $server->option_id)->get();
+        $variables = Models\EggVariable::where('option_id', $server->option_id)->get();
 
         $replacements = [
             '{{SERVER_MEMORY}}' => $server->memory,
diff --git a/app/Http/Requests/Admin/Service/ServiceFormRequest.php b/app/Http/Requests/Admin/Nest/StoreNestFormRequest.php
similarity index 76%
rename from app/Http/Requests/Admin/Service/ServiceFormRequest.php
rename to app/Http/Requests/Admin/Nest/StoreNestFormRequest.php
index e469ecd54..56255e558 100644
--- a/app/Http/Requests/Admin/Service/ServiceFormRequest.php
+++ b/app/Http/Requests/Admin/Nest/StoreNestFormRequest.php
@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Nest;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class ServiceFormRequest extends AdminFormRequest
+class StoreNestFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -21,7 +21,6 @@ class ServiceFormRequest extends AdminFormRequest
         return [
             'name' => 'required|string|min:1|max:255',
             'description' => 'required|nullable|string',
-            'startup' => 'required|nullable|string',
         ];
     }
 }
diff --git a/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php b/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php
index 54d8914e8..2076e8da5 100644
--- a/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php
+++ b/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php
@@ -9,7 +9,7 @@
 
 namespace Pterodactyl\Http\Requests\Admin;
 
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 
 class OptionVariableFormRequest extends AdminFormRequest
 {
@@ -21,7 +21,7 @@ class OptionVariableFormRequest extends AdminFormRequest
         return [
             'name' => 'required|string|min:1|max:255',
             'description' => 'sometimes|nullable|string',
-            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . ServiceVariable::RESERVED_ENV_NAMES,
+            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
             'default_value' => 'string',
             'options' => 'sometimes|required|array',
             'rules' => 'bail|required|string',
diff --git a/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php b/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
index 3099ac92d..065fef0f5 100644
--- a/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
+++ b/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
@@ -9,7 +9,7 @@
 
 namespace Pterodactyl\Http\Requests\Admin\Service;
 
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
 class ServiceOptionFormRequest extends AdminFormRequest
@@ -19,6 +19,6 @@ class ServiceOptionFormRequest extends AdminFormRequest
      */
     public function rules()
     {
-        return ServiceOption::getCreateRules();
+        return Egg::getCreateRules();
     }
 }
diff --git a/app/Models/ServiceOption.php b/app/Models/Egg.php
similarity index 77%
rename from app/Models/ServiceOption.php
rename to app/Models/Egg.php
index e424227fc..fd8740840 100644
--- a/app/Models/ServiceOption.php
+++ b/app/Models/Egg.php
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Sofa\Eloquence\Contracts\CleansAttributes;
 use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class ServiceOption extends Model implements CleansAttributes, ValidableContract
+class Egg extends Model implements CleansAttributes, ValidableContract
 {
     use Eloquence, Validable;
 
@@ -24,7 +24,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
      *
      * @var string
      */
-    protected $table = 'service_options';
+    protected $table = 'eggs';
 
     /**
      * Fields that are not mass assignable.
@@ -67,9 +67,8 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
         'service_id' => 'required',
         'name' => 'required',
         'description' => 'required',
-        'tag' => 'required',
-        'docker_image' => 'sometimes',
-        'startup' => 'sometimes',
+        'docker_image' => 'required',
+        'startup' => 'required',
         'config_from' => 'sometimes',
         'config_stop' => 'required_without:config_from',
         'config_startup' => 'required_without:config_from',
@@ -85,7 +84,6 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
         'uuid' => 'string|size:36',
         'name' => 'string|max:255',
         'description' => 'string',
-        'tag' => 'bail|string|max:150',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
         'config_from' => 'bail|nullable|numeric|exists:service_options,id',
@@ -103,12 +101,10 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
         'config_startup' => null,
         'config_logs' => null,
         'config_files' => null,
-        'startup' => null,
-        'docker_image' => null,
     ];
 
     /**
-     * Returns the install script for the option; if option is copying from another
+     * Returns the install script for the egg; if egg is copying from another
      * it will return the copied script.
      *
      * @return string
@@ -119,7 +115,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Returns the entry command for the option; if option is copying from another
+     * Returns the entry command for the egg; if egg is copying from another
      * it will return the copied entry command.
      *
      * @return string
@@ -130,7 +126,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Returns the install container for the option; if option is copying from another
+     * Returns the install container for the egg; if egg is copying from another
      * it will return the copied install container.
      *
      * @return string
@@ -141,7 +137,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Return the file configuration for a service option.
+     * Return the file configuration for an egg.
      *
      * @return string
      */
@@ -151,7 +147,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Return the startup configuration for a service option.
+     * Return the startup configuration for an egg.
      *
      * @return string
      */
@@ -161,7 +157,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Return the log reading configuration for a service option.
+     * Return the log reading configuration for an egg.
      *
      * @return string
      */
@@ -171,7 +167,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Return the stop command configuration for a service option.
+     * Return the stop command configuration for an egg.
      *
      * @return string
      */
@@ -181,47 +177,47 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Gets service associated with a service option.
+     * Gets nest associated with an egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function service()
+    public function nest()
     {
-        return $this->belongsTo(Service::class);
+        return $this->belongsTo(Nest::class);
     }
 
     /**
-     * Gets all servers associated with this service option.
+     * Gets all servers associated with this egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function servers()
     {
-        return $this->hasMany(Server::class, 'option_id');
+        return $this->hasMany(Server::class, 'egg_id');
     }
 
     /**
-     * Gets all variables associated with this service.
+     * Gets all variables associated with this egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function variables()
     {
-        return $this->hasMany(ServiceVariable::class, 'option_id');
+        return $this->hasMany(EggVariable::class, 'egg_id');
     }
 
     /**
-     * Gets all packs associated with this service.
+     * Gets all packs associated with this egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function packs()
     {
-        return $this->hasMany(Pack::class, 'option_id');
+        return $this->hasMany(Pack::class, 'egg_id');
     }
 
     /**
-     * Get the parent service option from which to copy scripts.
+     * Get the parent egg from which to copy scripts.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -231,7 +227,7 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Get the parent service option from which to copy configuration settings.
+     * Get the parent egg from which to copy configuration settings.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/app/Models/ServiceVariable.php b/app/Models/EggVariable.php
similarity index 86%
rename from app/Models/ServiceVariable.php
rename to app/Models/EggVariable.php
index 52d475107..5341dd0dd 100644
--- a/app/Models/ServiceVariable.php
+++ b/app/Models/EggVariable.php
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Sofa\Eloquence\Contracts\CleansAttributes;
 use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class ServiceVariable extends Model implements CleansAttributes, ValidableContract
+class EggVariable extends Model implements CleansAttributes, ValidableContract
 {
     use Eloquence, Validable;
 
@@ -31,7 +31,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      *
      * @var string
      */
-    protected $table = 'service_variables';
+    protected $table = 'egg_variables';
 
     /**
      * Fields that are not mass assignable.
@@ -46,7 +46,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      * @var array
      */
     protected $casts = [
-        'option_id' => 'integer',
+        'egg_id' => 'integer',
         'user_viewable' => 'integer',
         'user_editable' => 'integer',
     ];
@@ -64,7 +64,7 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'option_id' => 'exists:service_options,id',
+        'egg_id' => 'exists:eggs,id',
         'name' => 'string|between:1,255',
         'description' => 'nullable|string',
         'env_variable' => 'regex:/^[\w]{1,255}$/|notIn:' . self::RESERVED_ENV_NAMES,
@@ -83,9 +83,6 @@ class ServiceVariable extends Model implements CleansAttributes, ValidableContra
     ];
 
     /**
-     * Returns the display executable for the option and will use the parent
-     * service one if the option does not have one defined.
-     *
      * @return bool
      */
     public function getRequiredAttribute($value)
diff --git a/app/Models/Service.php b/app/Models/Nest.php
similarity index 75%
rename from app/Models/Service.php
rename to app/Models/Nest.php
index e6c69bede..1be898c05 100644
--- a/app/Models/Service.php
+++ b/app/Models/Nest.php
@@ -15,7 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Sofa\Eloquence\Contracts\CleansAttributes;
 use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class Service extends Model implements CleansAttributes, ValidableContract
+class Nest extends Model implements CleansAttributes, ValidableContract
 {
     use Eloquence, Validable;
 
@@ -24,7 +24,7 @@ class Service extends Model implements CleansAttributes, ValidableContract
      *
      * @var string
      */
-    protected $table = 'services';
+    protected $table = 'nests';
 
     /**
      * Fields that are mass assignable.
@@ -55,27 +55,27 @@ class Service extends Model implements CleansAttributes, ValidableContract
     ];
 
     /**
-     * Gets all service options associated with this service.
+     * Gets all eggs associated with this service.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
-    public function options()
+    public function eggs()
     {
-        return $this->hasMany(ServiceOption::class);
+        return $this->hasMany(Egg::class);
     }
 
     /**
-     * Returns all of the packs associated with a service, regardless of the service option.
+     * Returns all of the packs associated with a nest, regardless of the egg.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */
     public function packs()
     {
-        return $this->hasManyThrough(Pack::class, ServiceOption::class, 'service_id', 'option_id');
+        return $this->hasManyThrough(Pack::class, Egg::class, 'nest_id', 'egg_id');
     }
 
     /**
-     * Gets all servers associated with this service.
+     * Gets all servers associated with this nest.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
diff --git a/app/Models/Pack.php b/app/Models/Pack.php
index a16c0336d..960199680 100644
--- a/app/Models/Pack.php
+++ b/app/Models/Pack.php
@@ -47,7 +47,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
         'selectable' => 'sometimes|required',
         'visible' => 'sometimes|required',
         'locked' => 'sometimes|required',
-        'option_id' => 'required',
+        'egg_id' => 'required',
     ];
 
     /**
@@ -60,7 +60,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
         'selectable' => 'boolean',
         'visible' => 'boolean',
         'locked' => 'boolean',
-        'option_id' => 'exists:service_options,id',
+        'egg_id' => 'exists:eggs,id',
     ];
 
     /**
@@ -69,7 +69,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected $casts = [
-        'option_id' => 'integer',
+        'egg_id' => 'integer',
         'selectable' => 'boolean',
         'visible' => 'boolean',
         'locked' => 'boolean',
@@ -83,9 +83,8 @@ class Pack extends Model implements CleansAttributes, ValidableContract
     protected $searchableColumns = [
         'name' => 10,
         'uuid' => 8,
-        'option.name' => 6,
-        'option.tag' => 5,
-        'option.docker_image' => 5,
+        'egg.name' => 6,
+        'egg.docker_image' => 5,
         'version' => 2,
     ];
 
@@ -114,13 +113,13 @@ class Pack extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Gets option associated with a service pack.
+     * Gets egg associated with a service pack.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function option()
+    public function egg()
     {
-        return $this->belongsTo(ServiceOption::class);
+        return $this->belongsTo(Egg::class);
     }
 
     /**
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 9657296c2..09563baf1 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -68,8 +68,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'io' => 'required',
         'cpu' => 'required',
         'disk' => 'required',
-        'service_id' => 'required',
-        'option_id' => 'required',
+        'nest_id' => 'required',
+        'egg_id' => 'required',
         'node_id' => 'required',
         'allocation_id' => 'required',
         'pack_id' => 'sometimes',
@@ -92,8 +92,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'cpu' => 'numeric|min:0',
         'disk' => 'numeric|min:0',
         'allocation_id' => 'exists:allocations,id',
-        'service_id' => 'exists:services,id',
-        'option_id' => 'exists:service_options,id',
+        'nest_id' => 'exists:nests,id',
+        'egg_id' => 'exists:eggs,id',
         'pack_id' => 'nullable|numeric|min:0',
         'custom_container' => 'nullable|string',
         'startup' => 'nullable|string',
@@ -119,8 +119,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'cpu' => 'integer',
         'oom_disabled' => 'integer',
         'allocation_id' => 'integer',
-        'service_id' => 'integer',
-        'option_id' => 'integer',
+        'nest_id' => 'integer',
+        'egg_id' => 'integer',
         'pack_id' => 'integer',
         'installed' => 'integer',
     ];
@@ -202,23 +202,23 @@ class Server extends Model implements CleansAttributes, ValidableContract
     }
 
     /**
-     * Gets information for the service associated with this server.
+     * Gets information for the nest associated with this server.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function service()
+    public function nest()
     {
-        return $this->belongsTo(Service::class);
+        return $this->belongsTo(Nest::class);
     }
 
     /**
-     * Gets information for the service option associated with this server.
+     * Gets information for the egg associated with this server.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function option()
+    public function egg()
     {
-        return $this->belongsTo(ServiceOption::class);
+        return $this->belongsTo(Egg::class);
     }
 
     /**
diff --git a/app/Models/ServerVariable.php b/app/Models/ServerVariable.php
index 758044e4e..a17683ed6 100644
--- a/app/Models/ServerVariable.php
+++ b/app/Models/ServerVariable.php
@@ -74,6 +74,6 @@ class ServerVariable extends Model
      */
     public function variable()
     {
-        return $this->belongsTo(ServiceVariable::class, 'variable_id');
+        return $this->belongsTo(EggVariable::class, 'variable_id');
     }
 }
diff --git a/app/Providers/RepositoryServiceProvider.php b/app/Providers/RepositoryServiceProvider.php
index 4582b511c..bc393a883 100644
--- a/app/Providers/RepositoryServiceProvider.php
+++ b/app/Providers/RepositoryServiceProvider.php
@@ -12,6 +12,8 @@ namespace Pterodactyl\Providers;
 use Illuminate\Support\ServiceProvider;
 use Pterodactyl\Repositories\Daemon\FileRepository;
 use Pterodactyl\Repositories\Daemon\PowerRepository;
+use Pterodactyl\Repositories\Eloquent\EggRepository;
+use Pterodactyl\Repositories\Eloquent\NestRepository;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\PackRepository;
 use Pterodactyl\Repositories\Eloquent\TaskRepository;
@@ -19,7 +21,6 @@ use Pterodactyl\Repositories\Eloquent\UserRepository;
 use Pterodactyl\Repositories\Daemon\CommandRepository;
 use Pterodactyl\Repositories\Eloquent\ApiKeyRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Repositories\Eloquent\ServiceRepository;
 use Pterodactyl\Repositories\Eloquent\SessionRepository;
 use Pterodactyl\Repositories\Eloquent\SubuserRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
@@ -28,22 +29,21 @@ use Pterodactyl\Repositories\Eloquent\ScheduleRepository;
 use Pterodactyl\Repositories\Eloquent\DaemonKeyRepository;
 use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Pterodactyl\Repositories\Eloquent\PermissionRepository;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Repositories\Daemon\ConfigurationRepository;
+use Pterodactyl\Repositories\Eloquent\EggVariableRepository;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
 use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Pterodactyl\Repositories\Eloquent\ApiPermissionRepository;
-use Pterodactyl\Repositories\Eloquent\ServiceOptionRepository;
 use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Repositories\Eloquent\OptionVariableRepository;
 use Pterodactyl\Repositories\Eloquent\ServerVariableRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SessionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
-use Pterodactyl\Repositories\Eloquent\ServiceVariableRepository;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
@@ -51,14 +51,12 @@ use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\PowerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\CommandRepositoryInterface;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
 use Pterodactyl\Repositories\Daemon\ServerRepository as DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
@@ -77,17 +75,16 @@ class RepositoryServiceProvider extends ServiceProvider
         $this->app->bind(DaemonKeyRepositoryInterface::class, DaemonKeyRepository::class);
         $this->app->bind(DatabaseRepositoryInterface::class, DatabaseRepository::class);
         $this->app->bind(DatabaseHostRepositoryInterface::class, DatabaseHostRepository::class);
+        $this->app->bind(EggRepositoryInterface::class, EggRepository::class);
+        $this->app->bind(EggVariableRepositoryInterface::class, EggVariableRepository::class);
         $this->app->bind(LocationRepositoryInterface::class, LocationRepository::class);
+        $this->app->bind(NestRepositoryInterface::class, NestRepository::class);
         $this->app->bind(NodeRepositoryInterface::class, NodeRepository::class);
-        $this->app->bind(OptionVariableRepositoryInterface::class, OptionVariableRepository::class);
         $this->app->bind(PackRepositoryInterface::class, PackRepository::class);
         $this->app->bind(PermissionRepositoryInterface::class, PermissionRepository::class);
         $this->app->bind(ScheduleRepositoryInterface::class, ScheduleRepository::class);
         $this->app->bind(ServerRepositoryInterface::class, ServerRepository::class);
         $this->app->bind(ServerVariableRepositoryInterface::class, ServerVariableRepository::class);
-        $this->app->bind(ServiceRepositoryInterface::class, ServiceRepository::class);
-        $this->app->bind(ServiceOptionRepositoryInterface::class, ServiceOptionRepository::class);
-        $this->app->bind(ServiceVariableRepositoryInterface::class, ServiceVariableRepository::class);
         $this->app->bind(SessionRepositoryInterface::class, SessionRepository::class);
         $this->app->bind(SubuserRepositoryInterface::class, SubuserRepository::class);
         $this->app->bind(TaskRepositoryInterface::class, TaskRepository::class);
diff --git a/app/Repositories/Eloquent/ServiceOptionRepository.php b/app/Repositories/Eloquent/EggRepository.php
similarity index 68%
rename from app/Repositories/Eloquent/ServiceOptionRepository.php
rename to app/Repositories/Eloquent/EggRepository.php
index 852726e52..c1fcc583f 100644
--- a/app/Repositories/Eloquent/ServiceOptionRepository.php
+++ b/app/Repositories/Eloquent/EggRepository.php
@@ -9,33 +9,33 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
+use Pterodactyl\Models\Egg;
 use Webmozart\Assert\Assert;
-use Pterodactyl\Models\ServiceOption;
 use Illuminate\Database\Eloquent\Collection;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 
-class ServiceOptionRepository extends EloquentRepository implements ServiceOptionRepositoryInterface
+class EggRepository extends EloquentRepository implements EggRepositoryInterface
 {
     /**
      * {@inheritdoc}
      */
     public function model()
     {
-        return ServiceOption::class;
+        return Egg::class;
     }
 
     /**
-     * Return a service option with the variables relation attached.
+     * Return an egg with the variables relation attached.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithVariables(int $id): ServiceOption
+    public function getWithVariables(int $id): Egg
     {
-        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        /** @var \Pterodactyl\Models\Egg $instance */
         $instance = $this->getBuilder()->with('variables')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
@@ -45,7 +45,7 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
     }
 
     /**
-     * Return all of the service options and their relations to be used in the daemon API.
+     * Return all eggs and their relations to be used in the daemon API.
      *
      * @return \Illuminate\Database\Eloquent\Collection
      */
@@ -55,19 +55,19 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
     }
 
     /**
-     * Return a service option with the scriptFrom and configFrom relations loaded onto the model.
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
      *
      * @param int|string $value
      * @param string     $column
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCopyAttributes($value, string $column = 'id'): ServiceOption
+    public function getWithCopyAttributes($value, string $column = 'id'): Egg
     {
         Assert::true((is_digit($value) || is_string($value)), 'First argument passed to getWithCopyAttributes must be an integer or string, received %s.');
 
-        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        /** @var \Pterodactyl\Models\Egg $instance */
         $instance = $this->getBuilder()->with('scriptFrom', 'configFrom')->where($column, '=', $value)->first($this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
@@ -80,13 +80,13 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
      * Return all of the data needed to export a service.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithExportAttributes(int $id): ServiceOption
+    public function getWithExportAttributes(int $id): Egg
     {
-        /** @var \Pterodactyl\Models\ServiceOption $instance */
+        /** @var \Pterodactyl\Models\Egg $instance */
         $instance = $this->getBuilder()->with('scriptFrom', 'configFrom', 'variables')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
@@ -96,7 +96,7 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
     }
 
     /**
-     * Confirm a copy script belongs to the same service as the item trying to use it.
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
      *
      * @param int $copyFromId
      * @param int $service
@@ -106,7 +106,7 @@ class ServiceOptionRepository extends EloquentRepository implements ServiceOptio
     {
         return $this->getBuilder()->whereNull('copy_script_from')
             ->where('id', '=', $copyFromId)
-            ->where('service_id', '=', $service)
+            ->where('nest_id', '=', $service)
             ->exists();
     }
 }
diff --git a/app/Repositories/Eloquent/OptionVariableRepository.php b/app/Repositories/Eloquent/EggVariableRepository.php
similarity index 57%
rename from app/Repositories/Eloquent/OptionVariableRepository.php
rename to app/Repositories/Eloquent/EggVariableRepository.php
index ced324fdf..9fe1174b4 100644
--- a/app/Repositories/Eloquent/OptionVariableRepository.php
+++ b/app/Repositories/Eloquent/EggVariableRepository.php
@@ -9,16 +9,16 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
-class OptionVariableRepository extends EloquentRepository implements OptionVariableRepositoryInterface
+class EggVariableRepository extends EloquentRepository implements EggVariableRepositoryInterface
 {
     /**
      * {@inheritdoc}
      */
     public function model()
     {
-        return ServiceVariable::class;
+        return EggVariable::class;
     }
 }
diff --git a/app/Repositories/Eloquent/ServiceRepository.php b/app/Repositories/Eloquent/NestRepository.php
similarity index 60%
rename from app/Repositories/Eloquent/ServiceRepository.php
rename to app/Repositories/Eloquent/NestRepository.php
index 1a4fe659c..923186c26 100644
--- a/app/Repositories/Eloquent/ServiceRepository.php
+++ b/app/Repositories/Eloquent/NestRepository.php
@@ -9,31 +9,31 @@
 
 namespace Pterodactyl\Repositories\Eloquent;
 
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
-class ServiceRepository extends EloquentRepository implements ServiceRepositoryInterface
+class NestRepository extends EloquentRepository implements NestRepositoryInterface
 {
     /**
      * {@inheritdoc}
      */
     public function model()
     {
-        return Service::class;
+        return Nest::class;
     }
 
     /**
-     * Return a service or all services with their associated options, variables, and packs.
+     * Return a nest or all nests with their associated eggs, variables, and packs.
      *
      * @param int $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptions(int $id = null)
+    public function getWithEggs(int $id = null)
     {
-        $instance = $this->getBuilder()->with('options.packs', 'options.variables');
+        $instance = $this->getBuilder()->with('eggs.packs', 'eggs.variables');
 
         if (! is_null($id)) {
             $instance = $instance->find($id, $this->getColumns());
@@ -48,16 +48,16 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     }
 
     /**
-     * Return a service or all services and the count of options, packs, and servers for that service.
+     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
      *
      * @param int|null $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Service
+     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithCounts(int $id = null)
     {
-        $instance = $this->getBuilder()->withCount(['options', 'packs', 'servers']);
+        $instance = $this->getBuilder()->withCount(['eggs', 'packs', 'servers']);
 
         if (! is_null($id)) {
             $instance = $instance->find($id, $this->getColumns());
@@ -72,21 +72,21 @@ class ServiceRepository extends EloquentRepository implements ServiceRepositoryI
     }
 
     /**
-     * Return a service along with its associated options and the servers relation on those options.
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
      *
      * @param int $id
-     * @return \Pterodactyl\Models\Service
+     * @return \Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithOptionServers(int $id): Service
+    public function getWithEggServers(int $id): Nest
     {
-        $instance = $this->getBuilder()->with('options.servers')->find($id, $this->getColumns());
+        $instance = $this->getBuilder()->with('eggs.servers')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException;
         }
 
-        /* @var Service $instance */
+        /* @var Nest $instance */
         return $instance;
     }
 }
diff --git a/app/Repositories/Eloquent/NodeRepository.php b/app/Repositories/Eloquent/NodeRepository.php
index 9b48fc1d0..b6a94ec46 100644
--- a/app/Repositories/Eloquent/NodeRepository.php
+++ b/app/Repositories/Eloquent/NodeRepository.php
@@ -116,7 +116,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
      */
     public function getNodeServers($id)
     {
-        $instance = $this->getBuilder()->with('servers.user', 'servers.service', 'servers.option')
+        $instance = $this->getBuilder()->with('servers.user', 'servers.nest', 'servers.egg')
             ->find($id, $this->getColumns());
 
         if (! $instance) {
diff --git a/app/Repositories/Eloquent/PackRepository.php b/app/Repositories/Eloquent/PackRepository.php
index ba88852fe..b2c555512 100644
--- a/app/Repositories/Eloquent/PackRepository.php
+++ b/app/Repositories/Eloquent/PackRepository.php
@@ -75,11 +75,11 @@ class PackRepository extends EloquentRepository implements PackRepositoryInterfa
     /**
      * {@inheritdoc}
      */
-    public function paginateWithOptionAndServerCount($paginate = 50)
+    public function paginateWithEggAndServerCount($paginate = 50)
     {
         Assert::integer($paginate, 'First argument passed to paginateWithOptionAndServerCount must be integer, received %s.');
 
-        return $this->getBuilder()->with('option')->withCount('servers')
+        return $this->getBuilder()->with('egg')->withCount('servers')
             ->search($this->searchTerm)
             ->paginate($paginate, $this->getColumns());
     }
diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php
index 2443f6b25..4a0a153ce 100644
--- a/app/Repositories/Eloquent/ServerRepository.php
+++ b/app/Repositories/Eloquent/ServerRepository.php
@@ -47,7 +47,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
         Assert::nullOrIntegerish($server, 'First argument passed to getDataForRebuild must be null or integer, received %s.');
         Assert::nullOrIntegerish($node, 'Second argument passed to getDataForRebuild must be null or integer, received %s.');
 
-        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'option', 'node');
+        $instance = $this->getBuilder()->with('allocation', 'allocations', 'pack', 'egg', 'node');
 
         if (! is_null($server) && is_null($node)) {
             $instance = $instance->where('id', '=', $server);
@@ -66,7 +66,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
     {
         Assert::integerish($id, 'First argument passed to findWithVariables must be integer, received %s.');
 
-        $instance = $this->getBuilder()->with('option.variables', 'variables')
+        $instance = $this->getBuilder()->with('egg.variables', 'variables')
                          ->where($this->getModel()->getKeyName(), '=', $id)
                          ->first($this->getColumns());
 
@@ -82,7 +82,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getVariablesWithValues($id, $returnWithObject = false)
     {
-        $instance = $this->getBuilder()->with('variables', 'option.variables')
+        $instance = $this->getBuilder()->with('variables', 'egg.variables')
                          ->find($id, $this->getColumns());
 
         if (! $instance) {
@@ -90,7 +90,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
         }
 
         $data = [];
-        $instance->option->variables->each(function ($item) use (&$data, $instance) {
+        $instance->egg->variables->each(function ($item) use (&$data, $instance) {
             $display = $instance->variables->where('variable_id', $item->id)->pluck('variable_value')->first();
 
             $data[$item->env_variable] = $display ?? $item->default_value;
@@ -111,7 +111,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDataForCreation($id)
     {
-        $instance = $this->getBuilder()->with(['allocation', 'allocations', 'pack', 'option'])->find($id, $this->getColumns());
+        $instance = $this->getBuilder()->with(['allocation', 'allocations', 'pack', 'egg'])->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException();
         }
@@ -140,15 +140,15 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDaemonServiceData($id)
     {
-        $instance = $this->getBuilder()->with('option.service', 'pack')->find($id, $this->getColumns());
+        $instance = $this->getBuilder()->with('egg.nest', 'pack')->find($id, $this->getColumns());
 
         if (! $instance) {
             throw new RecordNotFoundException();
         }
 
         return [
-            'type' => $instance->option->service->folder,
-            'option' => $instance->option->tag,
+            'type' => $instance->egg->nest->folder,
+            'option' => $instance->egg->tag,
             'pack' => (! is_null($instance->pack_id)) ? $instance->pack->uuid : null,
         ];
     }
@@ -211,7 +211,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
     {
         Assert::stringNotEmpty($uuid, 'First argument passed to getByUuid must be a non-empty string, received %s.');
 
-        $instance = $this->getBuilder()->with('service', 'node')->where(function ($query) use ($uuid) {
+        $instance = $this->getBuilder()->with('nest', 'node')->where(function ($query) use ($uuid) {
             $query->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
         })->first($this->getColumns());
 
diff --git a/app/Repositories/Eloquent/ServiceVariableRepository.php b/app/Repositories/Eloquent/ServiceVariableRepository.php
deleted file mode 100644
index 6ec798827..000000000
--- a/app/Repositories/Eloquent/ServiceVariableRepository.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Repositories\Eloquent;
-
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-
-class ServiceVariableRepository extends EloquentRepository implements ServiceVariableRepositoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function model()
-    {
-        return ServiceVariable::class;
-    }
-}
diff --git a/app/Services/Eggs/Sharing/EggExporterService.php b/app/Services/Eggs/Sharing/EggExporterService.php
new file mode 100644
index 000000000..82d68fe36
--- /dev/null
+++ b/app/Services/Eggs/Sharing/EggExporterService.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Carbon\Carbon;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggExporterService
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggExporterService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     */
+    public function __construct(EggRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return a JSON representation of an egg and its variables.
+     *
+     * @param int $egg
+     * @return string
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function handle(int $egg): string
+    {
+        $egg = $this->repository->getWithExportAttributes($egg);
+
+        $struct = [
+            '_comment' => 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO',
+            'meta' => [
+                'version' => 'PTDL_v1',
+            ],
+            'exported_at' => Carbon::now()->toIso8601String(),
+            'name' => $egg->name,
+            'author' => $egg->author,
+            'description' => $egg->description,
+            'image' => $egg->docker_image,
+            'config' => [
+                'files' => $egg->inherit_config_files,
+                'startup' => $egg->inherit_config_startup,
+                'logs' => $egg->inherit_config_logs,
+                'stop' => $egg->inherit_config_stop,
+            ],
+            'scripts' => [
+                'installation' => [
+                    'script' => $egg->copy_script_install,
+                    'container' => $egg->copy_script_container,
+                    'entrypoint' => $egg->copy_script_entry,
+                ],
+            ],
+            'variables' => $egg->variables->transform(function ($item) {
+                return collect($item->toArray())->except([
+                    'id', 'egg_id', 'created_at', 'updated_at',
+                ])->toArray();
+            }),
+        ];
+
+        return json_encode($struct, JSON_PRETTY_PRINT);
+    }
+}
diff --git a/app/Services/Services/Sharing/ServiceOptionImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
similarity index 54%
rename from app/Services/Services/Sharing/ServiceOptionImporterService.php
rename to app/Services/Eggs/Sharing/EggImporterService.php
index 4061af285..95776808f 100644
--- a/app/Services/Services/Sharing/ServiceOptionImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -10,16 +10,15 @@
 namespace Pterodactyl\Services\Services\Sharing;
 
 use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\UploadedFile;
-use Pterodactyl\Models\ServiceOption;
 use Illuminate\Database\ConnectionInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\DuplicateOptionTagException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
-class ServiceOptionImporterService
+class EggImporterService
 {
     /**
      * @var \Illuminate\Database\ConnectionInterface
@@ -27,77 +26,71 @@ class ServiceOptionImporterService
     protected $connection;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $eggVariableRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $serviceRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
-     */
-    protected $serviceVariableRepository;
-
-    /**
-     * XMLImporterService constructor.
+     * EggImporterService constructor.
      *
-     * @param \Illuminate\Database\ConnectionInterface                             $connection
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface         $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface   $repository
-     * @param \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface $serviceVariableRepository
+     * @param \Illuminate\Database\ConnectionInterface                         $connection
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $eggVariableRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface        $serviceRepository
      */
     public function __construct(
         ConnectionInterface $connection,
-        ServiceRepositoryInterface $serviceRepository,
-        ServiceOptionRepositoryInterface $repository,
-        ServiceVariableRepositoryInterface $serviceVariableRepository
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $eggVariableRepository,
+        NestRepositoryInterface $serviceRepository
     ) {
         $this->connection = $connection;
         $this->repository = $repository;
         $this->serviceRepository = $serviceRepository;
-        $this->serviceVariableRepository = $serviceVariableRepository;
+        $this->eggVariableRepository = $eggVariableRepository;
     }
 
     /**
-     * Take an uploaded XML file and parse it into a new service option.
+     * Take an uploaded JSON file and parse it into a new egg.
      *
      * @param \Illuminate\Http\UploadedFile $file
-     * @param int                           $service
-     * @return \Pterodactyl\Models\ServiceOption
+     * @param int                           $nest
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
      */
-    public function handle(UploadedFile $file, int $service): ServiceOption
+    public function handle(UploadedFile $file, int $nest): Egg
     {
         if (! $file->isValid() || ! $file->isFile()) {
-            throw new InvalidFileUploadException(trans('exceptions.service.exporter.import_file_error'));
+            throw new InvalidFileUploadException(trans('exceptions.egg.importer.file_error'));
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));
 
         if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
-            throw new InvalidFileUploadException(trans('exceptions.service.exporter.invalid_json_provided'));
+            throw new InvalidFileUploadException(trans('exceptions.egg.importer.invalid_json_provided'));
         }
 
-        $service = $this->serviceRepository->getWithOptions($service);
-        $service->options->each(function ($option) use ($parsed) {
-            if ($option->tag === object_get($parsed, 'tag')) {
-                throw new DuplicateOptionTagException(trans('exceptions.service.options.duplicate_tag'));
-            }
-        });
-
+        $nest = $this->serviceRepository->getWithEggs($nest);
         $this->connection->beginTransaction();
-        $option = $this->repository->create([
+
+        $egg = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
-            'service_id' => $service->id,
+            'nest_id' => $nest->id,
             'name' => object_get($parsed, 'name'),
             'description' => object_get($parsed, 'description'),
-            'tag' => object_get($parsed, 'tag'),
             'docker_image' => object_get($parsed, 'image'),
             'config_files' => object_get($parsed, 'config.files'),
             'config_startup' => object_get($parsed, 'config.startup'),
@@ -110,14 +103,14 @@ class ServiceOptionImporterService
             'copy_script_from' => null,
         ], true, true);
 
-        collect($parsed->variables)->each(function ($variable) use ($option) {
-            $this->serviceVariableRepository->create(array_merge((array) $variable, [
-                'option_id' => $option->id,
+        collect($parsed->variables)->each(function ($variable) use ($egg) {
+            $this->eggVariableRepository->create(array_merge((array) $variable, [
+                'egg_id' => $egg->id,
             ]));
         });
 
         $this->connection->commit();
 
-        return $option;
+        return $egg;
     }
 }
diff --git a/app/Services/Services/ServiceCreationService.php b/app/Services/Nests/NestCreationService.php
similarity index 59%
rename from app/Services/Services/ServiceCreationService.php
rename to app/Services/Nests/NestCreationService.php
index b0ddc62fb..797ad8a42 100644
--- a/app/Services/Services/ServiceCreationService.php
+++ b/app/Services/Nests/NestCreationService.php
@@ -7,59 +7,54 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services;
+namespace Pterodactyl\Services\Nests;
 
 use Ramsey\Uuid\Uuid;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
+use Pterodactyl\Models\Nest;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
-class ServiceCreationService
+class NestCreationService
 {
-    use CreatesServiceIndex;
-
     /**
      * @var \Illuminate\Contracts\Config\Repository
      */
     protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * ServiceCreationService constructor.
+     * NestCreationService constructor.
      *
-     * @param \Illuminate\Contracts\Config\Repository                      $config
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Illuminate\Contracts\Config\Repository                   $config
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
      */
     public function __construct(
         ConfigRepository $config,
-        ServiceRepositoryInterface $repository
+        NestRepositoryInterface $repository
     ) {
         $this->config = $config;
         $this->repository = $repository;
     }
 
     /**
-     * Create a new service on the system.
+     * Create a new nest on the system.
      *
      * @param array $data
-     * @return \Pterodactyl\Models\Service
+     * @return \Pterodactyl\Models\Nest
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function handle(array $data): Service
+    public function handle(array $data): Nest
     {
         return $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
             'author' => $this->config->get('pterodactyl.service.author'),
             'name' => array_get($data, 'name'),
             'description' => array_get($data, 'description'),
-            'startup' => array_get($data, 'startup'),
-            'index_file' => $this->getIndexScript(),
         ], true, true);
     }
 }
diff --git a/app/Services/Services/ServiceDeletionService.php b/app/Services/Nests/NestDeletionService.php
similarity index 59%
rename from app/Services/Services/ServiceDeletionService.php
rename to app/Services/Nests/NestDeletionService.php
index 0a88b1209..6bdaf8de2 100644
--- a/app/Services/Services/ServiceDeletionService.php
+++ b/app/Services/Nests/NestDeletionService.php
@@ -7,13 +7,13 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services;
+namespace Pterodactyl\Services\Nests;
 
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
-class ServiceDeletionService
+class NestDeletionService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
@@ -21,39 +21,39 @@ class ServiceDeletionService
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * ServiceDeletionService constructor.
+     * NestDeletionService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface  $serverRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface   $repository
      */
     public function __construct(
         ServerRepositoryInterface $serverRepository,
-        ServiceRepositoryInterface $repository
+        NestRepositoryInterface $repository
     ) {
         $this->serverRepository = $serverRepository;
         $this->repository = $repository;
     }
 
     /**
-     * Delete a service from the system only if there are no servers attached to it.
+     * Delete a nest from the system only if there are no servers attached to it.
      *
-     * @param int $service
+     * @param int $nest
      * @return int
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function handle(int $service): int
+    public function handle(int $nest): int
     {
-        $count = $this->serverRepository->findCountWhere([['service_id', '=', $service]]);
+        $count = $this->serverRepository->findCountWhere([['nest_id', '=', $nest]]);
         if ($count > 0) {
             throw new HasActiveServersException(trans('exceptions.service.delete_has_servers'));
         }
 
-        return $this->repository->delete($service);
+        return $this->repository->delete($nest);
     }
 }
diff --git a/app/Services/Services/ServiceUpdateService.php b/app/Services/Nests/NestUpdateService.php
similarity index 50%
rename from app/Services/Services/ServiceUpdateService.php
rename to app/Services/Nests/NestUpdateService.php
index c6f5e322f..12f3a506a 100644
--- a/app/Services/Services/ServiceUpdateService.php
+++ b/app/Services/Nests/NestUpdateService.php
@@ -7,41 +7,41 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services;
+namespace Pterodactyl\Services\Nests;
 
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
-class ServiceUpdateService
+class NestUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * ServiceUpdateService constructor.
+     * NestUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
      */
-    public function __construct(ServiceRepositoryInterface $repository)
+    public function __construct(NestRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
 
     /**
-     * Update a service and prevent changing the author once it is set.
+     * Update a nest and prevent changing the author once it is set.
      *
-     * @param int   $service
+     * @param int   $nest
      * @param array $data
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(int $service, array $data)
+    public function handle(int $nest, array $data)
     {
         if (! is_null(array_get($data, 'author'))) {
             unset($data['author']);
         }
 
-        $this->repository->withoutFresh()->update($service, $data);
+        $this->repository->withoutFresh()->update($nest, $data);
     }
 }
diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php
index 6c9efe32b..e890bfb93 100644
--- a/app/Services/Servers/VariableValidatorService.php
+++ b/app/Services/Servers/VariableValidatorService.php
@@ -12,7 +12,7 @@ namespace Pterodactyl\Services\Servers;
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 
 class VariableValidatorService
@@ -33,7 +33,7 @@ class VariableValidatorService
     protected $results = [];
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
     protected $optionVariableRepository;
 
@@ -55,13 +55,13 @@ class VariableValidatorService
     /**
      * VariableValidatorService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface $optionVariableRepository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface    $optionVariableRepository
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $serverRepository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Illuminate\Contracts\Validation\Factory                            $validator
      */
     public function __construct(
-        OptionVariableRepositoryInterface $optionVariableRepository,
+        EggVariableRepositoryInterface $optionVariableRepository,
         ServerRepositoryInterface $serverRepository,
         ServerVariableRepositoryInterface $serverVariableRepository,
         ValidationFactory $validator
diff --git a/app/Services/Services/Options/InstallScriptUpdateService.php b/app/Services/Services/Options/InstallScriptUpdateService.php
index 7b302190e..1d5a9a920 100644
--- a/app/Services/Services/Options/InstallScriptUpdateService.php
+++ b/app/Services/Services/Options/InstallScriptUpdateService.php
@@ -9,23 +9,23 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
 
 class InstallScriptUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
      * InstallScriptUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
+    public function __construct(EggRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
@@ -33,8 +33,8 @@ class InstallScriptUpdateService
     /**
      * Modify the option install script for a given service option.
      *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
+     * @param int|\Pterodactyl\Models\Egg $option
+     * @param array                       $data
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -42,7 +42,7 @@ class InstallScriptUpdateService
      */
     public function handle($option, array $data)
     {
-        if (! $option instanceof ServiceOption) {
+        if (! $option instanceof Egg) {
             $option = $this->repository->find($option);
         }
 
diff --git a/app/Services/Services/Options/OptionConfigurationFileService.php b/app/Services/Services/Options/OptionConfigurationFileService.php
index c21f435dd..e8656fdba 100644
--- a/app/Services/Services/Options/OptionConfigurationFileService.php
+++ b/app/Services/Services/Options/OptionConfigurationFileService.php
@@ -9,8 +9,8 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 
 class OptionConfigurationFileService
 {
@@ -19,9 +19,9 @@ class OptionConfigurationFileService
     /**
      * OptionConfigurationFileService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
+    public function __construct(EggRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
@@ -29,14 +29,14 @@ class OptionConfigurationFileService
     /**
      * Return a service configuration file to be used by the daemon.
      *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
+     * @param int|\Pterodactyl\Models\Egg $option
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function handle($option): array
     {
-        if (! $option instanceof ServiceOption) {
+        if (! $option instanceof Egg) {
             $option = $this->repository->getWithCopyAttributes($option);
         }
 
diff --git a/app/Services/Services/Options/OptionCreationService.php b/app/Services/Services/Options/OptionCreationService.php
index 8149a5596..05f4c639e 100644
--- a/app/Services/Services/Options/OptionCreationService.php
+++ b/app/Services/Services/Options/OptionCreationService.php
@@ -10,9 +10,9 @@
 namespace Pterodactyl\Services\Services\Options;
 
 use Ramsey\Uuid\Uuid;
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionCreationService
@@ -23,17 +23,17 @@ class OptionCreationService
     protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
      * CreationService constructor.
      *
-     * @param \Illuminate\Contracts\Config\Repository                            $config
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     * @param \Illuminate\Contracts\Config\Repository                  $config
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
-    public function __construct(ConfigRepository $config, ServiceOptionRepositoryInterface $repository)
+    public function __construct(ConfigRepository $config, EggRepositoryInterface $repository)
     {
         $this->config = $config;
         $this->repository = $repository;
@@ -43,12 +43,12 @@ class OptionCreationService
      * Create a new service option and assign it to the given service.
      *
      * @param array $data
-     * @return \Pterodactyl\Models\ServiceOption
+     * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
      */
-    public function handle(array $data): ServiceOption
+    public function handle(array $data): Egg
     {
         if (! is_null(array_get($data, 'config_from'))) {
             $results = $this->repository->findCountWhere([
diff --git a/app/Services/Services/Options/OptionDeletionService.php b/app/Services/Services/Options/OptionDeletionService.php
index 626c9d756..35c60cb93 100644
--- a/app/Services/Services/Options/OptionDeletionService.php
+++ b/app/Services/Services/Options/OptionDeletionService.php
@@ -9,15 +9,15 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
 
 class OptionDeletionService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
@@ -29,12 +29,12 @@ class OptionDeletionService
     /**
      * OptionDeletionService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface        $serverRepository
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface    $repository
      */
     public function __construct(
         ServerRepositoryInterface $serverRepository,
-        ServiceOptionRepositoryInterface $repository
+        EggRepositoryInterface $repository
     ) {
         $this->repository = $repository;
         $this->serverRepository = $serverRepository;
diff --git a/app/Services/Services/Options/OptionUpdateService.php b/app/Services/Services/Options/OptionUpdateService.php
index 1d2109de5..1daaf14ae 100644
--- a/app/Services/Services/Options/OptionUpdateService.php
+++ b/app/Services/Services/Options/OptionUpdateService.php
@@ -9,23 +9,23 @@
 
 namespace Pterodactyl\Services\Services\Options;
 
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
     /**
      * OptionUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
-    public function __construct(ServiceOptionRepositoryInterface $repository)
+    public function __construct(EggRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
@@ -33,8 +33,8 @@ class OptionUpdateService
     /**
      * Update a service option.
      *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
+     * @param int|\Pterodactyl\Models\Egg $option
+     * @param array                       $data
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -42,7 +42,7 @@ class OptionUpdateService
      */
     public function handle($option, array $data)
     {
-        if (! $option instanceof ServiceOption) {
+        if (! $option instanceof Egg) {
             $option = $this->repository->find($option);
         }
 
diff --git a/app/Services/Services/Sharing/ServiceOptionExporterService.php b/app/Services/Services/Sharing/ServiceOptionExporterService.php
deleted file mode 100644
index 8f2d1ebf5..000000000
--- a/app/Services/Services/Sharing/ServiceOptionExporterService.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Services\Services\Sharing;
-
-use Carbon\Carbon;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-
-class ServiceOptionExporterService
-{
-    /**
-     * @var \Carbon\Carbon
-     */
-    protected $carbon;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * XMLExporterService constructor.
-     *
-     * @param \Carbon\Carbon                                                     $carbon
-     * @param \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface $repository
-     */
-    public function __construct(
-        Carbon $carbon,
-        ServiceOptionRepositoryInterface $repository
-    ) {
-        $this->carbon = $carbon;
-        $this->repository = $repository;
-    }
-
-    /**
-     * Return an XML structure to represent this service option.
-     *
-     * @param int $option
-     * @return string
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function handle(int $option): string
-    {
-        $option = $this->repository->getWithExportAttributes($option);
-
-        $struct = [
-            '_comment' => 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO',
-            'meta' => [
-                'version' => 'PTDL_v1',
-            ],
-            'exported_at' => $this->carbon->now()->toIso8601String(),
-            'name' => $option->name,
-            'author' => array_get(explode(':', $option->tag), 0),
-            'description' => $option->description,
-            'image' => $option->docker_image,
-            'config' => [
-                'files' => $option->inherit_config_files,
-                'startup' => $option->inherit_config_startup,
-                'logs' => $option->inherit_config_logs,
-                'stop' => $option->inherit_config_stop,
-            ],
-            'scripts' => [
-                'installation' => [
-                    'script' => $option->copy_script_install,
-                    'container' => $option->copy_script_container,
-                    'entrypoint' => $option->copy_script_entry,
-                ],
-            ],
-            'variables' => $option->variables->transform(function ($item) {
-                return collect($item->toArray())->except([
-                    'id', 'option_id', 'created_at', 'updated_at',
-                ])->toArray();
-            }),
-        ];
-
-        return json_encode($struct, JSON_PRETTY_PRINT);
-    }
-}
diff --git a/app/Services/Services/Variables/VariableCreationService.php b/app/Services/Services/Variables/VariableCreationService.php
index 110224888..f6891df26 100644
--- a/app/Services/Services/Variables/VariableCreationService.php
+++ b/app/Services/Services/Variables/VariableCreationService.php
@@ -9,16 +9,16 @@
 
 namespace Pterodactyl\Services\Services\Variables;
 
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
 
 class VariableCreationService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $serviceOptionRepository;
 
@@ -28,7 +28,7 @@ class VariableCreationService
     protected $serviceVariableRepository;
 
     public function __construct(
-        ServiceOptionRepositoryInterface $serviceOptionRepository,
+        EggRepositoryInterface $serviceOptionRepository,
         ServiceVariableRepositoryInterface $serviceVariableRepository
     ) {
         $this->serviceOptionRepository = $serviceOptionRepository;
@@ -38,20 +38,20 @@ class VariableCreationService
     /**
      * Create a new variable for a given service option.
      *
-     * @param int|\Pterodactyl\Models\ServiceOption $option
-     * @param array                                 $data
-     * @return \Pterodactyl\Models\ServiceVariable
+     * @param int|\Pterodactyl\Models\Egg $option
+     * @param array                       $data
+     * @return \Pterodactyl\Models\EggVariable
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
      */
     public function handle($option, array $data)
     {
-        if ($option instanceof ServiceOption) {
+        if ($option instanceof Egg) {
             $option = $option->id;
         }
 
-        if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) {
+        if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
             throw new ReservedVariableNameException(sprintf(
                 'Cannot use the protected name %s for this environment variable.',
                 array_get($data, 'env_variable')
diff --git a/app/Services/Services/Variables/VariableUpdateService.php b/app/Services/Services/Variables/VariableUpdateService.php
index 08bb35dc0..28573785d 100644
--- a/app/Services/Services/Variables/VariableUpdateService.php
+++ b/app/Services/Services/Variables/VariableUpdateService.php
@@ -9,7 +9,7 @@
 
 namespace Pterodactyl\Services\Services\Variables;
 
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
@@ -34,8 +34,8 @@ class VariableUpdateService
     /**
      * Update a specific service variable.
      *
-     * @param int|\Pterodactyl\Models\ServiceVariable $variable
-     * @param array                                   $data
+     * @param int|\Pterodactyl\Models\EggVariable $variable
+     * @param array                               $data
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
@@ -45,12 +45,12 @@ class VariableUpdateService
      */
     public function handle($variable, array $data)
     {
-        if (! $variable instanceof ServiceVariable) {
+        if (! $variable instanceof EggVariable) {
             $variable = $this->repository->find($variable);
         }
 
         if (! is_null(array_get($data, 'env_variable'))) {
-            if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) {
+            if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
                 throw new ReservedVariableNameException(trans('exceptions.service.variables.reserved_name', [
                     'name' => array_get($data, 'env_variable'),
                 ]));
diff --git a/app/Traits/Services/CreatesServiceIndex.php b/app/Traits/Services/CreatesServiceIndex.php
deleted file mode 100644
index 13c925a8b..000000000
--- a/app/Traits/Services/CreatesServiceIndex.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Traits\Services;
-
-trait CreatesServiceIndex
-{
-    /**
-     * Returns the default index.js file that is used for services on the daemon.
-     *
-     * @return string
-     */
-    public function getIndexScript()
-    {
-        return <<<'EOF'
-'use strict';
-
-/**
- * Pterodactyl - Daemon
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-const rfr = require('rfr');
-const _ = require('lodash');
-
-const Core = rfr('src/services/index.js');
-
-class Service extends Core {}
-
-module.exports = Service;
-EOF;
-    }
-}
diff --git a/app/Transformers/Admin/OptionTransformer.php b/app/Transformers/Admin/OptionTransformer.php
index d9af33c09..089f880ec 100644
--- a/app/Transformers/Admin/OptionTransformer.php
+++ b/app/Transformers/Admin/OptionTransformer.php
@@ -9,8 +9,8 @@
 
 namespace Pterodactyl\Transformers\Admin;
 
+use Pterodactyl\Models\Egg;
 use Illuminate\Http\Request;
-use Pterodactyl\Models\ServiceOption;
 use League\Fractal\TransformerAbstract;
 
 class OptionTransformer extends TransformerAbstract
@@ -53,7 +53,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return array
      */
-    public function transform(ServiceOption $option)
+    public function transform(Egg $option)
     {
         return $option->toArray();
     }
@@ -63,7 +63,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeService(ServiceOption $option)
+    public function includeService(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('service-view')) {
             return;
@@ -77,7 +77,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includePacks(ServiceOption $option)
+    public function includePacks(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) {
             return;
@@ -91,7 +91,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeServers(ServiceOption $option)
+    public function includeServers(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
             return;
@@ -105,7 +105,7 @@ class OptionTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeVariables(ServiceOption $option)
+    public function includeVariables(Egg $option)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('option-view')) {
             return;
diff --git a/app/Transformers/Admin/ServiceTransformer.php b/app/Transformers/Admin/ServiceTransformer.php
index 2fd4b79c4..5f8497cf7 100644
--- a/app/Transformers/Admin/ServiceTransformer.php
+++ b/app/Transformers/Admin/ServiceTransformer.php
@@ -10,7 +10,7 @@
 namespace Pterodactyl\Transformers\Admin;
 
 use Illuminate\Http\Request;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 use League\Fractal\TransformerAbstract;
 
 class ServiceTransformer extends TransformerAbstract
@@ -52,7 +52,7 @@ class ServiceTransformer extends TransformerAbstract
      *
      * @return array
      */
-    public function transform(Service $service)
+    public function transform(Nest $service)
     {
         return $service->toArray();
     }
@@ -62,7 +62,7 @@ class ServiceTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeOptions(Service $service)
+    public function includeOptions(Nest $service)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('option-list')) {
             return;
@@ -76,7 +76,7 @@ class ServiceTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeServers(Service $service)
+    public function includeServers(Nest $service)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
             return;
@@ -90,7 +90,7 @@ class ServiceTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includePacks(Service $service)
+    public function includePacks(Nest $service)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('pack-list')) {
             return;
diff --git a/app/Transformers/Admin/ServiceVariableTransformer.php b/app/Transformers/Admin/ServiceVariableTransformer.php
index 507cf1bc8..49f5e449a 100644
--- a/app/Transformers/Admin/ServiceVariableTransformer.php
+++ b/app/Transformers/Admin/ServiceVariableTransformer.php
@@ -10,8 +10,8 @@
 namespace Pterodactyl\Transformers\Admin;
 
 use Illuminate\Http\Request;
+use Pterodactyl\Models\EggVariable;
 use League\Fractal\TransformerAbstract;
-use Pterodactyl\Models\ServiceVariable;
 
 class ServiceVariableTransformer extends TransformerAbstract
 {
@@ -48,7 +48,7 @@ class ServiceVariableTransformer extends TransformerAbstract
      *
      * @return array
      */
-    public function transform(ServiceVariable $variable)
+    public function transform(EggVariable $variable)
     {
         return $variable->toArray();
     }
@@ -58,7 +58,7 @@ class ServiceVariableTransformer extends TransformerAbstract
      *
      * @return \Leauge\Fractal\Resource\Collection
      */
-    public function includeVariables(ServiceVariable $variable)
+    public function includeVariables(EggVariable $variable)
     {
         if ($this->request && ! $this->request->apiKeyHasPermission('server-view')) {
             return;
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 46895d70d..5be190075 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -88,7 +88,7 @@ $factory->define(Pterodactyl\Models\Node::class, function (Faker\Generator $fake
     ];
 });
 
-$factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $faker) {
+$factory->define(Pterodactyl\Models\Nest::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
         'uuid' => $faker->unique()->uuid,
@@ -98,7 +98,7 @@ $factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $f
     ];
 });
 
-$factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Generator $faker) {
+$factory->define(Pterodactyl\Models\Egg::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
         'uuid' => $faker->unique()->uuid,
@@ -109,7 +109,7 @@ $factory->define(Pterodactyl\Models\ServiceOption::class, function (Faker\Genera
     ];
 });
 
-$factory->define(Pterodactyl\Models\ServiceVariable::class, function (Faker\Generator $faker) {
+$factory->define(Pterodactyl\Models\EggVariable::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
         'name' => $faker->firstName,
@@ -122,11 +122,11 @@ $factory->define(Pterodactyl\Models\ServiceVariable::class, function (Faker\Gene
     ];
 });
 
-$factory->state(Pterodactyl\Models\ServiceVariable::class, 'viewable', function () {
+$factory->state(Pterodactyl\Models\EggVariable::class, 'viewable', function () {
     return ['user_viewable' => 1];
 });
 
-$factory->state(Pterodactyl\Models\ServiceVariable::class, 'editable', function () {
+$factory->state(Pterodactyl\Models\EggVariable::class, 'editable', function () {
     return ['user_editable' => 1];
 });
 
diff --git a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
index 2d6413ede..2918e1afd 100644
--- a/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
+++ b/database/migrations/2017_03_05_212803_DeleteServiceExecutableOption.php
@@ -1,6 +1,5 @@
 <?php
 
-use Pterodactyl\Models\ServiceOption;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -13,31 +12,6 @@ class DeleteServiceExecutableOption extends Migration
     public function up()
     {
         DB::transaction(function () {
-            // Attempt to fix any startup commands for servers
-            // that we possibly can. Also set new containers.
-            foreach (ServiceOption::with('servers')->get() as $option) {
-                $option->servers->each(function ($s) use ($option) {
-                    $prepend = $option->display_executable;
-                    $prepend = ($prepend === './ShooterGameServer') ? './ShooterGame/Binaries/Linux/ShooterGameServer' : $prepend;
-                    $prepend = ($prepend === 'TerrariaServer.exe') ? 'mono TerrariaServer.exe' : $prepend;
-
-                    $s->startup = $prepend . ' ' . $s->startup;
-
-                    $container = $s->container;
-                    if (starts_with($container, 'quay.io/pterodactyl/minecraft')) {
-                        $s->container = 'quay.io/pterodactyl/core:java';
-                    } elseif (starts_with($container, 'quay.io/pterodactyl/srcds')) {
-                        $s->container = 'quay.io/pterodactyl/core:source';
-                    } elseif (starts_with($container, 'quay.io/pterodactyl/voice')) {
-                        $s->container = 'quay.io/pterodactyl/core:glibc';
-                    } elseif (starts_with($container, 'quay.io/pterodactyl/terraria')) {
-                        $s->container = 'quay.io/pterodactyl/core:mono';
-                    }
-
-                    $s->save();
-                });
-            }
-
             Schema::table('services', function (Blueprint $table) {
                 $table->renameColumn('file', 'folder');
                 $table->dropColumn('executable');
diff --git a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
index ca92c2f69..039976352 100644
--- a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
+++ b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php
@@ -6,8 +6,6 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
 use Illuminate\Database\Migrations\Migration;
 
 class MigrateToNewServiceSystem extends Migration
@@ -18,12 +16,12 @@ class MigrateToNewServiceSystem extends Migration
     public function up()
     {
         DB::transaction(function () {
-            $service = Service::where('author', config('pterodactyl.service.core'))->where('folder', 'srcds')->first();
+            $service = DB::table('services')->where('author', config('pterodactyl.service.core'))->where('folder', 'srcds')->first();
             if (! $service) {
                 return;
             }
 
-            $options = ServiceOption::where('service_id', $service->id)->get();
+            $options = DB::table('service_options')->where('service_id', $service->id)->get();
             $options->each(function ($item) use ($options) {
                 if ($item->tag === 'srcds' && $item->name === 'Insurgency') {
                     $item->tag = 'insurgency';
diff --git a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
index 7784083a1..21fa51465 100644
--- a/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
+++ b/database/migrations/2017_03_11_215455_ChangeServiceVariablesValidationRules.php
@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Support\Facades\Schema;
-use Pterodactyl\Models\ServiceVariable;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
@@ -17,7 +16,7 @@ class ChangeServiceVariablesValidationRules extends Migration
         });
 
         DB::transaction(function () {
-            foreach (ServiceVariable::all() as $variable) {
+            foreach (DB::table('service_variables')->get() as $variable) {
                 $variable->rules = ($variable->required) ? 'required|regex:' . $variable->rules : 'regex:' . $variable->rules;
                 $variable->save();
             }
@@ -39,7 +38,7 @@ class ChangeServiceVariablesValidationRules extends Migration
         });
 
         DB::transaction(function () {
-            foreach (ServiceVariable::all() as $variable) {
+            foreach (DB::table('service_variables')->get() as $variable) {
                 $variable->regex = str_replace(['required|regex:', 'regex:'], '', $variable->regex);
                 $variable->save();
             }
diff --git a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
index 5d5a3d164..3628ba7a4 100644
--- a/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
+++ b/database/migrations/2017_03_12_150648_MoveFunctionsFromFileToDatabase.php
@@ -1,6 +1,5 @@
 <?php
 
-use Pterodactyl\Models\Service;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -93,11 +92,11 @@ EOF;
         });
 
         DB::transaction(function () {
-            Service::where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('folder', '!=', 'minecraft')->update([
+            DB::table('services')->where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('folder', '!=', 'minecraft')->update([
                 'index_file' => $this->default,
             ]);
 
-            Service::where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('folder', 'minecraft')->update([
+            DB::table('services')->where('author', 'ptrdctyl-v040-11e6-8b77-86f30ca893d3')->where('folder', 'minecraft')->update([
                 'index_file' => $this->default_mc,
             ]);
         });
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
index 7ce854c56..5c9df79a5 100644
--- a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
+++ b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -15,6 +15,7 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->char('uuid', 36)->after('id');
+            $table->string('author')->after('service_id');
             $table->dropColumn('tag');
         });
 
@@ -25,6 +26,7 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
                 'services.author AS service_author',
             ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
+                    'author' => $option->service_author,
                     'uuid' => Uuid::uuid4()->toString(),
                 ]);
             });
@@ -42,6 +44,7 @@ class ChangeToABetterUniqueServiceConfiguration extends Migration
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->dropColumn('uuid');
+            $table->dropColumn('author');
             $table->string('tag');
         });
 
diff --git a/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php b/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
new file mode 100644
index 000000000..e7b70136c
--- /dev/null
+++ b/database/migrations/2017_10_06_214026_ServicesToNestsConversion.php
@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ServicesToNestsConversion extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::rename('services', 'nests');
+
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropForeign(['service_id']);
+            $table->renameColumn('service_id', 'nest_id');
+
+            $table->foreign('nest_id')->references('id')->on('nests');
+        });
+
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->dropForeign(['service_id']);
+            $table->renameColumn('service_id', 'nest_id');
+
+            $table->foreign('nest_id')->references('id')->on('nests')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::rename('nests', 'services');
+
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropForeign(['nest_id']);
+            $table->renameColumn('nest_id', 'service_id');
+
+            $table->foreign('service_id')->references('id')->on('services');
+        });
+
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->dropForeign(['nest_id']);
+            $table->renameColumn('nest_id', 'service_id');
+
+            $table->foreign('service_id')->references('id')->on('services')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+}
diff --git a/database/migrations/2017_10_06_214053_ServiceOptionsToEggsConversion.php b/database/migrations/2017_10_06_214053_ServiceOptionsToEggsConversion.php
new file mode 100644
index 000000000..d2c55c057
--- /dev/null
+++ b/database/migrations/2017_10_06_214053_ServiceOptionsToEggsConversion.php
@@ -0,0 +1,93 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ServiceOptionsToEggsConversion extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->dropForeign(['config_from']);
+            $table->dropForeign(['copy_script_from']);
+        });
+
+        Schema::rename('service_options', 'eggs');
+
+        Schema::table('packs', function (Blueprint $table) {
+            $table->dropForeign(['option_id']);
+            $table->renameColumn('option_id', 'egg_id');
+
+            $table->foreign('egg_id')->references('id')->on('eggs')->onDelete('CASCADE');
+        });
+
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropForeign(['option_id']);
+            $table->renameColumn('option_id', 'egg_id');
+
+            $table->foreign('egg_id')->references('id')->on('eggs');
+        });
+
+        Schema::table('eggs', function (Blueprint $table) {
+            $table->foreign('config_from')->references('id')->on('eggs')->onDelete('SET NULL');
+            $table->foreign('copy_script_from')->references('id')->on('eggs')->onDelete('SET NULL');
+        });
+
+        Schema::table('service_variables', function (Blueprint $table) {
+            $table->dropForeign(['option_id']);
+            $table->renameColumn('option_id', 'egg_id');
+
+            $table->foreign('egg_id')->references('id')->on('eggs')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::table('eggs', function (Blueprint $table) {
+            $table->dropForeign(['config_from']);
+            $table->dropForeign(['copy_script_from']);
+        });
+
+        Schema::rename('eggs', 'service_options');
+
+        Schema::table('packs', function (Blueprint $table) {
+            $table->dropForeign(['egg_id']);
+            $table->renameColumn('egg_id', 'option_id');
+
+            $table->foreign('option_id')->references('id')->on('service_options')->onDelete('CASCADE');
+        });
+
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropForeign(['egg_id']);
+            $table->renameColumn('egg_id', 'option_id');
+
+            $table->foreign('option_id')->references('id')->on('service_options');
+        });
+
+        Schema::table('service_options', function (Blueprint $table) {
+            $table->foreign('config_from')->references('id')->on('service_options')->onDelete('SET NULL');
+            $table->foreign('copy_script_from')->references('id')->on('service_options')->onDelete('SET NULL');
+        });
+
+        Schema::table('service_variables', function (Blueprint $table) {
+            $table->dropForeign(['egg_id']);
+            $table->renameColumn('egg_id', 'option_id');
+
+            $table->foreign('option_id')->references('id')->on('options')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+}
diff --git a/database/migrations/2017_10_06_215741_ServiceVariablesToEggVariablesConversion.php b/database/migrations/2017_10_06_215741_ServiceVariablesToEggVariablesConversion.php
new file mode 100644
index 000000000..ef7d3811d
--- /dev/null
+++ b/database/migrations/2017_10_06_215741_ServiceVariablesToEggVariablesConversion.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ServiceVariablesToEggVariablesConversion extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::rename('service_variables', 'egg_variables');
+
+        Schema::table('server_variables', function (Blueprint $table) {
+            $table->dropForeign(['variable_id']);
+
+            $table->foreign('variable_id')->references('id')->on('egg_variables')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::disableForeignKeyConstraints();
+
+        Schema::rename('egg_variables', 'service_variables');
+
+        Schema::table('server_variables', function (Blueprint $table) {
+            $table->dropForeign(['variable_id']);
+
+            $table->foreign('variable_id')->references('id')->on('service_variables')->onDelete('CASCADE');
+        });
+
+        Schema::enableForeignKeyConstraints();
+    }
+}
diff --git a/database/seeds/MinecraftServiceTableSeeder.php b/database/seeds/MinecraftServiceTableSeeder.php
index 114fc8457..d10c93213 100644
--- a/database/seeds/MinecraftServiceTableSeeder.php
+++ b/database/seeds/MinecraftServiceTableSeeder.php
@@ -6,17 +6,17 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 
 class MinecraftServiceTableSeeder extends Seeder
 {
     /**
      * The core service ID.
      *
-     * @var \Pterodactyl\Models\Service
+     * @var \Pterodactyl\Models\Nest
      */
     protected $service;
 
@@ -80,7 +80,7 @@ EOF;
 
     private function addCoreService()
     {
-        $this->service = Service::updateOrCreate([
+        $this->service = Nest::updateOrCreate([
             'author' => config('pterodactyl.service.core'),
             'folder' => 'minecraft',
         ], [
@@ -114,7 +114,7 @@ fi
 curl -o ${SERVER_JARFILE} https://s3.amazonaws.com/Minecraft.Download/versions/${DL_VERSION}/minecraft_server.${DL_VERSION}.jar
 EOF;
 
-        $this->option['vanilla'] = ServiceOption::updateOrCreate([
+        $this->option['vanilla'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'vanilla',
         ], [
@@ -148,7 +148,7 @@ if [ ! -z "${DL_PATH}" ]; then
 fi
 EOF;
 
-        $this->option['spigot'] = ServiceOption::updateOrCreate([
+        $this->option['spigot'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'spigot',
         ], [
@@ -178,7 +178,7 @@ cd /mnt/server
 curl -sSL "https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/${SPONGE_VERSION}/spongevanilla-${SPONGE_VERSION}.jar" -o ${SERVER_JARFILE}
 EOF;
 
-        $this->option['sponge'] = ServiceOption::updateOrCreate([
+        $this->option['sponge'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'sponge',
         ], [
@@ -211,7 +211,7 @@ fi
 curl -o ${SERVER_JARFILE} https://ci.md-5.net/job/BungeeCord/${BUNGEE_VERSION}/artifact/bootstrap/target/BungeeCord.jar
 EOF;
 
-        $this->option['bungeecord'] = ServiceOption::updateOrCreate([
+        $this->option['bungeecord'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'bungeecord',
         ], [
@@ -247,7 +247,7 @@ java -jar installer.jar --installServer
 rm -rf installer.jar
 EOF;
 
-        $this->option['forge'] = ServiceOption::updateOrCreate([
+        $this->option['forge'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'forge',
         ], [
@@ -276,7 +276,7 @@ EOF;
 
     private function addVanillaVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['vanilla']->id,
             'env_variable' => 'SERVER_JARFILE',
         ], [
@@ -288,7 +288,7 @@ EOF;
             'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['vanilla']->id,
             'env_variable' => 'VANILLA_VERSION',
         ], [
@@ -303,7 +303,7 @@ EOF;
 
     private function addSpigotVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['spigot']->id,
             'env_variable' => 'SERVER_JARFILE',
         ], [
@@ -315,7 +315,7 @@ EOF;
             'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['spigot']->id,
             'env_variable' => 'DL_VERSION',
         ], [
@@ -327,7 +327,7 @@ EOF;
             'rules' => 'required|string|between:3,7',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['spigot']->id,
             'env_variable' => 'DL_PATH',
         ], [
@@ -342,7 +342,7 @@ EOF;
 
     private function addSpongeVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['sponge']->id,
             'env_variable' => 'SPONGE_VERSION',
         ], [
@@ -354,7 +354,7 @@ EOF;
             'rules' => 'required|regex:/^([a-zA-Z0-9.\-_]+)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['sponge']->id,
             'env_variable' => 'SERVER_JARFILE',
         ], [
@@ -369,7 +369,7 @@ EOF;
 
     private function addBungeecordVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['bungeecord']->id,
             'env_variable' => 'BUNGEE_VERSION',
         ], [
@@ -381,7 +381,7 @@ EOF;
             'rules' => 'required|alpha_num|between:1,6',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['bungeecord']->id,
             'env_variable' => 'SERVER_JARFILE',
         ], [
@@ -396,7 +396,7 @@ EOF;
 
     private function addForgeVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['forge']->id,
             'env_variable' => 'SERVER_JARFILE',
         ], [
diff --git a/database/seeds/RustServiceTableSeeder.php b/database/seeds/RustServiceTableSeeder.php
index 5b1b49f81..39e54032e 100644
--- a/database/seeds/RustServiceTableSeeder.php
+++ b/database/seeds/RustServiceTableSeeder.php
@@ -6,10 +6,10 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
 
 class RustServiceTableSeeder extends Seeder
@@ -42,7 +42,7 @@ class RustServiceTableSeeder extends Seeder
 
     private function addCoreService()
     {
-        $this->service = Service::updateOrCreate([
+        $this->service = Nest::updateOrCreate([
             'author' => config('pterodactyl.service.core'),
             'folder' => 'rust',
         ], [
@@ -75,7 +75,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['rustvanilla'] = ServiceOption::updateOrCreate([
+        $this->option['rustvanilla'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'rustvanilla',
         ], [
@@ -119,7 +119,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v /mnt/server/steam/linux32/steamclient.so /mnt/server/.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['rustoxide'] = ServiceOption::updateOrCreate([
+        $this->option['rustoxide'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'rustoxide',
         ], [
@@ -146,7 +146,7 @@ EOF;
 
     private function addVanillaVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'HOSTNAME',
         ], [
@@ -158,7 +158,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'LEVEL',
         ], [
@@ -170,7 +170,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'DESCRIPTION',
         ], [
@@ -182,7 +182,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'URL',
         ], [
@@ -194,7 +194,7 @@ EOF;
             'rules' => 'url',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'WORLD_SIZE',
         ], [
@@ -206,7 +206,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'SEED',
         ], [
@@ -218,7 +218,7 @@ EOF;
             'rules' => 'present',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'MAX_PLAYERS',
         ], [
@@ -230,7 +230,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'SERVER_IMG',
         ], [
@@ -242,7 +242,7 @@ EOF;
             'rules' => 'url',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'RCON_PORT',
         ], [
@@ -254,7 +254,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'RCON_PASS',
         ], [
@@ -266,7 +266,7 @@ EOF;
             'rules' => 'required',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustvanilla']->id,
             'env_variable' => 'ADDITIONAL_ARGS',
         ], [
@@ -281,7 +281,7 @@ EOF;
 
     private function addOxideVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'HOSTNAME',
         ], [
@@ -293,7 +293,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'LEVEL',
         ], [
@@ -305,7 +305,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'DESCRIPTION',
         ], [
@@ -317,7 +317,7 @@ EOF;
             'rules' => 'required|string',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'URL',
         ], [
@@ -329,7 +329,7 @@ EOF;
             'rules' => 'url',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'WORLD_SIZE',
         ], [
@@ -341,7 +341,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'SEED',
         ], [
@@ -353,7 +353,7 @@ EOF;
             'rules' => 'present',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'MAX_PLAYERS',
         ], [
@@ -365,7 +365,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'SERVER_IMG',
         ], [
@@ -377,7 +377,7 @@ EOF;
             'rules' => 'url',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'RCON_PORT',
         ], [
@@ -389,7 +389,7 @@ EOF;
             'rules' => 'required|integer',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'RCON_PASS',
         ], [
@@ -401,7 +401,7 @@ EOF;
             'rules' => 'required',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['rustoxide']->id,
             'env_variable' => 'ADDITIONAL_ARGS',
         ], [
diff --git a/database/seeds/SourceServiceTableSeeder.php b/database/seeds/SourceServiceTableSeeder.php
index efeec5ec9..c8394444b 100644
--- a/database/seeds/SourceServiceTableSeeder.php
+++ b/database/seeds/SourceServiceTableSeeder.php
@@ -6,10 +6,10 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
 
 class SourceServiceTableSeeder extends Seeder
@@ -42,7 +42,7 @@ class SourceServiceTableSeeder extends Seeder
 
     private function addCoreService()
     {
-        $this->service = Service::updateOrCreate([
+        $this->service = Nest::updateOrCreate([
             'author' => config('pterodactyl.service.core'),
             'folder' => 'srcds',
         ], [
@@ -81,7 +81,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['source'] = ServiceOption::updateOrCreate([
+        $this->option['source'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'source',
         ], [
@@ -99,7 +99,7 @@ EOF;
             'script_container' => 'ubuntu:16.04',
         ]);
 
-        $this->option['insurgency'] = ServiceOption::updateOrCreate([
+        $this->option['insurgency'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'insurgency',
         ], [
@@ -115,7 +115,7 @@ EOF;
             'copy_script_from' => $this->option['source']->id,
         ]);
 
-        $this->option['tf2'] = ServiceOption::updateOrCreate([
+        $this->option['tf2'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'tf2',
         ], [
@@ -161,7 +161,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['ark'] = ServiceOption::updateOrCreate([
+        $this->option['ark'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'ark',
         ], [
@@ -205,7 +205,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['csgo'] = ServiceOption::updateOrCreate([
+        $this->option['csgo'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'csgo',
         ], [
@@ -249,7 +249,7 @@ mkdir -p /mnt/server/.steam/sdk32
 cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
 EOF;
 
-        $this->option['gmod'] = ServiceOption::updateOrCreate([
+        $this->option['gmod'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'gmod',
         ], [
@@ -280,7 +280,7 @@ EOF;
 
     private function addInsurgencyVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['insurgency']->id,
             'env_variable' => 'SRCDS_APPID',
         ], [
@@ -292,7 +292,7 @@ EOF;
             'rules' => 'required|regex:/^(17705)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['insurgency']->id,
             'env_variable' => 'SRCDS_GAME',
         ], [
@@ -304,7 +304,7 @@ EOF;
             'rules' => 'required|regex:/^(insurgency)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['insurgency']->id,
             'env_variable' => 'SRCDS_MAP',
         ], [
@@ -319,7 +319,7 @@ EOF;
 
     private function addTF2Variables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['tf2']->id,
             'env_variable' => 'SRCDS_APPID',
         ], [
@@ -331,7 +331,7 @@ EOF;
             'rules' => 'required|regex:/^(232250)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['tf2']->id,
             'env_variable' => 'SRCDS_GAME',
         ], [
@@ -343,7 +343,7 @@ EOF;
             'rules' => 'required|regex:/^(tf)$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['tf2']->id,
             'env_variable' => 'SRCDS_MAP',
         ], [
@@ -358,7 +358,7 @@ EOF;
 
     private function addArkVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['ark']->id,
             'env_variable' => 'ARK_PASSWORD',
         ], [
@@ -370,7 +370,7 @@ EOF;
             'rules' => 'alpha_dash|between:1,100',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['ark']->id,
             'env_variable' => 'ARK_ADMIN_PASSWORD',
         ], [
@@ -382,7 +382,7 @@ EOF;
             'rules' => 'alpha_dash|between:1,100',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['ark']->id,
             'env_variable' => 'SERVER_MAX_PLAYERS',
         ], [
@@ -397,7 +397,7 @@ EOF;
 
     private function addCSGOVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['csgo']->id,
             'env_variable' => 'SRCDS_MAP',
         ], [
@@ -409,7 +409,7 @@ EOF;
             'rules' => 'required|string|alpha_dash',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['csgo']->id,
             'env_variable' => 'STEAM_ACC',
         ], [
@@ -424,7 +424,7 @@ EOF;
 
     private function addGMODVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['gmod']->id,
             'env_variable' => 'SRCDS_MAP',
         ], [
@@ -436,7 +436,7 @@ EOF;
             'rules' => 'required|string|alpha_dash',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['gmod']->id,
             'env_variable' => 'STEAM_ACC',
         ], [
@@ -451,7 +451,7 @@ EOF;
 
     private function addCustomVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['source']->id,
             'env_variable' => 'SRCDS_APPID',
         ], [
@@ -463,7 +463,7 @@ EOF;
             'rules' => 'required|numeric|digits_between:1,6',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['source']->id,
             'env_variable' => 'SRCDS_GAME',
         ], [
diff --git a/database/seeds/TerrariaServiceTableSeeder.php b/database/seeds/TerrariaServiceTableSeeder.php
index 46b7bb67e..1e0303e55 100644
--- a/database/seeds/TerrariaServiceTableSeeder.php
+++ b/database/seeds/TerrariaServiceTableSeeder.php
@@ -6,10 +6,10 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
 
 class TerrariaServiceTableSeeder extends Seeder
@@ -42,7 +42,7 @@ class TerrariaServiceTableSeeder extends Seeder
 
     private function addCoreService()
     {
-        $this->service = Service::updateOrCreate([
+        $this->service = Nest::updateOrCreate([
             'author' => config('pterodactyl.service.core'),
             'folder' => 'terraria',
         ], [
@@ -70,7 +70,7 @@ curl -sSLO https://github.com/NyxStudios/TShock/releases/download/v${T_VERSION}/
 unzip -o tshock_${T_VERSION}.zip -d /mnt/server
 EOF;
 
-        $this->option['tshock'] = ServiceOption::updateOrCreate([
+        $this->option['tshock'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'tshock',
         ], [
@@ -89,7 +89,7 @@ EOF;
 
     private function addVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['tshock']->id,
             'env_variable' => 'T_VERSION',
         ], [
@@ -101,7 +101,7 @@ EOF;
             'rules' => 'required|regex:/^([0-9_\.-]{5,10})$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['tshock']->id,
             'env_variable' => 'MAX_SLOTS',
         ], [
diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php
index 193e45741..f7c786c73 100644
--- a/database/seeds/VoiceServiceTableSeeder.php
+++ b/database/seeds/VoiceServiceTableSeeder.php
@@ -6,10 +6,10 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
-use Pterodactyl\Models\Service;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
 
 class VoiceServiceTableSeeder extends Seeder
@@ -19,7 +19,7 @@ class VoiceServiceTableSeeder extends Seeder
     /**
      * The core service ID.
      *
-     * @var Service
+     * @var Nest
      */
     protected $service;
 
@@ -42,7 +42,7 @@ class VoiceServiceTableSeeder extends Seeder
 
     private function addCoreService()
     {
-        $this->service = Service::updateOrCreate([
+        $this->service = Nest::updateOrCreate([
             'author' => config('pterodactyl.service.core'),
             'folder' => 'voice',
         ], [
@@ -71,7 +71,7 @@ tar -xjvf murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
 cp -r murmur-static_x86-${MUMBLE_VERSION}/* /mnt/server
 EOF;
 
-        $this->option['mumble'] = ServiceOption::updateOrCreate([
+        $this->option['mumble'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'mumble',
         ], [
@@ -124,7 +124,7 @@ logappend=0
 query_skipbruteforcecheck=0" > /mnt/server/ts3server.ini
 EOF;
 
-        $this->option['ts3'] = ServiceOption::updateOrCreate([
+        $this->option['ts3'] = Egg::updateOrCreate([
             'service_id' => $this->service->id,
             'tag' => 'ts3',
         ], [
@@ -143,7 +143,7 @@ EOF;
 
     private function addVariables()
     {
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['mumble']->id,
             'env_variable' => 'MAX_USERS',
         ], [
@@ -155,7 +155,7 @@ EOF;
             'rules' => 'required|numeric|digits_between:1,5',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['mumble']->id,
             'env_variable' => 'MUMBLE_VERSION',
         ], [
@@ -167,7 +167,7 @@ EOF;
             'rules' => 'required|regex:/^([0-9_\.-]{5,8})$/',
         ]);
 
-        ServiceVariable::updateOrCreate([
+        EggVariable::updateOrCreate([
             'option_id' => $this->option['ts3']->id,
             'env_variable' => 'TS_VERSION',
         ], [
diff --git a/resources/lang/en/admin/nests.php b/resources/lang/en/admin/nests.php
new file mode 100644
index 000000000..6ddb44fac
--- /dev/null
+++ b/resources/lang/en/admin/nests.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+return [
+    'notices' => [
+        'created' => 'A new nest, :name, has been successfully created.',
+        'deleted' => 'Successfully deleted the requested nest from the Panel.',
+        'updated' => 'Successfully updated the nest configuration options.',
+    ],
+    'eggs' => [
+        'notices' => [
+            'deleted' => 'Successfully deleted the requested egg from the Panel.',
+            'updated' => 'Egg configuration has been updated successfully.',
+            'script_updated' => 'Egg install script has been updated and will run whenever servers are installed.',
+            'egg_created' => 'A new egg was laid successfully. You will need to restart any running daemons to apply this new egg.',
+        ],
+    ],
+    'variables' => [
+        'notices' => [
+            'variable_deleted' => 'The variable ":variable" has been deleted and will no longer be available to servers once rebuilt.',
+            'variable_updated' => 'The variable ":variable" has been updated. You will need to rebuild any servers using this variable in order to apply changes.',
+            'variable_created' => 'New variable has successfully been created and assigned to this egg.',
+        ],
+    ],
+];
diff --git a/resources/lang/en/admin/services.php b/resources/lang/en/admin/services.php
deleted file mode 100644
index 86db21509..000000000
--- a/resources/lang/en/admin/services.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-return [
-    'notices' => [
-        'service_created' => 'A new service, :name, has been successfully created.',
-        'service_deleted' => 'Successfully deleted the requested service from the Panel.',
-        'service_updated' => 'Successfully updated the service configuration options.',
-        'functions_updated' => 'The service functions file has been updated. You will need to reboot your Nodes in order for these changes to be applied.',
-    ],
-    'options' => [
-        'notices' => [
-            'option_deleted' => 'Successfully deleted the requested service option from the Panel.',
-            'option_updated' => 'Service option configuration has been updated successfully.',
-            'script_updated' => 'Service option install script has been updated and will run whenever servers are installed.',
-            'option_created' => 'New service option was created successfully. You will need to restart any running daemons to apply this new service.',
-        ],
-    ],
-    'variables' => [
-        'notices' => [
-            'variable_deleted' => 'The variable ":variable" has been deleted and will no longer be available to servers once rebuilt.',
-            'variable_updated' => 'The variable ":variable" has been updated. You will need to rebuild any servers using this variable in order to apply changes.',
-            'variable_created' => 'New variable has successfully been created and assigned to this service option.',
-        ],
-    ],
-];
diff --git a/resources/lang/en/exceptions.php b/resources/lang/en/exceptions.php
index 7d42e1621..c700b62ff 100644
--- a/resources/lang/en/exceptions.php
+++ b/resources/lang/en/exceptions.php
@@ -18,21 +18,20 @@ return [
         'invalid_mapping' => 'The mapping provided for :port was invalid and could not be processed.',
         'cidr_out_of_range' => 'CIDR notation only allows masks between /25 and /32.',
     ],
-    'service' => [
-        'delete_has_servers' => 'A service with active servers attached to it cannot be deleted from the Panel.',
-        'options' => [
-            'duplicate_tag' => 'A service option with that tag already exists for this service.',
-            'delete_has_servers' => 'A service option with active servers attached to it cannot be deleted from the Panel.',
-            'invalid_copy_id' => 'The service option selected for copying a script from either does not exist, or is copying a script itself.',
-            'must_be_child' => 'The "Copy Settings From" directive for this option must be a child option for the selected service.',
-            'has_children' => 'This service option is a parent to one or more other options. Please delete those options before deleting this option.',
+    'nest' => [
+        'delete_has_servers' => 'A Nest with active servers attached to it cannot be deleted from the Panel.',
+        'egg' => [
+            'delete_has_servers' => 'An Egg with active servers attached to it cannot be deleted from the Panel.',
+            'invalid_copy_id' => 'The Egg selected for copying a script from either does not exist, or is copying a script itself.',
+            'must_be_child' => 'The "Copy Settings From" directive for this Egg must be a child option for the selected Nest.',
+            'has_children' => 'This Egg is a parent to one or more other Eggs. Please delete those Eggs before deleting this Egg.',
         ],
         'variables' => [
-            'env_not_unique' => 'The environment variable :name must be unique to this service option.',
+            'env_not_unique' => 'The environment variable :name must be unique to this Egg.',
             'reserved_name' => 'The environment variable :name is protected and cannot be assigned to a variable.',
         ],
-        'exporter' => [
-            'import_file_error' => 'The XML file provided was not valid.',
+        'importer' => [
+            'file_error' => 'The JSON file provided was not valid.',
             'invalid_json_provided' => 'The JSON file provided is not in a format that can be recognized.',
         ],
     ],
diff --git a/resources/themes/pterodactyl/admin/services/options/view.blade.php b/resources/themes/pterodactyl/admin/eggs/view.blade.php
similarity index 66%
rename from resources/themes/pterodactyl/admin/services/options/view.blade.php
rename to resources/themes/pterodactyl/admin/eggs/view.blade.php
index 641a28be7..dc99434eb 100644
--- a/resources/themes/pterodactyl/admin/services/options/view.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/view.blade.php
@@ -6,16 +6,16 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service &rarr; Option: {{ $option->name }}
+    Nests &rarr; Egg: {{ $egg->name }}
 @endsection
 
 @section('content-header')
-    <h1>{{ $option->name }}<small>{{ str_limit($option->description, 50) }}</small></h1>
+    <h1>{{ $egg->name }}<small>{{ str_limit($egg->description, 50) }}</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li><a href="{{ route('admin.services.view', $option->service->id) }}">{{ $option->service->name }}</a></li>
-        <li class="active">{{ $option->name }}</li>
+        <li><a href="{{ route('admin.nests') }}">Nests</a></li>
+        <li><a href="{{ route('admin.nests.view', $egg->nest->id) }}">{{ $egg->nest->name }}</a></li>
+        <li class="active">{{ $egg->name }}</li>
     </ol>
 @endsection
 
@@ -24,18 +24,18 @@
     <div class="col-xs-12">
         <div class="nav-tabs-custom nav-tabs-floating">
             <ul class="nav nav-tabs">
-                <li class="active"><a href="{{ route('admin.services.option.view', $option->id) }}">Configuration</a></li>
-                <li><a href="{{ route('admin.services.option.variables', $option->id) }}">Variables</a></li>
-                <li><a href="{{ route('admin.services.option.scripts', $option->id) }}">Scripts</a></li>
+                <li class="active"><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
+                <li><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
+                <li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
             </ul>
         </div>
     </div>
 </div>
-<form action="{{ route('admin.services.option.view', $option->id) }}" method="POST">
+<form action="{{ route('admin.nests.egg.view', $egg->id) }}" method="POST">
     <div class="row">
         <div class="col-xs-12">
             <div class="callout callout-info">
-                <strong>Notice:</strong> Editing the Option Tag or any of the Process Management fields <em>requires</em> that each daemon be rebooted to apply the changes.
+                <strong>Notice:</strong> Editing an Egg or any of the Process Management fields <em>requires</em> that each Daemon be rebooted in order to apply the changes.
             </div>
         </div>
         <div class="col-xs-12">
@@ -47,30 +47,26 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="form-group">
-                                <label for="pName" class="form-label">Option Name</label>
-                                <input type="text" id="pName" name="name" value="{{ $option->name }}" class="form-control" />
-                                <p class="text-muted small">A simple, human-readable name to use as an identifier for this service.</p>
+                                <label for="pName" class="control-label">Name <span class="field-required"></span></label>
+                                <input type="text" id="pName" name="name" value="{{ $egg->name }}" class="form-control" />
+                                <p class="text-muted small">A simple, human-readable name to use as an identifier for this Egg.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pDescription" class="form-label">Description</label>
-                                <textarea id="pDescription" name="description" class="form-control" rows="10">{{ $option->description }}</textarea>
-                                <p class="text-muted small">A description of this service that will be displayed throughout the panel as needed.</p>
+                                <label for="pDescription" class="control-label">Description <span class="field-required"></span></label>
+                                <textarea id="pDescription" name="description" class="form-control" rows="10">{{ $egg->description }}</textarea>
+                                <p class="text-muted small">A description of this Egg that will be displayed throughout the Panel as needed.</p>
                             </div>
                         </div>
                         <div class="col-sm-6">
                             <div class="form-group">
-                                <label class="form-label">Option Tag</label>
-                                <input type="text" disabled value="{{ $option->tag }}" class="form-control" />
+                                <label for="pDockerImage" class="control-label">Docker Image <span class="field-required"></span></label>
+                                <input type="text" id="pDockerImage" name="docker_image" value="{{ $egg->docker_image }}" class="form-control" />
+                                <p class="text-muted small">The default docker image that should be used for new servers using this Egg. This can be changed per-server as needed.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pDockerImage" class="control-label">Docker Image <span class="field-optional"></label>
-                                <input type="text" id="pDockerImage" name="docker_image" value="{{ $option->docker_image }}" class="form-control" />
-                                <p class="text-muted small">The default docker image that should be used for new servers under this service option. This can be left blank to use the parent service's defined image, and can also be changed per-server.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="pStartup" class="control-label">Startup Command <span class="field-optional"></label>
-                                <textarea id="pStartup" name="startup" class="form-control" rows="4" placeholder="{{ $option->service->startup }}">{{ $option->startup }}</textarea>
-                                <p class="text-muted small">The default statup command that should be used for new servers under this service option. This can be left blank to use the parent service's startup, and can also be changed per-server.</p>
+                                <label for="pStartup" class="control-label">Startup Command <span class="field-required"></span></label>
+                                <textarea id="pStartup" name="startup" class="form-control" rows="9">{{ $egg->startup }}</textarea>
+                                <p class="text-muted small">The default statup command that should be used for new servers using this Egg.</p>
                             </div>
                         </div>
                     </div>
@@ -87,7 +83,7 @@
                         <div class="col-xs-12">
                             <div class="alert alert-warning">
                                 <p>The following configuration options should not be edited unless you understand how this system works. If wrongly modified it is possible for the daemon to break.</p>
-                                <p>All fields are required unless you select a seperate option from the 'Copy Settings From' dropdown, in which case fields may be left blank to use the values from that option.</p>
+                                <p>All fields are required unless you select a seperate option from the 'Copy Settings From' dropdown, in which case fields may be left blank to use the values from that Egg.</p>
                             </div>
                         </div>
                         <div class="col-sm-6">
@@ -95,32 +91,32 @@
                                 <label for="pConfigFrom" class="form-label">Copy Settings From</label>
                                 <select name="config_from" id="pConfigFrom" class="form-control">
                                     <option value="0">None</option>
-                                    @foreach($option->service->options as $o)
-                                        <option value="{{ $o->id }}" {{ ($option->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }} &lt;{{ $option->tag }}&gt;</option>
+                                    @foreach($egg->nest->eggs as $o)
+                                        <option value="{{ $o->id }}" {{ ($egg->config_from !== $o->id) ?: 'selected' }}>{{ $o->name }} &lt;{{ $o->author }}&gt;</option>
                                     @endforeach
                                 </select>
-                                <p class="text-muted small">If you would like to default to settings from another option select the option from the menu above.</p>
+                                <p class="text-muted small">If you would like to default to settings from another Egg select it from the menu above.</p>
                             </div>
                             <div class="form-group">
                                 <label for="pConfigStop" class="form-label">Stop Command</label>
-                                <input type="text" id="pConfigStop" name="config_stop" class="form-control" value="{{ $option->config_stop }}" />
+                                <input type="text" id="pConfigStop" name="config_stop" class="form-control" value="{{ $egg->config_stop }}" />
                                 <p class="text-muted small">The command that should be sent to server processes to stop them gracefully. If you need to send a <code>SIGINT</code> you should enter <code>^C</code> here.</p>
                             </div>
                             <div class="form-group">
                                 <label for="pConfigLogs" class="form-label">Log Configuration</label>
-                                <textarea data-action="handle-tabs" id="pConfigLogs" name="config_logs" class="form-control" rows="6">{{ ! is_null($option->config_logs) ? json_encode(json_decode($option->config_logs), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
+                                <textarea data-action="handle-tabs" id="pConfigLogs" name="config_logs" class="form-control" rows="6">{{ ! is_null($egg->config_logs) ? json_encode(json_decode($egg->config_logs), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
                                 <p class="text-muted small">This should be a JSON representation of where log files are stored, and wether or not the daemon should be creating custom logs.</p>
                             </div>
                         </div>
                         <div class="col-sm-6">
                             <div class="form-group">
                                 <label for="pConfigFiles" class="form-label">Configuration Files</label>
-                                <textarea data-action="handle-tabs" id="pConfigFiles" name="config_files" class="form-control" rows="6">{{ ! is_null($option->config_files) ? json_encode(json_decode($option->config_files), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
+                                <textarea data-action="handle-tabs" id="pConfigFiles" name="config_files" class="form-control" rows="6">{{ ! is_null($egg->config_files) ? json_encode(json_decode($egg->config_files), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
                                 <p class="text-muted small">This should be a JSON representation of configuration files to modify and what parts should be changed.</p>
                             </div>
                             <div class="form-group">
                                 <label for="pConfigStartup" class="form-label">Start Configuration</label>
-                                <textarea data-action="handle-tabs" id="pConfigStartup" name="config_startup" class="form-control" rows="6">{{ ! is_null($option->config_startup) ? json_encode(json_decode($option->config_startup), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
+                                <textarea data-action="handle-tabs" id="pConfigStartup" name="config_startup" class="form-control" rows="6">{{ ! is_null($egg->config_startup) ? json_encode(json_decode($egg->config_startup), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) : '' }}</textarea>
                                 <p class="text-muted small">This should be a JSON representation of what values the daemon should be looking for when booting a server to determine completion.</p>
                             </div>
                         </div>
@@ -131,8 +127,8 @@
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-danger btn-sm muted muted-hover">
                         <i class="fa fa-trash-o"></i>
                     </button>
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Option</button>
-                    <a href="{{ route('admin.services.option.export', ['option' => $option->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export Option Configuration</a>
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
+                    <a href="{{ route('admin.nests.egg.export', ['option' => $egg->id]) }}" class="btn btn-sm btn-info pull-right" style="margin-right:10px;">Export</a>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/services/index.blade.php b/resources/themes/pterodactyl/admin/nests/index.blade.php
similarity index 63%
rename from resources/themes/pterodactyl/admin/services/index.blade.php
rename to resources/themes/pterodactyl/admin/nests/index.blade.php
index a1cd88212..c19a8099c 100644
--- a/resources/themes/pterodactyl/admin/services/index.blade.php
+++ b/resources/themes/pterodactyl/admin/nests/index.blade.php
@@ -6,14 +6,14 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service
+    Nests
 @endsection
 
 @section('content-header')
-    <h1>Service<small>All services currently available on this system.</small></h1>
+    <h1>Nests<small>All nests currently available on this system.</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li class="active">Service</li>
+        <li class="active">Nests</li>
     </ol>
 @endsection
 
@@ -21,7 +21,7 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="alert alert-danger">
-            Services are a powerful feature of Pterodactyl Panel that allow for extreme flexibility and configuration. Please note that while powerful, modifing a service wrongly can very easily brick your servers and cause more problems. Please avoid editing our default services — those provided by <code>support@pterodactyl.io</code> — unless you are absolutely sure of what you are doing.
+            Eggs are a powerful feature of Pterodactyl Panel that allow for extreme flexibility and configuration. Please note that while powerful, modifing an egg wrongly can very easily brick your servers and cause more problems. Please avoid editing our default eggs — those provided by <code>support@pterodactyl.io</code> — unless you are absolutely sure of what you are doing.
         </div>
     </div>
 </div>
@@ -29,10 +29,10 @@
     <div class="col-xs-12">
         <div class="box">
             <div class="box-header with-border">
-                <h3 class="box-title">Configured Service</h3>
+                <h3 class="box-title">Configured Nests</h3>
                 <div class="box-tools">
-                    <a href="#" class="btn btn-sm btn-success" data-toggle="modal" data-target="#importServiceOptionModal" role="button"><i class="fa fa-upload"></i> Import Service Option</a>
-                    <a href="{{ route('admin.services.new') }}" class="btn btn-primary btn-sm">Create New</a>
+                    <a href="#" class="btn btn-sm btn-success" data-toggle="modal" data-target="#importServiceOptionModal" role="button"><i class="fa fa-upload"></i> Import Egg</a>
+                    <a href="{{ route('admin.nests.new') }}" class="btn btn-primary btn-sm">Create New</a>
                 </div>
             </div>
             <div class="box-body table-responsive no-padding">
@@ -40,17 +40,17 @@
                     <tr>
                         <th>Name</th>
                         <th>Description</th>
-                        <th class="text-center">Options</th>
+                        <th class="text-center">Eggs</th>
                         <th class="text-center">Packs</th>
                         <th class="text-center">Servers</th>
                     </tr>
-                    @foreach($services as $service)
+                    @foreach($nests as $nest)
                         <tr>
-                            <td class="middle"><a href="{{ route('admin.services.view', $service->id) }}" data-toggle="tooltip" data-placement="right" title="{{ $service->author }}">{{ $service->name }}</a></td>
-                            <td class="col-xs-6 middle">{{ $service->description }}</td>
-                            <td class="text-center middle"><code>{{ $service->options_count }}</code></td>
-                            <td class="text-center middle"><code>{{ $service->packs_count }}</code></td>
-                            <td class="text-center middle"><code>{{ $service->servers_count }}</code></td>
+                            <td class="middle"><a href="{{ route('admin.nests.view', $nest->id) }}" data-toggle="tooltip" data-placement="right" title="{{ $nest->author }}">{{ $nest->name }}</a></td>
+                            <td class="col-xs-6 middle">{{ $nest->description }}</td>
+                            <td class="text-center middle"><code>{{ $nest->eggs_count }}</code></td>
+                            <td class="text-center middle"><code>{{ $nest->packs_count }}</code></td>
+                            <td class="text-center middle"><code>{{ $nest->servers_count }}</code></td>
                         </tr>
                     @endforeach
                 </table>
@@ -63,26 +63,26 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">Import a Service Option</h4>
+                <h4 class="modal-title">Import an Egg</h4>
             </div>
-            <form action="{{ route('admin.services.option.import') }}" enctype="multipart/form-data" method="POST">
+            <form action="{{ route('admin.nests.egg.import') }}" enctype="multipart/form-data" method="POST">
                 <div class="modal-body">
                     <div class="form-group">
-                        <label class="control-label" for="pImportFile">Service File <span class="field-required"></span></label>
+                        <label class="control-label" for="pImportFile">Egg File <span class="field-required"></span></label>
                         <div>
                             <input id="pImportFile" type="file" name="import_file" class="form-control" accept="application/json" />
-                            <p class="small text-muted">Select the <code>.json</code> file for the new service option that you wish to import.</p>
+                            <p class="small text-muted">Select the <code>.json</code> file for the new egg that you wish to import.</p>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label" for="pImportToService">Associated Service <span class="field-required"></span></label>
+                        <label class="control-label" for="pImportToService">Associated Nest <span class="field-required"></span></label>
                         <div>
                             <select id="pImportToService" name="import_to_service">
-                                @foreach($services as $service)
-                                   <option value="{{ $service->id }}">{{ $service->name }} &lt;{{ $service->author }}&gt;</option>
+                                @foreach($nests as $nest)
+                                   <option value="{{ $nest->id }}">{{ $nest->name }} &lt;{{ $nest->author }}&gt;</option>
                                 @endforeach
                             </select>
-                            <p class="small text-muted">Select the service that this option will be associated with from the dropdown. If you wish to associate it with a new service you will need to create that service before continuing.</p>
+                            <p class="small text-muted">Select the nest that this egg will be associated with from the dropdown. If you wish to associate it with a new nest you will need to create that nest before continuing.</p>
                         </div>
                     </div>
                 </div>
diff --git a/resources/themes/pterodactyl/admin/services/new.blade.php b/resources/themes/pterodactyl/admin/nests/new.blade.php
similarity index 79%
rename from resources/themes/pterodactyl/admin/services/new.blade.php
rename to resources/themes/pterodactyl/admin/nests/new.blade.php
index cb48991ec..ed7fa3cdd 100644
--- a/resources/themes/pterodactyl/admin/services/new.blade.php
+++ b/resources/themes/pterodactyl/admin/nests/new.blade.php
@@ -6,32 +6,32 @@
 @extends('layouts.admin')
 
 @section('title')
-    New Service
+    New Nest
 @endsection
 
 @section('content-header')
-    <h1>New Service<small>Configure a new service to deploy to all nodes.</small></h1>
+    <h1>New Nest<small>Configure a new nest to deploy to all nodes.</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
+        <li><a href="{{ route('admin.nests') }}">Nests</a></li>
         <li class="active">New</li>
     </ol>
 @endsection
 
 @section('content')
-<form action="{{ route('admin.services.new') }}" method="POST">
+<form action="{{ route('admin.nests.new') }}" method="POST">
     <div class="row">
         <div class="col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">New Service</h3>
+                    <h3 class="box-title">New Nest</h3>
                 </div>
                 <div class="box-body">
                     <div class="form-group">
                         <label class="control-label">Name</label>
                         <div>
                             <input type="text" name="name" class="form-control" value="{{ old('name') }}" />
-                            <p class="text-muted"><small>This should be a descriptive category name that emcompasses all of the options within the service.</small></p>
+                            <p class="text-muted"><small>This should be a descriptive category name that emcompasses all of the eggs within the nest.</small></p>
                         </div>
                     </div>
                     <div class="form-group">
@@ -43,7 +43,7 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button type="input" class="btn btn-primary pull-right">Save Service</button>
+                    <button type="submit" class="btn btn-primary pull-right">Save</button>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/services/view.blade.php b/resources/themes/pterodactyl/admin/nests/view.blade.php
similarity index 72%
rename from resources/themes/pterodactyl/admin/services/view.blade.php
rename to resources/themes/pterodactyl/admin/nests/view.blade.php
index fba791b59..32e229579 100644
--- a/resources/themes/pterodactyl/admin/services/view.blade.php
+++ b/resources/themes/pterodactyl/admin/nests/view.blade.php
@@ -6,41 +6,41 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service &rarr; {{ $service->name }}
+    Nests &rarr; {{ $nest->name }}
 @endsection
 
 @section('content-header')
-    <h1>{{ $service->name }}<small>{{ str_limit($service->description, 50) }}</small></h1>
+    <h1>{{ $nest->name }}<small>{{ str_limit($nest->description, 50) }}</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li class="active">{{ $service->name }}</li>
+        <li><a href="{{ route('admin.nests') }}">Nests</a></li>
+        <li class="active">{{ $nest->name }}</li>
     </ol>
 @endsection
 
 @section('content')
 <div class="row">
-    <form action="{{ route('admin.services.view', $service->id) }}" method="POST">
+    <form action="{{ route('admin.nests.view', $nest->id) }}" method="POST">
         <div class="col-md-6">
             <div class="box">
                 <div class="box-body">
                     <div class="form-group">
                         <label class="control-label">Name <span class="field-required"></span></label>
                         <div>
-                            <input type="text" name="name" class="form-control" value="{{ $service->name }}" />
+                            <input type="text" name="name" class="form-control" value="{{ $nest->name }}" />
                             <p class="text-muted"><small>This should be a descriptive category name that emcompasses all of the options within the service.</small></p>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="control-label">Description <span class="field-required"></span></label>
                         <div>
-                            <textarea name="description" class="form-control" rows="7">{{ $service->description }}</textarea>
+                            <textarea name="description" class="form-control" rows="7">{{ $nest->description }}</textarea>
                         </div>
                     </div>
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Option</button>
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-sm btn-danger muted muted-hover"><i class="fa fa-trash-o"></i></button>
                 </div>
             </div>
@@ -52,14 +52,14 @@
                 <div class="form-group">
                     <label class="control-label">Author</label>
                     <div>
-                        <input type="text" readonly class="form-control" value="{{ $service->author }}" />
+                        <input type="text" readonly class="form-control" value="{{ $nest->author }}" />
                         <p class="text-muted small">The author of this service option. Please direct questions and issues to them unless this is an official option authored by <code>support@pterodactyl.io</code>.</p>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label">UUID</label>
                     <div>
-                        <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
+                        <input type="text" readonly class="form-control" value="{{ $nest->uuid }}" />
                         <p class="text-muted small">A unique identifier that all servers using this option are assigned for identification purposes.</p>
                     </div>
                 </div>
@@ -71,28 +71,30 @@
     <div class="col-xs-12">
         <div class="box box-primary">
             <div class="box-header with-border">
-                <h3 class="box-title">Configured Options</h3>
+                <h3 class="box-title">Nest Eggs</h3>
             </div>
             <div class="box-body table-responsive no-padding">
                 <table class="table table-hover">
                     <tr>
                         <th>Name</th>
                         <th>Description</th>
-                        <th>Tag</th>
                         <th class="text-center">Servers</th>
+                        <th class="text-center"></th>
                     </tr>
-                    @foreach($service->options as $option)
+                    @foreach($nest->eggs as $egg)
                         <tr>
-                            <td><a href="{{ route('admin.services.option.view', $option->id) }}">{{ $option->name }}</a></td>
-                            <td class="col-xs-6">{!! $option->description !!}</td>
-                            <td><code>{{ $option->tag }}</code></td>
-                            <td class="text-center">{{ $option->servers->count() }}</td>
+                            <td class="align-middle"><a href="{{ route('admin.nests.egg.view', $egg->id) }}">{{ $egg->name }}</a></td>
+                            <td class="col-xs-8 align-middle">{!! $egg->description !!}</td>
+                            <td class="text-center align-middle"><code>{{ $egg->servers->count() }}</code></td>
+                            <td class="align-middle">
+                                <a href="{{ route('admin.nests.egg.export', ['egg' => $egg->id]) }}"><i class="fa fa-download"></i></a>
+                            </td>
                         </tr>
                     @endforeach
                 </table>
             </div>
             <div class="box-footer">
-                <a href="{{ route('admin.services.option.new') }}"><button class="btn btn-success btn-sm pull-right">New Service Option</button></a>
+                <a href="{{ route('admin.nests.egg.new') }}"><button class="btn btn-success btn-sm pull-right">New Egg</button></a>
             </div>
         </div>
     </div>
diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index 115f952fa..6fe6552a4 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -112,9 +112,9 @@
                             </a>
                         </li>
                         <li class="header">SERVICE MANAGEMENT</li>
-                        <li class="{{ ! starts_with(Route::currentRouteName(), 'admin.services') ?: 'active' }}">
-                            <a href="{{ route('admin.services') }}">
-                                <i class="fa fa-th-large"></i> <span>Service</span>
+                        <li class="{{ ! starts_with(Route::currentRouteName(), 'admin.nests') ?: 'active' }}">
+                            <a href="{{ route('admin.nests') }}">
+                                <i class="fa fa-th-large"></i> <span>Nests</span>
                             </a>
                         </li>
                         <li class="{{ ! starts_with(Route::currentRouteName(), 'admin.packs') ?: 'active' }}">
diff --git a/routes/admin.php b/routes/admin.php
index 31cb8a9aa..7eb161834 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -142,35 +142,35 @@ Route::group(['prefix' => 'nodes'], function () {
 
 /*
 |--------------------------------------------------------------------------
-| Service Controller Routes
+| Nest Controller Routes
 |--------------------------------------------------------------------------
 |
-| Endpoint: /admin/services
+| Endpoint: /admin/nests
 |
 */
-Route::group(['prefix' => 'services'], function () {
-    Route::get('/', 'ServiceController@index')->name('admin.services');
-    Route::get('/new', 'ServiceController@create')->name('admin.services.new');
-    Route::get('/view/{service}', 'ServiceController@view')->name('admin.services.view');
-    Route::get('/option/new', 'OptionController@create')->name('admin.services.option.new');
-    Route::get('/option/{option}', 'OptionController@viewConfiguration')->name('admin.services.option.view');
-    Route::get('/option/{option}/export', 'Services\Options\OptionShareController@export')->name('admin.services.option.export');
-    Route::get('/option/{option}/variables', 'VariableController@view')->name('admin.services.option.variables');
-    Route::get('/option/{option}/scripts', 'OptionController@viewScripts')->name('admin.services.option.scripts');
+Route::group(['prefix' => 'nests'], function () {
+    Route::get('/', 'Nests\NestController@index')->name('admin.nests');
+    Route::get('/new', 'Nests\NestController@create')->name('admin.nests.new');
+    Route::get('/view/{nest}', 'Nests\NestController@view')->name('admin.nests.view');
+    Route::get('/egg/new', 'Nests\EggController@create')->name('admin.nests.egg.new');
+    Route::get('/egg/{egg}', 'Nests\EggController@view')->name('admin.nests.egg.view');
+    Route::get('/egg/{egg}/export', 'Nests\EggShareController@export')->name('admin.nests.egg.export');
+    Route::get('/egg/{egg}/variables', 'Nests\EggVariableController@view')->name('admin.nests.egg.variables');
+    Route::get('/egg/{egg}/scripts', 'Nests\EggScriptController@view')->name('admin.nests.egg.scripts');
 
-    Route::post('/new', 'ServiceController@store');
-    Route::post('/import', 'Services\Options\OptionShareController@import')->name('admin.services.option.import');
-    Route::post('/option/new', 'OptionController@store');
-    Route::post('/option/{option}/variables', 'VariableController@store');
+    Route::post('/new', 'Nests\NestController@store');
+    Route::post('/import', 'Nests\EggShareController@import')->name('admin.nests.egg.import');
+    Route::post('/egg/new', 'Nests\EggController@store');
+    Route::post('/egg/{egg}/variables', 'Nests\EggVariableController@store');
 
-    Route::patch('/view/{service}', 'ServiceController@update');
-    Route::patch('/option/{option}', 'OptionController@editConfiguration');
-    Route::patch('/option/{option}/scripts', 'OptionController@updateScripts');
-    Route::patch('/option/{option}/variables/{variable}', 'VariableController@update')->name('admin.services.option.variables.edit');
+    Route::patch('/view/{nest}', 'Nests\NestController@update');
+    Route::patch('/egg/{egg}', 'Nests\EggController@update');
+    Route::patch('/egg/{egg}/scripts', 'Nests\EggScriptController@update');
+    Route::patch('/egg/{egg}/variables/{variable}', 'Nests\EggVariableController@update')->name('admin.nests.egg.variables.edit');
 
-    Route::delete('/view/{service}', 'ServiceController@destroy');
-    Route::delete('/option/{option}', 'OptionController@destroy');
-    Route::delete('/option/{option}/variables/{variable}', 'VariableController@delete');
+    Route::delete('/view/{nest}', 'Nests\NestController@destroy');
+    Route::delete('/egg/{egg}', 'Nests\EggController@destroy');
+    Route::delete('/egg/{egg}/variables/{variable}', 'Nests\EggVariableController@destroy');
 });
 
 /*
diff --git a/tests/Unit/Services/Servers/VariableValidatorServiceTest.php b/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
index 3a028967a..2e9c5fc60 100644
--- a/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
+++ b/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
@@ -11,18 +11,18 @@ namespace Tests\Unit\Services\Servers;
 
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Illuminate\Contracts\Validation\Factory;
 use Pterodactyl\Exceptions\DisplayValidationException;
 use Pterodactyl\Services\Servers\VariableValidatorService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
 
 class VariableValidatorServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\OptionVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
     protected $optionVariableRepository;
 
@@ -60,14 +60,14 @@ class VariableValidatorServiceTest extends TestCase
 
         $this->variables = collect(
             [
-                factory(ServiceVariable::class)->states('editable', 'viewable')->make(),
-                factory(ServiceVariable::class)->states('viewable')->make(),
-                factory(ServiceVariable::class)->states('editable')->make(),
-                factory(ServiceVariable::class)->make(),
+                factory(EggVariable::class)->states('editable', 'viewable')->make(),
+                factory(EggVariable::class)->states('viewable')->make(),
+                factory(EggVariable::class)->states('editable')->make(),
+                factory(EggVariable::class)->make(),
             ]
         );
 
-        $this->optionVariableRepository = m::mock(OptionVariableRepositoryInterface::class);
+        $this->optionVariableRepository = m::mock(EggVariableRepositoryInterface::class);
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
         $this->serverVariableRepository = m::mock(ServerVariableRepositoryInterface::class);
         $this->validator = m::mock(Factory::class);
diff --git a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php b/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
index 165c831bc..4024f5280 100644
--- a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
@@ -12,9 +12,9 @@ namespace Tests\Unit\Services\Services\Options;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
 
 class InstallScriptUpdateServiceTest extends TestCase
@@ -31,12 +31,12 @@ class InstallScriptUpdateServiceTest extends TestCase
     ];
 
     /**
-     * @var \Pterodactyl\Models\ServiceOption
+     * @var \Pterodactyl\Models\Egg
      */
     protected $model;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
@@ -52,8 +52,8 @@ class InstallScriptUpdateServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->model = factory(ServiceOption::class)->make();
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->model = factory(Egg::class)->make();
+        $this->repository = m::mock(EggRepositoryInterface::class);
 
         $this->service = new InstallScriptUpdateService($this->repository);
     }
diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
index 8238f858d..c0fd0c3db 100644
--- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
@@ -13,10 +13,10 @@ use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
 use Illuminate\Contracts\Config\Repository;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionCreationService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionCreationServiceTest extends TestCase
@@ -27,7 +27,7 @@ class OptionCreationServiceTest extends TestCase
     protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -49,7 +49,7 @@ class OptionCreationServiceTest extends TestCase
         parent::setUp();
 
         $this->config = m::mock(Repository::class);
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->repository = m::mock(EggRepositoryInterface::class);
         $this->uuid = m::mock('overload:' . Uuid::class);
 
         $this->service = new OptionCreationService($this->config, $this->repository);
@@ -60,7 +60,7 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelWithoutUsingConfigFrom()
     {
-        $model = factory(ServiceOption::class)->make([
+        $model = factory(Egg::class)->make([
             'tag' => str_random(10),
         ]);
 
@@ -85,7 +85,7 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelUsingLongTagForm()
     {
-        $model = factory(ServiceOption::class)->make([
+        $model = factory(Egg::class)->make([
             'tag' => 'test@example.com:tag',
         ]);
 
@@ -111,7 +111,7 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelUsingConfigFrom()
     {
-        $model = factory(ServiceOption::class)->make();
+        $model = factory(Egg::class)->make();
 
         $data = [
             'name' => $model->name,
diff --git a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
index a0425bb3c..83d011102 100644
--- a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
@@ -12,16 +12,16 @@ namespace Tests\Unit\Services\Services\Options;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionDeletionService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
 
 class OptionDeletionServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -42,7 +42,7 @@ class OptionDeletionServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->repository = m::mock(EggRepositoryInterface::class);
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
 
         $this->service = new OptionDeletionService($this->serverRepository, $this->repository);
diff --git a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
index 0990491ba..04714aac8 100644
--- a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
@@ -12,20 +12,20 @@ namespace Tests\Unit\Services\Services\Options;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceOption;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Options\OptionUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Models\ServiceOption
+     * @var \Pterodactyl\Models\Egg
      */
     protected $model;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
@@ -41,8 +41,8 @@ class OptionUpdateServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->model = factory(ServiceOption::class)->make();
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->model = factory(Egg::class)->make();
+        $this->repository = m::mock(EggRepositoryInterface::class);
 
         $this->service = new OptionUpdateService($this->repository);
     }
diff --git a/tests/Unit/Services/Services/ServiceCreationServiceTest.php b/tests/Unit/Services/Services/ServiceCreationServiceTest.php
index 0abc4febf..0d9ae6b9c 100644
--- a/tests/Unit/Services/Services/ServiceCreationServiceTest.php
+++ b/tests/Unit/Services/Services/ServiceCreationServiceTest.php
@@ -12,11 +12,11 @@ namespace Tests\Unit\Services\Services;
 use Mockery as m;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Nest;
 use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Traits\Services\CreatesServiceIndex;
-use Pterodactyl\Services\Services\ServiceCreationService;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Services\Services\NestCreationService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
 class ServiceCreationServiceTest extends TestCase
 {
@@ -28,12 +28,12 @@ class ServiceCreationServiceTest extends TestCase
     protected $config;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceCreationService
+     * @var \Pterodactyl\Services\Services\NestCreationService
      */
     protected $service;
 
@@ -50,10 +50,10 @@ class ServiceCreationServiceTest extends TestCase
         parent::setUp();
 
         $this->config = m::mock(Repository::class);
-        $this->repository = m::mock(ServiceRepositoryInterface::class);
+        $this->repository = m::mock(NestRepositoryInterface::class);
         $this->uuid = m::mock('overload:' . Uuid::class);
 
-        $this->service = new ServiceCreationService($this->config, $this->repository);
+        $this->service = new NestCreationService($this->config, $this->repository);
     }
 
     /**
@@ -61,7 +61,7 @@ class ServiceCreationServiceTest extends TestCase
      */
     public function testCreateNewService()
     {
-        $model = factory(Service::class)->make();
+        $model = factory(Nest::class)->make();
         $data = [
             'name' => $model->name,
             'description' => $model->description,
@@ -81,7 +81,7 @@ class ServiceCreationServiceTest extends TestCase
         ], true, true)->once()->andReturn($model);
 
         $response = $this->service->handle($data);
-        $this->assertInstanceOf(Service::class, $response);
+        $this->assertInstanceOf(Nest::class, $response);
         $this->assertEquals($model, $response);
     }
 }
diff --git a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php b/tests/Unit/Services/Services/ServiceDeletionServiceTest.php
index 240f3fcb9..396690e0e 100644
--- a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php
+++ b/tests/Unit/Services/Services/ServiceDeletionServiceTest.php
@@ -12,10 +12,10 @@ namespace Tests\Unit\Services\Services;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Services\Services\ServiceDeletionService;
+use Pterodactyl\Services\Services\NestDeletionService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
 
 class ServiceDeletionServiceTest extends TestCase
 {
@@ -25,12 +25,12 @@ class ServiceDeletionServiceTest extends TestCase
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceDeletionService
+     * @var \Pterodactyl\Services\Services\NestDeletionService
      */
     protected $service;
 
@@ -42,9 +42,9 @@ class ServiceDeletionServiceTest extends TestCase
         parent::setUp();
 
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
-        $this->repository = m::mock(ServiceRepositoryInterface::class);
+        $this->repository = m::mock(NestRepositoryInterface::class);
 
-        $this->service = new ServiceDeletionService($this->serverRepository, $this->repository);
+        $this->service = new NestDeletionService($this->serverRepository, $this->repository);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php b/tests/Unit/Services/Services/ServiceUpdateServiceTest.php
index 1f0ee1164..612d684b2 100644
--- a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/ServiceUpdateServiceTest.php
@@ -11,18 +11,18 @@ namespace Tests\Unit\Services\Services;
 
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Services\Services\ServiceUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Services\Services\NestUpdateService;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
 class ServiceUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\ServiceUpdateService
+     * @var \Pterodactyl\Services\Services\NestUpdateService
      */
     protected $service;
 
@@ -33,9 +33,9 @@ class ServiceUpdateServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->repository = m::mock(ServiceRepositoryInterface::class);
+        $this->repository = m::mock(NestRepositoryInterface::class);
 
-        $this->service = new ServiceUpdateService($this->repository);
+        $this->service = new NestUpdateService($this->repository);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
index aa5e35737..60f9a2eb9 100644
--- a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
+++ b/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
@@ -12,10 +12,10 @@ namespace Tests\Unit\Services\Services\Sharing;
 use Mockery as m;
 use Carbon\Carbon;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
 use Tests\Assertions\NestedObjectAssertionsTrait;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
 
 class ServiceOptionExporterServiceTest extends TestCase
@@ -28,7 +28,7 @@ class ServiceOptionExporterServiceTest extends TestCase
     protected $carbon;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -46,7 +46,7 @@ class ServiceOptionExporterServiceTest extends TestCase
 
         Carbon::setTestNow(Carbon::now());
         $this->carbon = new Carbon();
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->repository = m::mock(EggRepositoryInterface::class);
 
         $this->service = new ServiceOptionExporterService($this->carbon, $this->repository);
     }
@@ -56,8 +56,8 @@ class ServiceOptionExporterServiceTest extends TestCase
      */
     public function testJsonStructureIsExported()
     {
-        $option = factory(ServiceOption::class)->make();
-        $option->variables = collect([$variable = factory(ServiceVariable::class)->make()]);
+        $option = factory(Egg::class)->make();
+        $option->variables = collect([$variable = factory(EggVariable::class)->make()]);
 
         $this->repository->shouldReceive('getWithExportAttributes')->with($option->id)->once()->andReturn($option);
 
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php b/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
index 6dbdc5a53..db9992db6 100644
--- a/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
+++ b/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
@@ -12,16 +12,16 @@ namespace Tests\Unit\Services\Services\Sharing;
 use Mockery as m;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
-use Pterodactyl\Models\Service;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Http\UploadedFile;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\PterodactylException;
-use Pterodactyl\Contracts\Repository\ServiceRepositoryInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Services\Services\Sharing\EggImporterService;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService;
 use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\ServiceOption\DuplicateOptionTagException;
 
@@ -38,17 +38,17 @@ class ServiceOptionImporterServiceTest extends TestCase
     protected $file;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionImporterService
+     * @var \Pterodactyl\Services\Services\Sharing\EggImporterService
      */
     protected $service;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
      */
     protected $serviceRepository;
 
@@ -71,12 +71,12 @@ class ServiceOptionImporterServiceTest extends TestCase
 
         $this->connection = m::mock(ConnectionInterface::class);
         $this->file = m::mock(UploadedFile::class);
-        $this->repository = m::mock(ServiceOptionRepositoryInterface::class);
-        $this->serviceRepository = m::mock(ServiceRepositoryInterface::class);
+        $this->repository = m::mock(EggRepositoryInterface::class);
+        $this->serviceRepository = m::mock(NestRepositoryInterface::class);
         $this->serviceVariableRepository = m::mock(ServiceVariableRepositoryInterface::class);
         $this->uuid = m::mock('overload:' . Uuid::class);
 
-        $this->service = new ServiceOptionImporterService(
+        $this->service = new EggImporterService(
             $this->connection, $this->serviceRepository, $this->repository, $this->serviceVariableRepository
         );
     }
@@ -86,9 +86,9 @@ class ServiceOptionImporterServiceTest extends TestCase
      */
     public function testServiceOptionIsImported()
     {
-        $option = factory(ServiceOption::class)->make();
-        $service = factory(Service::class)->make();
-        $service->options = collect([factory(ServiceOption::class)->make()]);
+        $option = factory(Egg::class)->make();
+        $service = factory(Nest::class)->make();
+        $service->options = collect([factory(Egg::class)->make()]);
 
         $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
@@ -98,7 +98,7 @@ class ServiceOptionImporterServiceTest extends TestCase
             'name' => $option->name,
             'tag' => $option->tag,
             'variables' => [
-                $variable = factory(ServiceVariable::class)->make(),
+                $variable = factory(EggVariable::class)->make(),
             ],
         ]));
         $this->serviceRepository->shouldReceive('getWithOptions')->with($service->id)->once()->andReturn($service);
@@ -120,7 +120,7 @@ class ServiceOptionImporterServiceTest extends TestCase
 
         $response = $this->service->handle($this->file, $service->id);
         $this->assertNotEmpty($response);
-        $this->assertInstanceOf(ServiceOption::class, $response);
+        $this->assertInstanceOf(Egg::class, $response);
         $this->assertSame($option, $response);
     }
 
@@ -179,9 +179,9 @@ class ServiceOptionImporterServiceTest extends TestCase
      */
     public function testExceptionIsThrownIfDuplicateTagExists()
     {
-        $option = factory(ServiceOption::class)->make();
-        $service = factory(Service::class)->make();
-        $service->options = collect([factory(ServiceOption::class)->make(['tag' => $option->tag])]);
+        $option = factory(Egg::class)->make();
+        $service = factory(Nest::class)->make();
+        $service->options = collect([factory(Egg::class)->make(['tag' => $option->tag])]);
 
         $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
diff --git a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php b/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php
index 9788ac79b..dc0303202 100644
--- a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php
+++ b/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php
@@ -11,16 +11,16 @@ namespace Tests\Unit\Services\Services\Variables;
 
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceOption;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Services\Services\Variables\VariableCreationService;
-use Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 
 class VariableCreationServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceOptionRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $serviceOptionRepository;
 
@@ -41,7 +41,7 @@ class VariableCreationServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->serviceOptionRepository = m::mock(ServiceOptionRepositoryInterface::class);
+        $this->serviceOptionRepository = m::mock(EggRepositoryInterface::class);
         $this->serviceVariableRepository = m::mock(ServiceVariableRepositoryInterface::class);
 
         $this->service = new VariableCreationService($this->serviceOptionRepository, $this->serviceVariableRepository);
@@ -58,9 +58,9 @@ class VariableCreationServiceTest extends TestCase
            'user_viewable' => false,
            'user_editable' => false,
            'env_variable' => 'TEST_VAR_123',
-        ])->once()->andReturn(new ServiceVariable);
+        ])->once()->andReturn(new EggVariable);
 
-        $this->assertInstanceOf(ServiceVariable::class, $this->service->handle(1, $data));
+        $this->assertInstanceOf(EggVariable::class, $this->service->handle(1, $data));
     }
 
     /**
@@ -75,9 +75,9 @@ class VariableCreationServiceTest extends TestCase
             'user_editable' => true,
             'env_variable' => 'TEST_VAR_123',
             'options' => ['user_viewable', 'user_editable'],
-        ])->once()->andReturn(new ServiceVariable);
+        ])->once()->andReturn(new EggVariable);
 
-        $this->assertInstanceOf(ServiceVariable::class, $this->service->handle(1, $data));
+        $this->assertInstanceOf(EggVariable::class, $this->service->handle(1, $data));
     }
 
     /**
@@ -96,7 +96,7 @@ class VariableCreationServiceTest extends TestCase
      */
     public function testModelCanBePassedInPlaceOfInteger()
     {
-        $model = factory(ServiceOption::class)->make();
+        $model = factory(Egg::class)->make();
         $data = ['env_variable' => 'TEST_VAR_123'];
 
         $this->serviceVariableRepository->shouldReceive('create')->with([
@@ -104,9 +104,9 @@ class VariableCreationServiceTest extends TestCase
             'user_viewable' => false,
             'user_editable' => false,
             'env_variable' => 'TEST_VAR_123',
-        ])->once()->andReturn(new ServiceVariable);
+        ])->once()->andReturn(new EggVariable);
 
-        $this->assertInstanceOf(ServiceVariable::class, $this->service->handle($model, $data));
+        $this->assertInstanceOf(EggVariable::class, $this->service->handle($model, $data));
     }
 
     /**
@@ -117,7 +117,7 @@ class VariableCreationServiceTest extends TestCase
     public function reservedNamesProvider()
     {
         $data = [];
-        $exploded = explode(',', ServiceVariable::RESERVED_ENV_NAMES);
+        $exploded = explode(',', EggVariable::RESERVED_ENV_NAMES);
         foreach ($exploded as $e) {
             $data[] = [$e];
         }
diff --git a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php b/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php
index a5a663669..58e9fdc8a 100644
--- a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php
@@ -12,7 +12,7 @@ namespace Tests\Unit\Services\Services\Variables;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Models\ServiceVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Services\Services\Variables\VariableUpdateService;
 use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
@@ -20,7 +20,7 @@ use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
 class VariableUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Models\ServiceVariable|\Mockery\Mock
+     * @var \Pterodactyl\Models\EggVariable|\Mockery\Mock
      */
     protected $model;
 
@@ -41,7 +41,7 @@ class VariableUpdateServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->model = factory(ServiceVariable::class)->make();
+        $this->model = factory(EggVariable::class)->make();
         $this->repository = m::mock(ServiceVariableRepositoryInterface::class);
 
         $this->service = new VariableUpdateService($this->repository);
@@ -141,7 +141,7 @@ class VariableUpdateServiceTest extends TestCase
     public function reservedNamesProvider()
     {
         $data = [];
-        $exploded = explode(',', ServiceVariable::RESERVED_ENV_NAMES);
+        $exploded = explode(',', EggVariable::RESERVED_ENV_NAMES);
         foreach ($exploded as $e) {
             $data[] = [$e];
         }

From 6b8464ea3a5eba43b5660acae53b6450771ba3e8 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 16:16:51 -0500
Subject: [PATCH 21/34] Nest & Egg management working through the ACP now.

---
 .../HasChildrenException.php                  |   2 +-
 .../InvalidCopyFromException.php}             |   6 +-
 .../NoParentConfigurationFoundException.php   |   6 +-
 .../ReservedVariableNameException.php}        |   6 +-
 .../API/Remote/OptionRetrievalController.php  |  10 +-
 .../Controllers/Admin/Nests/EggController.php | 106 +++++++++-
 .../Admin/Nests/EggScriptController.php       |  98 +++++++++
 .../Admin/Nests/EggVariableController.php     | 146 ++++++++++++++
 .../Admin/Nests/NestController.php            |   4 +-
 .../Controllers/Admin/OptionController.php    |  48 ++---
 .../Controllers/Admin/ServiceController.php   | 187 ------------------
 .../Controllers/Admin/VariableController.php  | 133 -------------
 .../Requests/Admin/Egg/EggFormRequest.php     |  49 +++++
 .../EggScriptFormRequest.php}                 |   4 +-
 .../EggVariableFormRequest.php}               |  11 +-
 .../Service/ServiceOptionFormRequest.php      |  24 ---
 app/Models/Egg.php                            |   6 +-
 .../EggConfigurationService.php}              |  11 +-
 .../EggCreationService.php}                   |  25 +--
 .../EggDeletionService.php}                   |  26 +--
 .../EggUpdateService.php}                     |  24 +--
 .../Scripts/InstallScriptService.php}         |  28 +--
 .../Variables/VariableCreationService.php     |  45 ++---
 .../Variables/VariableUpdateService.php       |  22 +--
 .../{services/options => eggs}/new.blade.php  |  61 +++---
 .../options => eggs}/scripts.blade.php        |  36 ++--
 .../options => eggs}/variables.blade.php      |  32 +--
 routes/admin.php                              |   2 +-
 .../InstallScriptUpdateServiceTest.php        |   6 +-
 .../Options/OptionCreationServiceTest.php     |   6 +-
 .../Options/OptionDeletionServiceTest.php     |   6 +-
 .../Options/OptionUpdateServiceTest.php       |   6 +-
 32 files changed, 616 insertions(+), 566 deletions(-)
 rename app/Exceptions/Service/{ServiceOption => Egg}/HasChildrenException.php (84%)
 rename app/Exceptions/Service/{ServiceVariable/ReservedVariableNameException.php => Egg/InvalidCopyFromException.php} (59%)
 rename app/Exceptions/Service/{ServiceOption => Egg}/NoParentConfigurationFoundException.php (57%)
 rename app/Exceptions/Service/{ServiceOption/InvalidCopyFromException.php => Egg/Variable/ReservedVariableNameException.php} (57%)
 create mode 100644 app/Http/Controllers/Admin/Nests/EggScriptController.php
 create mode 100644 app/Http/Controllers/Admin/Nests/EggVariableController.php
 delete mode 100644 app/Http/Controllers/Admin/ServiceController.php
 delete mode 100644 app/Http/Controllers/Admin/VariableController.php
 create mode 100644 app/Http/Requests/Admin/Egg/EggFormRequest.php
 rename app/Http/Requests/Admin/{Service/EditOptionScript.php => Egg/EggScriptFormRequest.php} (88%)
 rename app/Http/Requests/Admin/{Service/OptionVariableFormRequest.php => Egg/EggVariableFormRequest.php} (80%)
 delete mode 100644 app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
 rename app/Services/{Services/Options/OptionConfigurationFileService.php => Eggs/EggConfigurationService.php} (83%)
 rename app/Services/{Services/Options/OptionCreationService.php => Eggs/EggCreationService.php} (67%)
 rename app/Services/{Services/Options/OptionDeletionService.php => Eggs/EggDeletionService.php} (66%)
 rename app/Services/{Services/Options/OptionUpdateService.php => Eggs/EggUpdateService.php} (64%)
 rename app/Services/{Services/Options/InstallScriptUpdateService.php => Eggs/Scripts/InstallScriptService.php} (66%)
 rename app/Services/{Services => Eggs}/Variables/VariableCreationService.php (51%)
 rename app/Services/{Services => Eggs}/Variables/VariableUpdateService.php (75%)
 rename resources/themes/pterodactyl/admin/{services/options => eggs}/new.blade.php (72%)
 rename resources/themes/pterodactyl/admin/{services/options => eggs}/scripts.blade.php (74%)
 rename resources/themes/pterodactyl/admin/{services/options => eggs}/variables.blade.php (84%)

diff --git a/app/Exceptions/Service/ServiceOption/HasChildrenException.php b/app/Exceptions/Service/Egg/HasChildrenException.php
similarity index 84%
rename from app/Exceptions/Service/ServiceOption/HasChildrenException.php
rename to app/Exceptions/Service/Egg/HasChildrenException.php
index 0857bb887..7198f8306 100644
--- a/app/Exceptions/Service/ServiceOption/HasChildrenException.php
+++ b/app/Exceptions/Service/Egg/HasChildrenException.php
@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
 use Pterodactyl\Exceptions\DisplayException;
 
diff --git a/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php b/app/Exceptions/Service/Egg/InvalidCopyFromException.php
similarity index 59%
rename from app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php
rename to app/Exceptions/Service/Egg/InvalidCopyFromException.php
index 2f0a335cc..149c42dd6 100644
--- a/app/Exceptions/Service/ServiceVariable/ReservedVariableNameException.php
+++ b/app/Exceptions/Service/Egg/InvalidCopyFromException.php
@@ -7,10 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceVariable;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
-use Exception;
+use Pterodactyl\Exceptions\DisplayException;
 
-class ReservedVariableNameException extends Exception
+class InvalidCopyFromException extends DisplayException
 {
 }
diff --git a/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php b/app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php
similarity index 57%
rename from app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php
rename to app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php
index fe678bd3b..867b09c1a 100644
--- a/app/Exceptions/Service/ServiceOption/NoParentConfigurationFoundException.php
+++ b/app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php
@@ -7,8 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg;
 
-class NoParentConfigurationFoundException extends \Exception
+use Pterodactyl\Exceptions\DisplayException;
+
+class NoParentConfigurationFoundException extends DisplayException
 {
 }
diff --git a/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php b/app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php
similarity index 57%
rename from app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php
rename to app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php
index 4bb527abf..03ad09e5e 100644
--- a/app/Exceptions/Service/ServiceOption/InvalidCopyFromException.php
+++ b/app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php
@@ -7,8 +7,10 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\ServiceOption;
+namespace Pterodactyl\Exceptions\Service\Egg\Variable;
 
-class InvalidCopyFromException extends \Exception
+use Pterodactyl\Exceptions\DisplayException;
+
+class ReservedVariableNameException extends DisplayException
 {
 }
diff --git a/app/Http/Controllers/API/Remote/OptionRetrievalController.php b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
index 46b4dfb3e..e1c3fe123 100644
--- a/app/Http/Controllers/API/Remote/OptionRetrievalController.php
+++ b/app/Http/Controllers/API/Remote/OptionRetrievalController.php
@@ -12,12 +12,12 @@ namespace Pterodactyl\Http\Controllers\API\Remote;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\OptionConfigurationFileService;
+use Pterodactyl\Services\Services\Options\EggConfigurationService;
 
 class OptionRetrievalController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionConfigurationFileService
+     * @var \Pterodactyl\Services\Services\Options\EggConfigurationService
      */
     protected $configurationFileService;
 
@@ -29,12 +29,12 @@ class OptionRetrievalController extends Controller
     /**
      * OptionUpdateController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface              $repository
-     * @param \Pterodactyl\Services\Services\Options\OptionConfigurationFileService $configurationFileService
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface       $repository
+     * @param \Pterodactyl\Services\Services\Options\EggConfigurationService $configurationFileService
      */
     public function __construct(
         EggRepositoryInterface $repository,
-        OptionConfigurationFileService $configurationFileService
+        EggConfigurationService $configurationFileService
     ) {
         $this->configurationFileService = $configurationFileService;
         $this->repository = $repository;
diff --git a/app/Http/Controllers/Admin/Nests/EggController.php b/app/Http/Controllers/Admin/Nests/EggController.php
index 831305db4..56d69e3a7 100644
--- a/app/Http/Controllers/Admin/Nests/EggController.php
+++ b/app/Http/Controllers/Admin/Nests/EggController.php
@@ -9,24 +9,120 @@
 
 namespace Pterodactyl\Http\Controllers\Admin\Nests;
 
+use Javascript;
 use Illuminate\View\View;
 use Pterodactyl\Models\Egg;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggUpdateService;
+use Pterodactyl\Services\Eggs\EggCreationService;
+use Pterodactyl\Services\Eggs\EggDeletionService;
+use Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
 class EggController extends Controller
 {
+    protected $alert;
+    protected $creationService;
+    protected $deletionService;
+    protected $nestRepository;
     protected $repository;
+    protected $updateService;
 
-    public function __construct(EggRepositoryInterface $repository)
-    {
+    public function __construct(
+        AlertsMessageBag $alert,
+        EggCreationService $creationService,
+        EggDeletionService $deletionService,
+        EggRepositoryInterface $repository,
+        EggUpdateService $updateService,
+        NestRepositoryInterface $nestRepository
+    ) {
+        $this->alert = $alert;
+        $this->creationService = $creationService;
+        $this->deletionService = $deletionService;
+        $this->nestRepository = $nestRepository;
         $this->repository = $repository;
+        $this->updateService = $updateService;
     }
 
+    /**
+     * Handle a request to display the Egg creation page.
+     *
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function create(): View
+    {
+        $nests = $this->nestRepository->getWithEggs();
+        Javascript::put(['nests' => $nests->keyBy('id')]);
+
+        return view('admin.eggs.new', ['nests' => $nests]);
+    }
+
+    /**
+     * Handle request to store a new Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function store(EggFormRequest $request): RedirectResponse
+    {
+        $egg = $this->creationService->handle($request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.egg_created'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', $egg->id);
+    }
+
+    /**
+     * Handle request to view a single Egg.
+     *
+     * @param \Pterodactyl\Models\Egg $egg
+     * @return \Illuminate\View\View
+     */
     public function view(Egg $egg): View
     {
-        return view('admin.eggs.view', [
-            'egg' => $egg,
-        ]);
+        return view('admin.eggs.view', ['egg' => $egg]);
+    }
+
+    /**
+     * Handle request to update an Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest $request
+     * @param \Pterodactyl\Models\Egg                             $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
+     */
+    public function update(EggFormRequest $request, Egg $egg): RedirectResponse
+    {
+        $this->updateService->handle($egg, $request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.updated'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', $egg->id);
+    }
+
+    /**
+     * Handle request to destroy an egg.
+     *
+     * @param \Pterodactyl\Models\Egg $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Service\Egg\HasChildrenException
+     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
+     */
+    public function destroy(Egg $egg): RedirectResponse
+    {
+        $this->deletionService->handle($egg->id);
+        $this->alert->success(trans('admin/nests.eggs.notices.deleted'))->flash();
+
+        return redirect()->route('admin.nests.view', $egg->nest_id);
     }
 }
diff --git a/app/Http/Controllers/Admin/Nests/EggScriptController.php b/app/Http/Controllers/Admin/Nests/EggScriptController.php
new file mode 100644
index 000000000..ac67a2a6d
--- /dev/null
+++ b/app/Http/Controllers/Admin/Nests/EggScriptController.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\Scripts\InstallScriptService;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest;
+
+class EggScriptController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Scripts\InstallScriptService
+     */
+    protected $installScriptService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * EggScriptController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                        $alert
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\Scripts\InstallScriptService  $installScriptService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        EggRepositoryInterface $repository,
+        InstallScriptService $installScriptService
+    ) {
+        $this->alert = $alert;
+        $this->installScriptService = $installScriptService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Handle requests to render installation script for an Egg.
+     *
+     * @param int $egg
+     * @return \Illuminate\View\View
+     */
+    public function index(int $egg): View
+    {
+        $egg = $this->repository->getWithCopyAttributes($egg);
+        $copy = $this->repository->findWhere([
+            ['copy_script_from', '=', null],
+            ['nest_id', '=', $egg->nest_id],
+            ['id', '!=', $egg],
+        ]);
+
+        $rely = $this->repository->findWhere([
+            ['copy_script_from', '=', $egg->id],
+        ]);
+
+        return view('admin.eggs.scripts', [
+            'copyFromOptions' => $copy,
+            'relyOnScript' => $rely,
+            'egg' => $egg,
+        ]);
+    }
+
+    /**
+     * Handle a request to update the installation script for an Egg.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggScriptFormRequest $request
+     * @param int                                                       $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
+     */
+    public function update(EggScriptFormRequest $request, int $egg): RedirectResponse
+    {
+        $this->installScriptService->handle($egg, $request->normalize());
+        $this->alert->success(trans('admin/nests.eggs.notices.script_updated'))->flash();
+
+        return redirect()->route('admin.nests.egg.scripts', $egg);
+    }
+}
diff --git a/app/Http/Controllers/Admin/Nests/EggVariableController.php b/app/Http/Controllers/Admin/Nests/EggVariableController.php
new file mode 100644
index 000000000..8b68743fc
--- /dev/null
+++ b/app/Http/Controllers/Admin/Nests/EggVariableController.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Controllers\Admin\Nests;
+
+use Illuminate\View\View;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\EggVariable;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Services\Eggs\Variables\VariableUpdateService;
+use Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest;
+use Pterodactyl\Services\Eggs\Variables\VariableCreationService;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggVariableController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableCreationService
+     */
+    protected $creationService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableUpdateService
+     */
+    protected $updateService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $variableRepository;
+
+    /**
+     * EggVariableController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                                $alert
+     * @param \Pterodactyl\Services\Eggs\Variables\VariableCreationService     $creationService
+     * @param \Pterodactyl\Services\Eggs\Variables\VariableUpdateService       $updateService
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        VariableCreationService $creationService,
+        VariableUpdateService $updateService,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $variableRepository
+    ) {
+        $this->alert = $alert;
+        $this->creationService = $creationService;
+        $this->repository = $repository;
+        $this->updateService = $updateService;
+        $this->variableRepository = $variableRepository;
+    }
+
+    /**
+     * Handle request to view the variables attached to an Egg.
+     *
+     * @param int $egg
+     * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function view(int $egg): View
+    {
+        $egg = $this->repository->getWithVariables($egg);
+
+        return view('admin.eggs.variables', ['egg' => $egg]);
+    }
+
+    /**
+     * Handle a request to create a new Egg variable.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
+     * @param \Pterodactyl\Models\Egg                                     $egg
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function store(EggVariableFormRequest $request, Egg $egg): RedirectResponse
+    {
+        $this->creationService->handle($egg->id, $request->normalize());
+        $this->alert->success(trans('admin/nests.variables.notices.variable_created'))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg->id);
+    }
+
+    /**
+     * Handle a request to update an existing Egg variable.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
+     * @param \Pterodactyl\Models\Egg                                     $egg
+     * @param \Pterodactyl\Models\EggVariable                             $variable
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function update(EggVariableFormRequest $request, Egg $egg, EggVariable $variable): RedirectResponse
+    {
+        $this->updateService->handle($variable, $request->normalize());
+        $this->alert->success(trans('admin/nests.variables.notices.variable_updated', [
+            'variable' => $variable->name,
+        ]))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg->id);
+    }
+
+    /**
+     * Handle a request to delete an existing Egg variable from the Panel.
+     *
+     * @param int                             $egg
+     * @param \Pterodactyl\Models\EggVariable $variable
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy(int $egg, EggVariable $variable): RedirectResponse
+    {
+        $this->variableRepository->delete($variable->id);
+        $this->alert->success(trans('admin/nests.variables.notices.variable_deleted', [
+            'variable' => $variable->name,
+        ]))->flash();
+
+        return redirect()->route('admin.nests.egg.variables', $egg);
+    }
+}
diff --git a/app/Http/Controllers/Admin/Nests/NestController.php b/app/Http/Controllers/Admin/Nests/NestController.php
index 204236025..b62753cad 100644
--- a/app/Http/Controllers/Admin/Nests/NestController.php
+++ b/app/Http/Controllers/Admin/Nests/NestController.php
@@ -145,12 +145,12 @@ class NestController extends Controller
     /**
      * Handle request to delete a nest.
      *
-     * @param \Pterodactyl\Models\Nest $nest
+     * @param int $nest
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function destroy($nest): RedirectResponse
+    public function destroy(int $nest): RedirectResponse
     {
         $this->nestDeletionService->handle($nest);
         $this->alert->success(trans('admin/nests.notices.deleted'))->flash();
diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
index 40e7b4f49..f99306e4c 100644
--- a/app/Http/Controllers/Admin/OptionController.php
+++ b/app/Http/Controllers/Admin/OptionController.php
@@ -14,16 +14,16 @@ use Pterodactyl\Models\Egg;
 use Illuminate\Http\Request;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Http\Requests\Admin\Service\EggFormRequest;
+use Pterodactyl\Services\Services\Options\EggUpdateService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
-use Pterodactyl\Services\Services\Options\OptionUpdateService;
-use Pterodactyl\Services\Services\Options\OptionCreationService;
-use Pterodactyl\Services\Services\Options\OptionDeletionService;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest;
-use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
-use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
+use Pterodactyl\Services\Services\Options\EggCreationService;
+use Pterodactyl\Services\Services\Options\EggDeletionService;
+use Pterodactyl\Services\Services\Options\InstallScriptService;
+use Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 
 class OptionController extends Controller
 {
@@ -33,22 +33,22 @@ class OptionController extends Controller
     protected $alert;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\InstallScriptUpdateService
+     * @var \Pterodactyl\Services\Services\Options\InstallScriptService
      */
     protected $installScriptUpdateService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionCreationService
+     * @var \Pterodactyl\Services\Services\Options\EggCreationService
      */
     protected $optionCreationService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionDeletionService
+     * @var \Pterodactyl\Services\Services\Options\EggDeletionService
      */
     protected $optionDeletionService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionUpdateService
+     * @var \Pterodactyl\Services\Services\Options\EggUpdateService
      */
     protected $optionUpdateService;
 
@@ -65,20 +65,20 @@ class OptionController extends Controller
     /**
      * OptionController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                                 $alert
-     * @param \Pterodactyl\Services\Services\Options\InstallScriptUpdateService $installScriptUpdateService
-     * @param \Pterodactyl\Services\Services\Options\OptionCreationService      $optionCreationService
-     * @param \Pterodactyl\Services\Services\Options\OptionDeletionService      $optionDeletionService
-     * @param \Pterodactyl\Services\Services\Options\OptionUpdateService        $optionUpdateService
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface         $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface          $serviceOptionRepository
+     * @param \Prologue\Alerts\AlertsMessageBag                           $alert
+     * @param \Pterodactyl\Services\Services\Options\InstallScriptService $installScriptUpdateService
+     * @param \Pterodactyl\Services\Services\Options\EggCreationService   $optionCreationService
+     * @param \Pterodactyl\Services\Services\Options\EggDeletionService   $optionDeletionService
+     * @param \Pterodactyl\Services\Services\Options\EggUpdateService     $optionUpdateService
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface   $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface    $serviceOptionRepository
      */
     public function __construct(
         AlertsMessageBag $alert,
-        InstallScriptUpdateService $installScriptUpdateService,
-        OptionCreationService $optionCreationService,
-        OptionDeletionService $optionDeletionService,
-        OptionUpdateService $optionUpdateService,
+        InstallScriptService $installScriptUpdateService,
+        EggCreationService $optionCreationService,
+        EggDeletionService $optionDeletionService,
+        EggUpdateService $optionUpdateService,
         NestRepositoryInterface $serviceRepository,
         EggRepositoryInterface $serviceOptionRepository
     ) {
@@ -107,12 +107,12 @@ class OptionController extends Controller
     /**
      * Handle adding a new service option.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceOptionFormRequest $request
+     * @param \Pterodactyl\Http\Requests\Admin\Service\EggFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function store(ServiceOptionFormRequest $request)
+    public function store(EggFormRequest $request)
     {
         try {
             $option = $this->optionCreationService->handle($request->normalize());
diff --git a/app/Http/Controllers/Admin/ServiceController.php b/app/Http/Controllers/Admin/ServiceController.php
deleted file mode 100644
index bdcfabaf2..000000000
--- a/app/Http/Controllers/Admin/ServiceController.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Illuminate\View\View;
-use Pterodactyl\Models\Nest;
-use Illuminate\Http\RedirectResponse;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Services\Services\NestUpdateService;
-use Pterodactyl\Services\Services\NestCreationService;
-use Pterodactyl\Services\Services\NestDeletionService;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest;
-use Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest;
-
-class ServiceController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\NestCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\NestDeletionService
-     */
-    protected $deletionService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var \Pterodactyl\Services\Services\NestUpdateService
-     */
-    protected $updateService;
-
-    /**
-     * ServiceController constructor.
-     *
-     * @param \Prologue\Alerts\AlertsMessageBag                         $alert
-     * @param \Pterodactyl\Services\Services\NestCreationService        $creationService
-     * @param \Pterodactyl\Services\Services\NestDeletionService        $deletionService
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
-     * @param \Pterodactyl\Services\Services\NestUpdateService          $updateService
-     */
-    public function __construct(
-        AlertsMessageBag $alert,
-        NestCreationService $creationService,
-        NestDeletionService $deletionService,
-        NestRepositoryInterface $repository,
-        NestUpdateService $updateService
-    ) {
-        $this->alert = $alert;
-        $this->creationService = $creationService;
-        $this->deletionService = $deletionService;
-        $this->repository = $repository;
-        $this->updateService = $updateService;
-    }
-
-    /**
-     * Display service overview page.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index(): View
-    {
-        return view('admin.services.index', [
-            'services' => $this->repository->getWithCounts(),
-        ]);
-    }
-
-    /**
-     * Display create service page.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create(): View
-    {
-        return view('admin.services.new');
-    }
-
-    /**
-     * Return base view for a service.
-     *
-     * @param int $service
-     * @return \Illuminate\View\View
-     */
-    public function view(int $service): View
-    {
-        return view('admin.services.view', [
-            'service' => $this->repository->getWithOptionServers($service),
-        ]);
-    }
-
-    /**
-     * Return function editing view for a service.
-     *
-     * @param \Pterodactyl\Models\Nest $service
-     * @return \Illuminate\View\View
-     */
-    public function viewFunctions(Nest $service): View
-    {
-        return view('admin.services.functions', ['service' => $service]);
-    }
-
-    /**
-     * Handle post action for new service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function store(StoreNestFormRequest $request): RedirectResponse
-    {
-        $service = $this->creationService->handle($request->normalize());
-        $this->alert->success(trans('admin/services.notices.service_created', ['name' => $service->name]))->flash();
-
-        return redirect()->route('admin.services.view', $service->id);
-    }
-
-    /**
-     * Edits configuration for a specific service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\StoreNestFormRequest $request
-     * @param \Pterodactyl\Models\Nest                                      $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function update(StoreNestFormRequest $request, Nest $service): RedirectResponse
-    {
-        $this->updateService->handle($service->id, $request->normalize());
-        $this->alert->success(trans('admin/services.notices.service_updated'))->flash();
-
-        return redirect()->route('admin.services.view', $service);
-    }
-
-    /**
-     * Update the functions file for a service.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\ServiceFunctionsFormRequest $request
-     * @param \Pterodactyl\Models\Nest                                             $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function updateFunctions(ServiceFunctionsFormRequest $request, Nest $service): RedirectResponse
-    {
-        $this->updateService->handle($service->id, $request->normalize());
-        $this->alert->success(trans('admin/services.notices.functions_updated'))->flash();
-
-        return redirect()->route('admin.services.view.functions', $service->id);
-    }
-
-    /**
-     * Delete a service from the panel.
-     *
-     * @param \Pterodactyl\Models\Nest $service
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     */
-    public function destroy(Nest $service): RedirectResponse
-    {
-        $this->deletionService->handle($service->id);
-        $this->alert->success(trans('admin/services.notices.service_deleted'))->flash();
-
-        return redirect()->route('admin.services');
-    }
-}
diff --git a/app/Http/Controllers/Admin/VariableController.php b/app/Http/Controllers/Admin/VariableController.php
deleted file mode 100644
index dc62ee71f..000000000
--- a/app/Http/Controllers/Admin/VariableController.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\EggVariable;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest;
-use Pterodactyl\Repositories\Eloquent\ServiceVariableRepository;
-use Pterodactyl\Services\Services\Variables\VariableUpdateService;
-use Pterodactyl\Services\Services\Variables\VariableCreationService;
-
-class VariableController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
-     */
-    protected $serviceOptionRepository;
-
-    /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServiceVariableRepository
-     */
-    protected $serviceVariableRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableUpdateService
-     */
-    protected $updateService;
-
-    public function __construct(
-        AlertsMessageBag $alert,
-        EggRepositoryInterface $serviceOptionRepository,
-        ServiceVariableRepository $serviceVariableRepository,
-        VariableCreationService $creationService,
-        VariableUpdateService $updateService
-    ) {
-        $this->alert = $alert;
-        $this->creationService = $creationService;
-        $this->serviceOptionRepository = $serviceOptionRepository;
-        $this->serviceVariableRepository = $serviceVariableRepository;
-        $this->updateService = $updateService;
-    }
-
-    /**
-     * Handles POST request to create a new option variable.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\Egg                                    $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
-     */
-    public function store(OptionVariableFormRequest $request, Egg $option)
-    {
-        $this->creationService->handle($option->id, $request->normalize());
-        $this->alert->success(trans('admin/services.variables.notices.variable_created'))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-
-    /**
-     * Display variable overview page for a service option.
-     *
-     * @param int $option
-     * @return \Illuminate\View\View
-     */
-    public function view($option)
-    {
-        $option = $this->serviceOptionRepository->getWithVariables($option);
-
-        return view('admin.services.options.variables', ['option' => $option]);
-    }
-
-    /**
-     * Handles POST when editing a configration for a service variable.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\OptionVariableFormRequest $request
-     * @param \Pterodactyl\Models\Egg                                    $option
-     * @param \Pterodactyl\Models\EggVariable                            $variable
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
-     */
-    public function update(OptionVariableFormRequest $request, Egg $option, EggVariable $variable)
-    {
-        $this->updateService->handle($variable, $request->normalize());
-        $this->alert->success(trans('admin/services.variables.notices.variable_updated', [
-            'variable' => $variable->name,
-        ]))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-
-    /**
-     * Delete a service variable from the system.
-     *
-     * @param \Pterodactyl\Models\Egg         $option
-     * @param \Pterodactyl\Models\EggVariable $variable
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function delete(Egg $option, EggVariable $variable)
-    {
-        $this->serviceVariableRepository->delete($variable->id);
-        $this->alert->success(trans('admin/services.variables.notices.variable_deleted', [
-            'variable' => $variable->name,
-        ]))->flash();
-
-        return redirect()->route('admin.services.option.variables', $option->id);
-    }
-}
diff --git a/app/Http/Requests/Admin/Egg/EggFormRequest.php b/app/Http/Requests/Admin/Egg/EggFormRequest.php
new file mode 100644
index 000000000..539ee3adc
--- /dev/null
+++ b/app/Http/Requests/Admin/Egg/EggFormRequest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Pterodactyl\Http\Requests\Admin\Egg;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class EggFormRequest extends AdminFormRequest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        $rules = [
+            'name' => 'required|string|max:255',
+            'description' => 'required|string',
+            'docker_image' => 'required|string|max:255',
+            'startup' => 'required|string',
+            'config_from' => 'sometimes|bail|nullable|numeric',
+            'config_stop' => 'required_without:config_from|nullable|string|max:255',
+            'config_startup' => 'required_without:config_from|nullable|json',
+            'config_logs' => 'required_without:config_from|nullable|json',
+            'config_files' => 'required_without:config_from|nullable|json',
+        ];
+
+        if ($this->method() === 'POST') {
+            $rules['nest_id'] = 'required|numeric|exists:nests,id';
+        }
+
+        return $rules;
+    }
+
+    /**
+     * @param \Illuminate\Contracts\Validation\Validator $validator
+     */
+    public function withValidator($validator)
+    {
+        $validator->sometimes('config_from', 'exists:eggs,id', function () {
+            return (int) $this->input('config_from') !== 0;
+        });
+    }
+}
diff --git a/app/Http/Requests/Admin/Service/EditOptionScript.php b/app/Http/Requests/Admin/Egg/EggScriptFormRequest.php
similarity index 88%
rename from app/Http/Requests/Admin/Service/EditOptionScript.php
rename to app/Http/Requests/Admin/Egg/EggScriptFormRequest.php
index 03d1612c9..3f522e96f 100644
--- a/app/Http/Requests/Admin/Service/EditOptionScript.php
+++ b/app/Http/Requests/Admin/Egg/EggScriptFormRequest.php
@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class EditOptionScript extends AdminFormRequest
+class EggScriptFormRequest extends AdminFormRequest
 {
     /**
      * Return the rules to be used when validating the sent data in the request.
diff --git a/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php b/app/Http/Requests/Admin/Egg/EggVariableFormRequest.php
similarity index 80%
rename from app/Http/Requests/Admin/Service/OptionVariableFormRequest.php
rename to app/Http/Requests/Admin/Egg/EggVariableFormRequest.php
index 2076e8da5..621fbd772 100644
--- a/app/Http/Requests/Admin/Service/OptionVariableFormRequest.php
+++ b/app/Http/Requests/Admin/Egg/EggVariableFormRequest.php
@@ -7,11 +7,12 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
 use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class OptionVariableFormRequest extends AdminFormRequest
+class EggVariableFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -37,11 +38,9 @@ class OptionVariableFormRequest extends AdminFormRequest
     {
         $rules = $this->input('rules');
         if ($this->method() === 'PATCH') {
-            $rules = $this->input('rules', $this->route()->parameter('variable')->rules);
+            $rules = $this->input('rules', $this->route()->parameter('egg')->rules);
         }
 
-        $validator->sometimes('default_value', $rules, function ($input) {
-            return $input->default_value;
-        });
+        $validator->addRules(['default_value' => $rules]);
     }
 }
diff --git a/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php b/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
deleted file mode 100644
index 065fef0f5..000000000
--- a/app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Requests\Admin\Service;
-
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
-
-class ServiceOptionFormRequest extends AdminFormRequest
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function rules()
-    {
-        return Egg::getCreateRules();
-    }
-}
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
index fd8740840..cf82f3a0d 100644
--- a/app/Models/Egg.php
+++ b/app/Models/Egg.php
@@ -64,7 +64,7 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $applicationRules = [
-        'service_id' => 'required',
+        'nest_id' => 'required',
         'name' => 'required',
         'description' => 'required',
         'docker_image' => 'required',
@@ -80,13 +80,13 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'service_id' => 'bail|numeric|exists:services,id',
+        'nest_id' => 'bail|numeric|exists:nests,id',
         'uuid' => 'string|size:36',
         'name' => 'string|max:255',
         'description' => 'string',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
-        'config_from' => 'bail|nullable|numeric|exists:service_options,id',
+        'config_from' => 'bail|nullable|numeric|exists:eggs,id',
         'config_stop' => 'nullable|string|max:255',
         'config_startup' => 'nullable|json',
         'config_logs' => 'nullable|json',
diff --git a/app/Services/Services/Options/OptionConfigurationFileService.php b/app/Services/Eggs/EggConfigurationService.php
similarity index 83%
rename from app/Services/Services/Options/OptionConfigurationFileService.php
rename to app/Services/Eggs/EggConfigurationService.php
index e8656fdba..b308ca1e5 100644
--- a/app/Services/Services/Options/OptionConfigurationFileService.php
+++ b/app/Services/Eggs/EggConfigurationService.php
@@ -7,17 +7,20 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Options;
+namespace Pterodactyl\Services\Eggs;
 
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 
-class OptionConfigurationFileService
+class EggConfigurationService
 {
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
     protected $repository;
 
     /**
-     * OptionConfigurationFileService constructor.
+     * EggConfigurationService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
@@ -27,7 +30,7 @@ class OptionConfigurationFileService
     }
 
     /**
-     * Return a service configuration file to be used by the daemon.
+     * Return an Egg file to be used by the Daemon.
      *
      * @param int|\Pterodactyl\Models\Egg $option
      * @return array
diff --git a/app/Services/Services/Options/OptionCreationService.php b/app/Services/Eggs/EggCreationService.php
similarity index 67%
rename from app/Services/Services/Options/OptionCreationService.php
rename to app/Services/Eggs/EggCreationService.php
index 05f4c639e..13f04c3b0 100644
--- a/app/Services/Services/Options/OptionCreationService.php
+++ b/app/Services/Eggs/EggCreationService.php
@@ -7,15 +7,16 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Options;
+namespace Pterodactyl\Services\Eggs;
 
 use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 
-class OptionCreationService
+// When a mommy and a daddy pterodactyl really like eachother...
+class EggCreationService
 {
     /**
      * @var \Illuminate\Contracts\Config\Repository
@@ -28,7 +29,7 @@ class OptionCreationService
     protected $repository;
 
     /**
-     * CreationService constructor.
+     * EggCreationService constructor.
      *
      * @param \Illuminate\Contracts\Config\Repository                  $config
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
@@ -46,31 +47,25 @@ class OptionCreationService
      * @return \Pterodactyl\Models\Egg
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
      */
     public function handle(array $data): Egg
     {
-        if (! is_null(array_get($data, 'config_from'))) {
+        $data['config_from'] = array_get($data, 'config_from');
+        if (! is_null($data['config_from'])) {
             $results = $this->repository->findCountWhere([
-                ['service_id', '=', array_get($data, 'service_id')],
+                ['nest_id', '=', array_get($data, 'nest_id')],
                 ['id', '=', array_get($data, 'config_from')],
             ]);
 
             if ($results !== 1) {
                 throw new NoParentConfigurationFoundException(trans('exceptions.service.options.must_be_child'));
             }
-        } else {
-            $data['config_from'] = null;
-        }
-
-        if (count($parts = explode(':', array_get($data, 'tag'))) > 1) {
-            $data['tag'] = $this->config->get('pterodactyl.service.author') . ':' . trim(array_pop($parts));
-        } else {
-            $data['tag'] = $this->config->get('pterodactyl.service.author') . ':' . trim(array_get($data, 'tag'));
         }
 
         return $this->repository->create(array_merge($data, [
             'uuid' => Uuid::uuid4()->toString(),
+            'author' => $this->config->get('pterodactyl.service.author'),
         ]), true, true);
     }
 }
diff --git a/app/Services/Services/Options/OptionDeletionService.php b/app/Services/Eggs/EggDeletionService.php
similarity index 66%
rename from app/Services/Services/Options/OptionDeletionService.php
rename to app/Services/Eggs/EggDeletionService.php
index 35c60cb93..5179f6a50 100644
--- a/app/Services/Services/Options/OptionDeletionService.php
+++ b/app/Services/Eggs/EggDeletionService.php
@@ -7,14 +7,14 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Options;
+namespace Pterodactyl\Services\Eggs;
 
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\HasChildrenException;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
 
-class OptionDeletionService
+class EggDeletionService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
@@ -27,7 +27,7 @@ class OptionDeletionService
     protected $serverRepository;
 
     /**
-     * OptionDeletionService constructor.
+     * EggDeletionService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $serverRepository
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface    $repository
@@ -41,26 +41,26 @@ class OptionDeletionService
     }
 
     /**
-     * Delete an option from the database if it has no active servers attached to it.
+     * Delete an Egg from the database if it has no active servers attached to it.
      *
-     * @param int $option
+     * @param int $egg
      * @return int
      *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\HasChildrenException
      */
-    public function handle(int $option): int
+    public function handle(int $egg): int
     {
-        $servers = $this->serverRepository->findCountWhere([['option_id', '=', $option]]);
+        $servers = $this->serverRepository->findCountWhere([['egg_id', '=', $egg]]);
         if ($servers > 0) {
-            throw new HasActiveServersException(trans('exceptions.service.options.delete_has_servers'));
+            throw new HasActiveServersException(trans('exceptions.nest.egg.delete_has_servers'));
         }
 
-        $children = $this->repository->findCountWhere([['config_from', '=', $option]]);
+        $children = $this->repository->findCountWhere([['config_from', '=', $egg]]);
         if ($children > 0) {
-            throw new HasChildrenException(trans('exceptions.service.options.has_children'));
+            throw new HasChildrenException(trans('exceptions.nest.egg.has_children'));
         }
 
-        return $this->repository->delete($option);
+        return $this->repository->delete($egg);
     }
 }
diff --git a/app/Services/Services/Options/OptionUpdateService.php b/app/Services/Eggs/EggUpdateService.php
similarity index 64%
rename from app/Services/Services/Options/OptionUpdateService.php
rename to app/Services/Eggs/EggUpdateService.php
index 1daaf14ae..2932b7457 100644
--- a/app/Services/Services/Options/OptionUpdateService.php
+++ b/app/Services/Eggs/EggUpdateService.php
@@ -7,13 +7,13 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Options;
+namespace Pterodactyl\Services\Eggs;
 
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 
-class OptionUpdateService
+class EggUpdateService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
@@ -21,7 +21,7 @@ class OptionUpdateService
     protected $repository;
 
     /**
-     * OptionUpdateService constructor.
+     * EggUpdateService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
@@ -33,30 +33,30 @@ class OptionUpdateService
     /**
      * Update a service option.
      *
-     * @param int|\Pterodactyl\Models\Egg $option
+     * @param int|\Pterodactyl\Models\Egg $egg
      * @param array                       $data
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
      */
-    public function handle($option, array $data)
+    public function handle($egg, array $data)
     {
-        if (! $option instanceof Egg) {
-            $option = $this->repository->find($option);
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->find($egg);
         }
 
         if (! is_null(array_get($data, 'config_from'))) {
             $results = $this->repository->findCountWhere([
-                ['service_id', '=', $option->service_id],
+                ['nest_id', '=', $egg->nest_id],
                 ['id', '=', array_get($data, 'config_from')],
             ]);
 
             if ($results !== 1) {
-                throw new NoParentConfigurationFoundException(trans('exceptions.service.options.must_be_child'));
+                throw new NoParentConfigurationFoundException(trans('exceptions.nest.egg.must_be_child'));
             }
         }
 
-        $this->repository->withoutFresh()->update($option->id, $data);
+        $this->repository->withoutFresh()->update($egg->id, $data);
     }
 }
diff --git a/app/Services/Services/Options/InstallScriptUpdateService.php b/app/Services/Eggs/Scripts/InstallScriptService.php
similarity index 66%
rename from app/Services/Services/Options/InstallScriptUpdateService.php
rename to app/Services/Eggs/Scripts/InstallScriptService.php
index 1d5a9a920..92493be35 100644
--- a/app/Services/Services/Options/InstallScriptUpdateService.php
+++ b/app/Services/Eggs/Scripts/InstallScriptService.php
@@ -7,13 +7,13 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Options;
+namespace Pterodactyl\Services\Eggs\Scripts;
 
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
+use Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException;
 
-class InstallScriptUpdateService
+class InstallScriptService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
@@ -21,7 +21,7 @@ class InstallScriptUpdateService
     protected $repository;
 
     /**
-     * InstallScriptUpdateService constructor.
+     * InstallScriptService constructor.
      *
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
      */
@@ -31,30 +31,30 @@ class InstallScriptUpdateService
     }
 
     /**
-     * Modify the option install script for a given service option.
+     * Modify the install script for a given Egg.
      *
-     * @param int|\Pterodactyl\Models\Egg $option
+     * @param int|\Pterodactyl\Models\Egg $egg
      * @param array                       $data
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
      */
-    public function handle($option, array $data)
+    public function handle($egg, array $data)
     {
-        if (! $option instanceof Egg) {
-            $option = $this->repository->find($option);
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->find($egg);
         }
 
         if (! is_null(array_get($data, 'copy_script_from'))) {
-            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $option->service_id)) {
-                throw new InvalidCopyFromException(trans('exceptions.service.options.invalid_copy_id'));
+            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $egg->service_id)) {
+                throw new InvalidCopyFromException(trans('exceptions.nest.egg.invalid_copy_id'));
             }
         }
 
-        $this->repository->withoutFresh()->update($option->id, [
+        $this->repository->withoutFresh()->update($egg->id, [
             'script_install' => array_get($data, 'script_install'),
-            'script_is_privileged' => array_get($data, 'script_is_privileged'),
+            'script_is_privileged' => array_get($data, 'script_is_privileged', 1),
             'script_entry' => array_get($data, 'script_entry'),
             'script_container' => array_get($data, 'script_container'),
             'copy_script_from' => array_get($data, 'copy_script_from'),
diff --git a/app/Services/Services/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php
similarity index 51%
rename from app/Services/Services/Variables/VariableCreationService.php
rename to app/Services/Eggs/Variables/VariableCreationService.php
index f6891df26..76aac4456 100644
--- a/app/Services/Services/Variables/VariableCreationService.php
+++ b/app/Services/Eggs/Variables/VariableCreationService.php
@@ -7,50 +7,51 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Variables;
+namespace Pterodactyl\Services\Eggs\Variables;
 
-use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableCreationService
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
-    protected $serviceOptionRepository;
+    protected $eggRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
-    protected $serviceVariableRepository;
+    protected $variableRepository;
 
+    /**
+     * VariableCreationService constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $eggRepository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
     public function __construct(
-        EggRepositoryInterface $serviceOptionRepository,
-        ServiceVariableRepositoryInterface $serviceVariableRepository
+        EggRepositoryInterface $eggRepository,
+        EggVariableRepositoryInterface $variableRepository
     ) {
-        $this->serviceOptionRepository = $serviceOptionRepository;
-        $this->serviceVariableRepository = $serviceVariableRepository;
+        $this->eggRepository = $eggRepository;
+        $this->variableRepository = $variableRepository;
     }
 
     /**
-     * Create a new variable for a given service option.
+     * Create a new variable for a given Egg.
      *
-     * @param int|\Pterodactyl\Models\Egg $option
-     * @param array                       $data
+     * @param int   $egg
+     * @param array $data
      * @return \Pterodactyl\Models\EggVariable
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
-    public function handle($option, array $data)
+    public function handle(int $egg, array $data): EggVariable
     {
-        if ($option instanceof Egg) {
-            $option = $option->id;
-        }
-
         if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
             throw new ReservedVariableNameException(sprintf(
                 'Cannot use the protected name %s for this environment variable.',
@@ -60,8 +61,8 @@ class VariableCreationService
 
         $options = array_get($data, 'options', []);
 
-        return $this->serviceVariableRepository->create(array_merge([
-            'option_id' => $option,
+        return $this->variableRepository->create(array_merge([
+            'egg_id' => $egg,
             'user_viewable' => in_array('user_viewable', $options),
             'user_editable' => in_array('user_editable', $options),
         ], $data));
diff --git a/app/Services/Services/Variables/VariableUpdateService.php b/app/Services/Eggs/Variables/VariableUpdateService.php
similarity index 75%
rename from app/Services/Services/Variables/VariableUpdateService.php
rename to app/Services/Eggs/Variables/VariableUpdateService.php
index 28573785d..9c4f67fa7 100644
--- a/app/Services/Services/Variables/VariableUpdateService.php
+++ b/app/Services/Eggs/Variables/VariableUpdateService.php
@@ -7,32 +7,32 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Variables;
+namespace Pterodactyl\Services\Eggs\Variables;
 
 use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableUpdateService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
     protected $repository;
 
     /**
      * VariableUpdateService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository
      */
-    public function __construct(ServiceVariableRepositoryInterface $repository)
+    public function __construct(EggVariableRepositoryInterface $repository)
     {
         $this->repository = $repository;
     }
 
     /**
-     * Update a specific service variable.
+     * Update a specific egg variable.
      *
      * @param int|\Pterodactyl\Models\EggVariable $variable
      * @param array                               $data
@@ -41,7 +41,7 @@ class VariableUpdateService
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
     public function handle($variable, array $data)
     {
@@ -58,7 +58,7 @@ class VariableUpdateService
 
             $search = $this->repository->withColumns('id')->findCountWhere([
                 ['env_variable', '=', array_get($data, 'env_variable')],
-                ['option_id', '=', $variable->option_id],
+                ['egg_id', '=', $variable->egg_id],
                 ['id', '!=', $variable->id],
             ]);
 
@@ -71,9 +71,9 @@ class VariableUpdateService
 
         $options = array_get($data, 'options', []);
 
-        return $this->repository->withoutFresh()->update($variable->id, array_merge([
+        return $this->repository->withoutFresh()->update($variable->id, array_merge($data, [
             'user_viewable' => in_array('user_viewable', $options),
             'user_editable' => in_array('user_editable', $options),
-        ], $data));
+        ]));
     }
 }
diff --git a/resources/themes/pterodactyl/admin/services/options/new.blade.php b/resources/themes/pterodactyl/admin/eggs/new.blade.php
similarity index 72%
rename from resources/themes/pterodactyl/admin/services/options/new.blade.php
rename to resources/themes/pterodactyl/admin/eggs/new.blade.php
index 79195f008..e432090f3 100644
--- a/resources/themes/pterodactyl/admin/services/options/new.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/new.blade.php
@@ -6,20 +6,20 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service &rarr; New Option
+    Nests &rarr; New Egg
 @endsection
 
 @section('content-header')
-    <h1>New Option<small>Create a new service option to assign to servers.</small></h1>
+    <h1>New Egg<small>Create a new Egg to assign to servers.</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li class="active">New Service Option</li>
+        <li><a href="{{ route('admin.nests') }}">Nests</a></li>
+        <li class="active">New Egg</li>
     </ol>
 @endsection
 
 @section('content')
-<form action="{{ route('admin.services.option.new') }}" method="POST">
+<form action="{{ route('admin.nests.egg.new') }}" method="POST">
     <div class="row">
         <div class="col-xs-12">
             <div class="box">
@@ -30,42 +30,37 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="form-group">
-                                <label for="pServiceId" class="form-label">Associated Service</label>
-                                <select name="service_id" id="pServiceId">
-                                    @foreach($services as $service)
-                                        <option value="{{ $service->id }}" {{ old('service_id') != $service->id ?: 'selected' }}>{{ $service->name }} &lt;{{ $service->author }}&gt;</option>
-                                    @endforeach
-                                </select>
+                                <label for="pNestId" class="form-label">Associated Nest</label>
+                                <div>
+                                    <select name="nest_id" id="pNestId">
+                                        @foreach($nests as $nest)
+                                            <option value="{{ $nest->id }}" {{ old('nest_id') != $nest->id ?: 'selected' }}>{{ $nest->name }} &lt;{{ $nest->author }}&gt;</option>
+                                        @endforeach
+                                    </select>
+                                    <p class="text-muted small">Think of a Nest as a category. You can put multiple Eggs in a nest, but consider putting only Eggs that are related to eachother in each Nest.</p>
+                                </div>
                             </div>
                             <div class="form-group">
-                                <label for="pName" class="form-label">Option Name</label>
+                                <label for="pName" class="form-label">Name</label>
                                 <input type="text" id="pName" name="name" value="{{ old('name') }}" class="form-control" />
-                                <p class="text-muted small">A simple, human-readable name to use as an identifier for this service.</p>
+                                <p class="text-muted small">A simple, human-readable name to use as an identifier for this Egg. This is what users will see as thier gameserver type.</p>
                             </div>
                             <div class="form-group">
                                 <label for="pDescription" class="form-label">Description</label>
                                 <textarea id="pDescription" name="description" class="form-control" rows="8">{{ old('description') }}</textarea>
-                                <p class="text-muted small">A description of this service that will be displayed throughout the panel as needed.</p>
+                                <p class="text-muted small">A description of this Egg.</p>
                             </div>
                         </div>
                         <div class="col-sm-6">
                             <div class="form-group">
-                                <label for="pTag" class="form-label">Option Tag</label>
-                                <div class="input-group">
-                                    <span class="input-group-addon">{{ config('pterodactyl.service.author') }}:</span>
-                                    <input type="text" id="pTag" name="tag" value="{{ old('tag') }}" class="form-control" />
-                                </div>
-                                <p class="text-muted small">This should be a unique identifer for this service option that is not used for any other service options. Must be alpha-numeric and no more than 60 characters in length.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="pDockerImage" class="control-label">Docker Image <span class="field-optional"></span></label>
+                                <label for="pDockerImage" class="control-label">Docker Image</label>
                                 <input type="text" id="pDockerImage" name="docker_image" value="{{ old('docker_image') }}" placeholder="quay.io/pterodactyl/service" class="form-control" />
-                                <p class="text-muted small">The default docker image that should be used for new servers under this service option. This can be left blank to use the parent service's defined image, and can also be changed per-server.</p>
+                                <p class="text-muted small">The default docker image that should be used for new servers using this Egg. This can be changed per-server.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pStartup" class="control-label">Startup Command <span class="field-optional"></span></label>
-                                <textarea id="pStartup" name="startup" class="form-control" rows="4">{{ old('startup') }}</textarea>
-                                <p class="text-muted small">The default statup command that should be used for new servers under this service option. This can be left blank to use the parent service's startup, and can also be changed per-server.</p>
+                                <label for="pStartup" class="control-label">Startup Command</label>
+                                <textarea id="pStartup" name="startup" class="form-control" rows="14">{{ old('startup') }}</textarea>
+                                <p class="text-muted small">The default statup command that should be used for new servers created with this Egg. You can change this per-server as needed.</p>
                             </div>
                         </div>
                     </div>
@@ -90,7 +85,7 @@
                                 <select name="config_from" id="pConfigFrom" class="form-control">
                                     <option value="0">None</option>
                                 </select>
-                                <p class="text-muted small">If you would like to default to settings from another option select the option from the menu above.</p>
+                                <p class="text-muted small">If you would like to default to settings from another Egg select it from the dropdown above.</p>
                             </div>
                             <div class="form-group">
                                 <label for="pConfigStop" class="form-label">Stop Command</label>
@@ -118,7 +113,7 @@
                 </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
-                    <button type="submit" class="btn btn-success btn-sm pull-right">Create Service</button>
+                    <button type="submit" class="btn btn-success btn-sm pull-right">Create</button>
                 </div>
             </div>
         </div>
@@ -131,15 +126,15 @@
     {!! Theme::js('vendor/lodash/lodash.js') !!}
     <script>
     $(document).ready(function() {
-        $('#pServiceId').select2().change();
+        $('#pNestId').select2().change();
         $('#pConfigFrom').select2();
     });
-    $('#pServiceId').on('change', function (event) {
+    $('#pNestId').on('change', function (event) {
         $('#pConfigFrom').html('<option value="">None</option>').select2({
-            data: $.map(_.get(Pterodactyl.services, $(this).val() + '.options', []), function (item) {
+            data: $.map(_.get(Pterodactyl.nests, $(this).val() + '.eggs', []), function (item) {
                 return {
                     id: item.id,
-                    text: item.name + ' <' + item.tag + '>',
+                    text: item.name + ' <' + item.author + '>',
                 };
             }),
         });
diff --git a/resources/themes/pterodactyl/admin/services/options/scripts.blade.php b/resources/themes/pterodactyl/admin/eggs/scripts.blade.php
similarity index 74%
rename from resources/themes/pterodactyl/admin/services/options/scripts.blade.php
rename to resources/themes/pterodactyl/admin/eggs/scripts.blade.php
index 60ac5f50f..8452cf260 100644
--- a/resources/themes/pterodactyl/admin/services/options/scripts.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/scripts.blade.php
@@ -6,16 +6,16 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service &rarr; Option: {{ $option->name }} &rarr; Scripts
+    Nests &rarr; Egg: {{ $egg->name }} &rarr; Scripts
 @endsection
 
 @section('content-header')
-    <h1>{{ $option->name }}<small>Manage install and upgrade scripts for this service option.</small></h1>
+    <h1>{{ $egg->name }}<small>Manage install and upgrade scripts for this Egg.</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li><a href="{{ route('admin.services.view', $option->service->id) }}">{{ $option->service->name }}</a></li>
-        <li class="active">{{ $option->name }}</li>
+        <li><a href="{{ route('admin.nests') }}">Service</a></li>
+        <li><a href="{{ route('admin.nests.view', $egg->nest->id) }}">{{ $egg->nest->name }}</a></li>
+        <li class="active">{{ $egg->name }}</li>
     </ol>
 @endsection
 
@@ -24,29 +24,29 @@
     <div class="col-xs-12">
         <div class="nav-tabs-custom nav-tabs-floating">
             <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.services.option.view', $option->id) }}">Configuration</a></li>
-                <li><a href="{{ route('admin.services.option.variables', $option->id) }}">Variables</a></li>
-                <li class="active"><a href="{{ route('admin.services.option.scripts', $option->id) }}">Scripts</a></li>
+                <li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
+                <li><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
+                <li class="active"><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
             </ul>
         </div>
     </div>
 </div>
-<form action="{{ route('admin.services.option.scripts', $option->id) }}" method="POST">
+<form action="{{ route('admin.nests.egg.scripts', $egg->id) }}" method="POST">
     <div class="row">
         <div class="col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">Install Script</h3>
                 </div>
-                @if(! is_null($option->copyFrom))
+                @if(! is_null($egg->copyFrom))
                     <div class="box-body">
                         <div class="callout callout-warning no-margin">
-                            This service option is copying installation scripts and containe options from <a href="{{ route('admin.services.option.view', $option->copyFrom->id) }}">{{ $option->copyFrom->name }}</a>. Any changes you make to this script will not apply unless you select "None" from the dropdown box below.
+                            This service option is copying installation scripts and containe options from <a href="{{ route('admin.nests.egg.view', $egg->copyFrom->id) }}">{{ $egg->copyFrom->name }}</a>. Any changes you make to this script will not apply unless you select "None" from the dropdown box below.
                         </div>
                     </div>
                 @endif
                 <div class="box-body no-padding">
-                    <div id="editor_install"style="height:300px">{{ $option->script_install }}</div>
+                    <div id="editor_install"style="height:300px">{{ $egg->script_install }}</div>
                 </div>
                 <div class="box-body">
                     <div class="row">
@@ -55,19 +55,19 @@
                             <select id="pCopyScriptFrom" name="copy_script_from">
                                 <option value="0">None</option>
                                 @foreach($copyFromOptions as $opt)
-                                    <option value="{{ $opt->id }}" {{ $option->copy_script_from !== $opt->id ?: 'selected' }}>{{ $opt->name }}</option>
+                                    <option value="{{ $opt->id }}" {{ $egg->copy_script_from !== $opt->id ?: 'selected' }}>{{ $opt->name }}</option>
                                 @endforeach
                             </select>
                             <p class="text-muted small">If selected, script above will be ignored and script from selected option will be used in place.</p>
                         </div>
                         <div class="form-group col-sm-4">
                             <label class="control-label">Script Container</label>
-                            <input type="text" name="script_container" class="form-control" value="{{ $option->script_container }}" />
+                            <input type="text" name="script_container" class="form-control" value="{{ $egg->script_container }}" />
                             <p class="text-muted small">Docker container to use when running this script for the server.</p>
                         </div>
                         <div class="form-group col-sm-4">
                             <label class="control-label">Script Entrypoint Command</label>
-                            <input type="text" name="script_entry" class="form-control" value="{{ $option->script_entry }}" />
+                            <input type="text" name="script_entry" class="form-control" value="{{ $egg->script_entry }}" />
                             <p class="text-muted small">The entrypoint command to use for this script.</p>
                         </div>
                     </div>
@@ -76,8 +76,8 @@
                             The following service options rely on this script:
                             @if(count($relyOnScript) > 0)
                                 @foreach($relyOnScript as $rely)
-                                    <a href="{{ route('admin.services.option.view', $rely->id) }}">
-                                        <code>{{ $rely->name }}</code>&nbsp;
+                                    <a href="{{ route('admin.nests.egg.view', $rely->id) }}">
+                                        <code>{{ $rely->name }}</code>@if(!$loop->last),&nbsp;@endif
                                     </a>
                                 @endforeach
                             @else
@@ -89,7 +89,7 @@
                 <div class="box-footer">
                     {!! csrf_field() !!}
                     <textarea name="script_install" class="hidden"></textarea>
-                    <button type="submit" class="btn btn-primary btn-sm pull-right">Save Script</button>
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Save</button>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/services/options/variables.blade.php b/resources/themes/pterodactyl/admin/eggs/variables.blade.php
similarity index 84%
rename from resources/themes/pterodactyl/admin/services/options/variables.blade.php
rename to resources/themes/pterodactyl/admin/eggs/variables.blade.php
index 7bceba7bb..5ceeda675 100644
--- a/resources/themes/pterodactyl/admin/services/options/variables.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/variables.blade.php
@@ -6,16 +6,16 @@
 @extends('layouts.admin')
 
 @section('title')
-    Service Options &rarr; {{ $option->name }} &rarr; Variables
+    Egg &rarr; {{ $egg->name }} &rarr; Variables
 @endsection
 
 @section('content-header')
-    <h1>{{ $option->name }}<small>Managing variables for this service option.</small></h1>
+    <h1>{{ $egg->name }}<small>Managing variables for this Egg.</small></h1>
     <ol class="breadcrumb">
         <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li><a href="{{ route('admin.services') }}">Service</a></li>
-        <li><a href="{{ route('admin.services.view', $option->service->id) }}">{{ $option->service->name }}</a></li>
-        <li><a href="{{ route('admin.services.option.view', $option->id) }}">{{ $option->name }}</a></li>
+        <li><a href="{{ route('admin.nests') }}">Nests</a></li>
+        <li><a href="{{ route('admin.nests.view', $egg->nest->id) }}">{{ $egg->nest->name }}</a></li>
+        <li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">{{ $egg->name }}</a></li>
         <li class="active">Variables</li>
     </ol>
 @endsection
@@ -25,22 +25,30 @@
     <div class="col-xs-12">
         <div class="nav-tabs-custom nav-tabs-floating">
             <ul class="nav nav-tabs">
-                <li><a href="{{ route('admin.services.option.view', $option->id) }}">Configuration</a></li>
-                <li class="active"><a href="{{ route('admin.services.option.variables', $option->id) }}">Variables</a></li>
-                <li class="tab-success"><a href="#modal" data-toggle="modal" data-target="#newVariableModal">New Variable</a></li>
-                <li><a href="{{ route('admin.services.option.scripts', $option->id) }}">Scripts</a></li>
+                <li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
+                <li class="active"><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
+                <li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
             </ul>
         </div>
     </div>
 </div>
 <div class="row">
-    @foreach($option->variables as $variable)
+    <div class="col-xs-12">
+        <div class="box no-border">
+            <div class="box-body">
+                <a href="#" class="btn btn-sm btn-success pull-right" data-toggle="modal" data-target="#newVariableModal">Create New Variable</a>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    @foreach($egg->variables as $variable)
         <div class="col-sm-6">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ $variable->name }}</h3>
                 </div>
-                <form action="{{ route('admin.services.option.variables.edit', ['id' => $option->id, 'variable' => $variable->id]) }}" method="POST">
+                <form action="{{ route('admin.nests.egg.variables.edit', ['id' => $egg->id, 'variable' => $variable->id]) }}" method="POST">
                     <div class="box-body">
                         <div class="form-group">
                             <label class="form-label">Name</label>
@@ -93,7 +101,7 @@
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title">Create New Option Variable</h4>
             </div>
-            <form action="{{ route('admin.services.option.variables', $option->id) }}" method="POST">
+            <form action="{{ route('admin.nests.egg.variables', $egg->id) }}" method="POST">
                 <div class="modal-body">
                     <div class="form-group">
                         <label class="form-label">Name</label>
diff --git a/routes/admin.php b/routes/admin.php
index 7eb161834..8952f3217 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -156,7 +156,7 @@ Route::group(['prefix' => 'nests'], function () {
     Route::get('/egg/{egg}', 'Nests\EggController@view')->name('admin.nests.egg.view');
     Route::get('/egg/{egg}/export', 'Nests\EggShareController@export')->name('admin.nests.egg.export');
     Route::get('/egg/{egg}/variables', 'Nests\EggVariableController@view')->name('admin.nests.egg.variables');
-    Route::get('/egg/{egg}/scripts', 'Nests\EggScriptController@view')->name('admin.nests.egg.scripts');
+    Route::get('/egg/{egg}/scripts', 'Nests\EggScriptController@index')->name('admin.nests.egg.scripts');
 
     Route::post('/new', 'Nests\NestController@store');
     Route::post('/import', 'Nests\EggShareController@import')->name('admin.nests.egg.import');
diff --git a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php b/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
index 4024f5280..2492dc600 100644
--- a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
@@ -14,7 +14,7 @@ use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\InstallScriptUpdateService;
+use Pterodactyl\Services\Services\Options\InstallScriptService;
 use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
 
 class InstallScriptUpdateServiceTest extends TestCase
@@ -41,7 +41,7 @@ class InstallScriptUpdateServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\InstallScriptUpdateService
+     * @var \Pterodactyl\Services\Services\Options\InstallScriptService
      */
     protected $service;
 
@@ -55,7 +55,7 @@ class InstallScriptUpdateServiceTest extends TestCase
         $this->model = factory(Egg::class)->make();
         $this->repository = m::mock(EggRepositoryInterface::class);
 
-        $this->service = new InstallScriptUpdateService($this->repository);
+        $this->service = new InstallScriptService($this->repository);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
index c0fd0c3db..3e7ddade5 100644
--- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
@@ -16,7 +16,7 @@ use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;
 use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\OptionCreationService;
+use Pterodactyl\Services\Services\Options\EggCreationService;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionCreationServiceTest extends TestCase
@@ -32,7 +32,7 @@ class OptionCreationServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionCreationService
+     * @var \Pterodactyl\Services\Services\Options\EggCreationService
      */
     protected $service;
 
@@ -52,7 +52,7 @@ class OptionCreationServiceTest extends TestCase
         $this->repository = m::mock(EggRepositoryInterface::class);
         $this->uuid = m::mock('overload:' . Uuid::class);
 
-        $this->service = new OptionCreationService($this->config, $this->repository);
+        $this->service = new EggCreationService($this->config, $this->repository);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
index 83d011102..875b3a547 100644
--- a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
@@ -14,8 +14,8 @@ use Tests\TestCase;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
+use Pterodactyl\Services\Services\Options\EggDeletionService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Services\Services\Options\OptionDeletionService;
 use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
 
 class OptionDeletionServiceTest extends TestCase
@@ -31,7 +31,7 @@ class OptionDeletionServiceTest extends TestCase
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionDeletionService
+     * @var \Pterodactyl\Services\Services\Options\EggDeletionService
      */
     protected $service;
 
@@ -45,7 +45,7 @@ class OptionDeletionServiceTest extends TestCase
         $this->repository = m::mock(EggRepositoryInterface::class);
         $this->serverRepository = m::mock(ServerRepositoryInterface::class);
 
-        $this->service = new OptionDeletionService($this->serverRepository, $this->repository);
+        $this->service = new EggDeletionService($this->serverRepository, $this->repository);
     }
 
     /**
diff --git a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
index 04714aac8..0da64ca58 100644
--- a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
+++ b/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
@@ -13,8 +13,8 @@ use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
+use Pterodactyl\Services\Services\Options\EggUpdateService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\OptionUpdateService;
 use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
 
 class OptionUpdateServiceTest extends TestCase
@@ -30,7 +30,7 @@ class OptionUpdateServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\OptionUpdateService
+     * @var \Pterodactyl\Services\Services\Options\EggUpdateService
      */
     protected $service;
 
@@ -44,7 +44,7 @@ class OptionUpdateServiceTest extends TestCase
         $this->model = factory(Egg::class)->make();
         $this->repository = m::mock(EggRepositoryInterface::class);
 
-        $this->service = new OptionUpdateService($this->repository);
+        $this->service = new EggUpdateService($this->repository);
     }
 
     /**

From cc297eea09e58e0b18ff1b7de880a85e1f31f870 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 16:19:07 -0500
Subject: [PATCH 22/34] Misc changes

---
 .../Admin/Nests/EggShareController.php        |   8 +-
 .../Controllers/Admin/OptionController.php    | 224 ------------------
 .../Eggs/Sharing/EggImporterService.php       |   2 +-
 3 files changed, 5 insertions(+), 229 deletions(-)
 delete mode 100644 app/Http/Controllers/Admin/OptionController.php

diff --git a/app/Http/Controllers/Admin/Nests/EggShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php
index 88d7883d7..a9808d6cf 100644
--- a/app/Http/Controllers/Admin/Nests/EggShareController.php
+++ b/app/Http/Controllers/Admin/Nests/EggShareController.php
@@ -14,7 +14,7 @@ use Illuminate\Http\RedirectResponse;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
-use Pterodactyl\Services\Services\Sharing\EggImporterService;
+use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
 use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
 
 class EggShareController extends Controller
@@ -25,15 +25,15 @@ class EggShareController extends Controller
     protected $exporterService;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\EggImporterService
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggImporterService
      */
     protected $importerService;
 
     /**
      * OptionShareController constructor.
      *
-     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService     $exporterService
-     * @param \Pterodactyl\Services\Services\Sharing\EggImporterService $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService
      */
     public function __construct(
         EggExporterService $exporterService,
diff --git a/app/Http/Controllers/Admin/OptionController.php b/app/Http/Controllers/Admin/OptionController.php
deleted file mode 100644
index f99306e4c..000000000
--- a/app/Http/Controllers/Admin/OptionController.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Admin;
-
-use Javascript;
-use Pterodactyl\Models\Egg;
-use Illuminate\Http\Request;
-use Prologue\Alerts\AlertsMessageBag;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Http\Requests\Admin\Service\EggFormRequest;
-use Pterodactyl\Services\Services\Options\EggUpdateService;
-use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
-use Pterodactyl\Services\Services\Options\EggCreationService;
-use Pterodactyl\Services\Services\Options\EggDeletionService;
-use Pterodactyl\Services\Services\Options\InstallScriptService;
-use Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException;
-use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
-
-class OptionController extends Controller
-{
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\InstallScriptService
-     */
-    protected $installScriptUpdateService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\EggCreationService
-     */
-    protected $optionCreationService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\EggDeletionService
-     */
-    protected $optionDeletionService;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Options\EggUpdateService
-     */
-    protected $optionUpdateService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $serviceRepository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
-     */
-    protected $serviceOptionRepository;
-
-    /**
-     * OptionController constructor.
-     *
-     * @param \Prologue\Alerts\AlertsMessageBag                           $alert
-     * @param \Pterodactyl\Services\Services\Options\InstallScriptService $installScriptUpdateService
-     * @param \Pterodactyl\Services\Services\Options\EggCreationService   $optionCreationService
-     * @param \Pterodactyl\Services\Services\Options\EggDeletionService   $optionDeletionService
-     * @param \Pterodactyl\Services\Services\Options\EggUpdateService     $optionUpdateService
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface   $serviceRepository
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface    $serviceOptionRepository
-     */
-    public function __construct(
-        AlertsMessageBag $alert,
-        InstallScriptService $installScriptUpdateService,
-        EggCreationService $optionCreationService,
-        EggDeletionService $optionDeletionService,
-        EggUpdateService $optionUpdateService,
-        NestRepositoryInterface $serviceRepository,
-        EggRepositoryInterface $serviceOptionRepository
-    ) {
-        $this->alert = $alert;
-        $this->installScriptUpdateService = $installScriptUpdateService;
-        $this->optionCreationService = $optionCreationService;
-        $this->optionDeletionService = $optionDeletionService;
-        $this->optionUpdateService = $optionUpdateService;
-        $this->serviceRepository = $serviceRepository;
-        $this->serviceOptionRepository = $serviceOptionRepository;
-    }
-
-    /**
-     * Handles request to view page for adding new option.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function create()
-    {
-        $services = $this->serviceRepository->getWithOptions();
-        Javascript::put(['services' => $services->keyBy('id')]);
-
-        return view('admin.services.options.new', ['services' => $services]);
-    }
-
-    /**
-     * Handle adding a new service option.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\EggFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     */
-    public function store(EggFormRequest $request)
-    {
-        try {
-            $option = $this->optionCreationService->handle($request->normalize());
-            $this->alert->success(trans('admin/services.options.notices.option_created'))->flash();
-        } catch (NoParentConfigurationFoundException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-
-            return redirect()->back()->withInput();
-        }
-
-        return redirect()->route('admin.services.option.view', $option->id);
-    }
-
-    /**
-     * Delete a given option from the database.
-     *
-     * @param \Pterodactyl\Models\Egg $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
-     */
-    public function destroy(Egg $option)
-    {
-        $this->optionDeletionService->handle($option->id);
-        $this->alert->success(trans('admin/services.options.notices.option_deleted'))->flash();
-
-        return redirect()->route('admin.services.view', $option->service_id);
-    }
-
-    /**
-     * Display option overview page.
-     *
-     * @param \Pterodactyl\Models\Egg $option
-     * @return \Illuminate\View\View
-     */
-    public function viewConfiguration(Egg $option)
-    {
-        return view('admin.services.options.view', ['option' => $option]);
-    }
-
-    /**
-     * Display script management page for an option.
-     *
-     * @param int $option
-     * @return \Illuminate\View\View
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function viewScripts($option)
-    {
-        $option = $this->serviceOptionRepository->getWithCopyAttributes($option);
-        $copyOptions = $this->serviceOptionRepository->findWhere([
-            ['copy_script_from', '=', null],
-            ['service_id', '=', $option->service_id],
-            ['id', '!=', $option],
-        ]);
-        $relyScript = $this->serviceOptionRepository->findWhere([['copy_script_from', '=', $option]]);
-
-        return view('admin.services.options.scripts', [
-            'copyFromOptions' => $copyOptions,
-            'relyOnScript' => $relyScript,
-            'option' => $option,
-        ]);
-    }
-
-    /**
-     * Handles POST when editing a configration for a service option.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Pterodactyl\Models\Egg  $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function editConfiguration(Request $request, Egg $option)
-    {
-        try {
-            $this->optionUpdateService->handle($option, $request->all());
-            $this->alert->success(trans('admin/services.options.notices.option_updated'))->flash();
-        } catch (NoParentConfigurationFoundException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-        }
-
-        return redirect()->route('admin.services.option.view', $option->id);
-    }
-
-    /**
-     * Handles POST when updating script for a service option.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request
-     * @param \Pterodactyl\Models\Egg                                   $option
-     * @return \Illuminate\Http\RedirectResponse
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function updateScripts(EditOptionScript $request, Egg $option)
-    {
-        try {
-            $this->installScriptUpdateService->handle($option, $request->normalize());
-            $this->alert->success(trans('admin/services.options.notices.script_updated'))->flash();
-        } catch (InvalidCopyFromException $exception) {
-            $this->alert->danger($exception->getMessage())->flash();
-        }
-
-        return redirect()->route('admin.services.option.scripts', $option->id);
-    }
-}
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index 95776808f..abc74f647 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Services\Services\Sharing;
+namespace Pterodactyl\Services\Eggs\Sharing;
 
 use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;

From 17642bffe7ee41a92683c3ae395629dcfd613881 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 17:21:41 -0500
Subject: [PATCH 23/34] More code updates

---
 .../API/Admin/LocationController.php          |  36 --
 .../Controllers/API/Admin/NodeController.php  | 159 ------
 .../API/Admin/ServerController.php            | 414 ---------------
 .../API/Admin/ServiceController.php           |  59 ---
 .../Controllers/API/Admin/UserController.php  | 170 -------
 ...troller.php => EggRetrievalController.php} |  14 +-
 .../Controllers/API/User/CoreController.php   |  36 --
 .../Controllers/API/User/ServerController.php |  84 ---
 .../Controllers/Admin/ServersController.php   |  34 +-
 app/Http/Controllers/Admin/UserController.php |   1 +
 .../Controllers/Daemon/ServiceController.php  |  85 ----
 app/Models/Egg.php                            |   2 +-
 .../Eloquent/ServerRepository.php             |   3 +-
 .../Eggs/Scripts/InstallScriptService.php     |   2 +-
 .../Servers/ServerCreationService.php         |   4 +-
 .../Servers/StartupModificationService.php    |  14 +-
 .../Servers/VariableValidatorService.php      |   2 +-
 database/factories/ModelFactory.php           |   2 +-
 database/seeds/DatabaseSeeder.php             |   6 -
 .../seeds/MinecraftServiceTableSeeder.php     | 411 ---------------
 database/seeds/RustServiceTableSeeder.php     | 416 ---------------
 database/seeds/SourceServiceTableSeeder.php   | 478 ------------------
 database/seeds/TerrariaServiceTableSeeder.php | 116 -----
 database/seeds/VoiceServiceTableSeeder.php    | 182 -------
 .../themes/pterodactyl/js/admin/new-server.js |  20 +-
 .../pterodactyl/admin/servers/new.blade.php   |  42 +-
 .../admin/servers/view/details.blade.php      |   2 +-
 .../admin/servers/view/index.blade.php        |   4 +-
 .../admin/servers/view/startup.blade.php      |  52 +-
 routes/api-admin.php                          | 178 +++----
 routes/api-remote.php                         |   6 +-
 routes/api.php                                |  38 +-
 32 files changed, 209 insertions(+), 2863 deletions(-)
 delete mode 100644 app/Http/Controllers/API/Admin/LocationController.php
 delete mode 100644 app/Http/Controllers/API/Admin/NodeController.php
 delete mode 100644 app/Http/Controllers/API/Admin/ServerController.php
 delete mode 100644 app/Http/Controllers/API/Admin/ServiceController.php
 delete mode 100644 app/Http/Controllers/API/Admin/UserController.php
 rename app/Http/Controllers/API/Remote/{OptionRetrievalController.php => EggRetrievalController.php} (78%)
 delete mode 100644 app/Http/Controllers/API/User/CoreController.php
 delete mode 100644 app/Http/Controllers/API/User/ServerController.php
 delete mode 100644 app/Http/Controllers/Daemon/ServiceController.php
 delete mode 100644 database/seeds/MinecraftServiceTableSeeder.php
 delete mode 100644 database/seeds/RustServiceTableSeeder.php
 delete mode 100644 database/seeds/SourceServiceTableSeeder.php
 delete mode 100644 database/seeds/TerrariaServiceTableSeeder.php
 delete mode 100644 database/seeds/VoiceServiceTableSeeder.php

diff --git a/app/Http/Controllers/API/Admin/LocationController.php b/app/Http/Controllers/API/Admin/LocationController.php
deleted file mode 100644
index ccda9ca95..000000000
--- a/app/Http/Controllers/API/Admin/LocationController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Location;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\LocationTransformer;
-
-class LocationController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('location-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Location::all())
-            ->transformWith(new LocationTransformer($request))
-            ->withResourceName('location')
-            ->toArray();
-    }
-}
diff --git a/app/Http/Controllers/API/Admin/NodeController.php b/app/Http/Controllers/API/Admin/NodeController.php
deleted file mode 100644
index 8300b77bc..000000000
--- a/app/Http/Controllers/API/Admin/NodeController.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Node;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\NodeRepository;
-use Pterodactyl\Transformers\Admin\NodeTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class NodeController extends Controller
-{
-    /**
-     * Controller to handle returning all nodes on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('node-list', $request->apiKey());
-
-        $nodes = Node::paginate(config('pterodactyl.paginate.api.nodes'));
-        $fractal = Fractal::create()->collection($nodes)
-            ->transformWith(new NodeTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($nodes));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('node-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(Node::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new NodeTransformer($request))
-            ->withResourceName('node')
-            ->toArray();
-    }
-
-    /**
-     * Display information about a single node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function viewConfig(Request $request, $id)
-    {
-        $this->authorize('node-view-config', $request->apiKey());
-
-        $node = Node::findOrFail($id);
-
-        return response()->json(json_decode($node->getConfigurationAsJson()));
-    }
-
-    /**
-     * Create a new node on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('node-create', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $node = $repo->create(array_merge(
-                $request->only([
-                    'public', 'disk_overallocate', 'memory_overallocate',
-                ]),
-                $request->intersect([
-                    'name', 'location_id', 'fqdn',
-                    'scheme', 'memory', 'disk',
-                    'daemonBase', 'daemonSFTP', 'daemonListen',
-                ])
-            ));
-
-            $fractal = Fractal::create()->item($node)->transformWith(new NodeTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('node')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this node. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a node from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('node-delete', $request->apiKey());
-
-        $repo = new NodeRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this node. Please try again.',
-            ], 500);
-        }
-    }
-}
diff --git a/app/Http/Controllers/API/Admin/ServerController.php b/app/Http/Controllers/API/Admin/ServerController.php
deleted file mode 100644
index 46d90cea4..000000000
--- a/app/Http/Controllers/API/Admin/ServerController.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\TransferException;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\ServerRepository;
-use Pterodactyl\Transformers\Admin\ServerTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle returning all servers on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('server-list', $request->apiKey());
-
-        $servers = Server::paginate(config('pterodactyl.paginate.api.servers'));
-        $fractal = Fractal::create()->collection($servers)
-            ->transformWith(new ServerTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($servers));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('server-view', $request->apiKey());
-
-        $server = Server::findOrFail($id);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer($request))
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Create a new server on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('server-create', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->create($request->all());
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a server from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('server-delete', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->delete($id, $request->has('force_delete'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to add this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the details for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function details(Request $request, $id)
-    {
-        $this->authorize('server-edit-details', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateDetails($id, $request->intersect([
-                'owner_id', 'name', 'description', 'reset_token',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Set the new docker container for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\RedirectResponse|array
-     */
-    public function container(Request $request, $id)
-    {
-        $this->authorize('server-edit-container', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->updateContainer($id, $request->intersect('docker_image'));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify this server container. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Toggles the install status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function install(Request $request, $id)
-    {
-        $this->authorize('server-install', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->toggleInstall($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to toggle the install status for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Setup a server to have a container rebuild.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function rebuild(Request $request, $id)
-    {
-        $this->authorize('server-rebuild', $request->apiKey());
-        $server = Server::with('node')->findOrFail($id);
-
-        try {
-            $server->node->guzzleClient([
-                'X-Access-Server' => $server->uuid,
-                'X-Access-Token' => $server->node->daemonSecret,
-            ])->request('POST', '/server/rebuild');
-
-            return response('', 204);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        }
-    }
-
-    /**
-     * Manage the suspension status for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function suspend(Request $request, $id)
-    {
-        $this->authorize('server-suspend', $request->apiKey());
-
-        $repo = new ServerRepository;
-        $action = $request->input('action');
-        if (! in_array($action, ['suspend', 'unsuspend'])) {
-            return response()->json([
-                'error' => 'The action provided was invalid. Action should be one of: suspend, unsuspend.',
-            ], 400);
-        }
-
-        try {
-            $repo->toggleAccess($id, ($action === 'unsuspend'));
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to ' . $action . ' this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the build configuration for a server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function build(Request $request, $id)
-    {
-        $this->authorize('server-edit-build', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $server = $repo->changeBuild($id, $request->intersect([
-                'allocation_id', 'add_allocations', 'remove_allocations',
-                'memory', 'swap', 'io', 'cpu',
-            ]));
-
-            $fractal = Fractal::create()->item($server)->transformWith(new ServerTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('server')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the build settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update the startup command as well as variables.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function startup(Request $request, $id)
-    {
-        $this->authorize('server-edit-startup', $request->apiKey());
-
-        $repo = new ServerRepository;
-        try {
-            $repo->updateStartup($id, $request->all(), true);
-
-            return response('', 204);
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (TransferException $ex) {
-            Log::warning($ex);
-
-            return response()->json([
-                'error' => 'A TransferException was encountered while trying to contact the daemon, please ensure it is online and accessible. This error has been logged.',
-            ], 504);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to modify the startup settings for this server. Please try again.',
-            ], 500);
-        }
-    }
-}
diff --git a/app/Http/Controllers/API/Admin/ServiceController.php b/app/Http/Controllers/API/Admin/ServiceController.php
deleted file mode 100644
index 44e3565ee..000000000
--- a/app/Http/Controllers/API/Admin/ServiceController.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Nest;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\Admin\ServiceTransformer;
-
-class ServiceController extends Controller
-{
-    /**
-     * Controller to handle returning all locations on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('service-list', $request->apiKey());
-
-        return Fractal::create()
-            ->collection(Nest::all())
-            ->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle returning information on a single server.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('service-view', $request->apiKey());
-
-        $service = Nest::findOrFail($id);
-        $fractal = Fractal::create()->item($service);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServiceTransformer($request))
-            ->withResourceName('service')
-            ->toArray();
-    }
-}
diff --git a/app/Http/Controllers/API/Admin/UserController.php b/app/Http/Controllers/API/Admin/UserController.php
deleted file mode 100644
index 8f393cae4..000000000
--- a/app/Http/Controllers/API/Admin/UserController.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\Admin;
-
-use Log;
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\User;
-use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\oldUserRepository;
-use Pterodactyl\Transformers\Admin\UserTransformer;
-use Pterodactyl\Exceptions\DisplayValidationException;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-
-class UserController extends Controller
-{
-    /**
-     * Controller to handle returning all users on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user-list', $request->apiKey());
-
-        $users = User::paginate(config('pterodactyl.paginate.api.users'));
-        $fractal = Fractal::create()->collection($users)
-            ->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->paginateWith(new IlluminatePaginatorAdapter($users));
-
-        if (config('pterodactyl.api.include_on_list') && $request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->toArray();
-    }
-
-    /**
-     * Display information about a single user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return array
-     */
-    public function view(Request $request, $id)
-    {
-        $this->authorize('user-view', $request->apiKey());
-
-        $fractal = Fractal::create()->item(User::findOrFail($id));
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new UserTransformer($request))
-            ->withResourceName('user')
-            ->toArray();
-    }
-
-    /**
-     * Create a new user on the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse|array
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('user-create', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->create($request->only([
-                'custom_id', 'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to create this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Update a user.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $user
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(Request $request, $user)
-    {
-        $this->authorize('user-edit', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $user = $repo->update($user, $request->intersect([
-                'email', 'password', 'name_first',
-                'name_last', 'username', 'root_admin',
-            ]));
-
-            $fractal = Fractal::create()->item($user)->transformWith(new UserTransformer($request));
-            if ($request->input('include')) {
-                $fractal->parseIncludes(explode(',', $request->input('include')));
-            }
-
-            return $fractal->withResourceName('user')->toArray();
-        } catch (DisplayValidationException $ex) {
-            return response()->json([
-                'error' => json_decode($ex->getMessage()),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to update this user. Please try again.',
-            ], 500);
-        }
-    }
-
-    /**
-     * Delete a user from the system.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
-     */
-    public function delete(Request $request, $id)
-    {
-        $this->authorize('user-delete', $request->apiKey());
-
-        $repo = new oldUserRepository;
-        try {
-            $repo->delete($id);
-
-            return response('', 204);
-        } catch (DisplayException $ex) {
-            return response()->json([
-                'error' => $ex->getMessage(),
-            ], 400);
-        } catch (\Exception $ex) {
-            Log::error($ex);
-
-            return response()->json([
-                'error' => 'An unhandled exception occured while attemping to delete this user. Please try again.',
-            ], 500);
-        }
-    }
-}
diff --git a/app/Http/Controllers/API/Remote/OptionRetrievalController.php b/app/Http/Controllers/API/Remote/EggRetrievalController.php
similarity index 78%
rename from app/Http/Controllers/API/Remote/OptionRetrievalController.php
rename to app/Http/Controllers/API/Remote/EggRetrievalController.php
index e1c3fe123..28a60c5b4 100644
--- a/app/Http/Controllers/API/Remote/OptionRetrievalController.php
+++ b/app/Http/Controllers/API/Remote/EggRetrievalController.php
@@ -11,13 +11,13 @@ namespace Pterodactyl\Http\Controllers\API\Remote;
 
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Services\Eggs\EggConfigurationService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\EggConfigurationService;
 
-class OptionRetrievalController extends Controller
+class EggRetrievalController extends Controller
 {
     /**
-     * @var \Pterodactyl\Services\Services\Options\EggConfigurationService
+     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
      */
     protected $configurationFileService;
 
@@ -29,8 +29,8 @@ class OptionRetrievalController extends Controller
     /**
      * OptionUpdateController constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface       $repository
-     * @param \Pterodactyl\Services\Services\Options\EggConfigurationService $configurationFileService
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Eggs\EggConfigurationService       $configurationFileService
      */
     public function __construct(
         EggRepositoryInterface $repository,
@@ -41,7 +41,7 @@ class OptionRetrievalController extends Controller
     }
 
     /**
-     * Return a JSON array of service options and the SHA1 hash of thier configuration file.
+     * Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
      *
      * @return \Illuminate\Http\JsonResponse
      */
@@ -58,7 +58,7 @@ class OptionRetrievalController extends Controller
     }
 
     /**
-     * Return the configuration file for a single service option for the Daemon.
+     * Return the configuration file for a single Egg for the Daemon.
      *
      * @param string $uuid
      * @return \Illuminate\Http\JsonResponse
diff --git a/app/Http/Controllers/API/User/CoreController.php b/app/Http/Controllers/API/User/CoreController.php
deleted file mode 100644
index 7d5ae8d8b..000000000
--- a/app/Http/Controllers/API/User/CoreController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\OverviewTransformer;
-
-class CoreController extends Controller
-{
-    /**
-     * Controller to handle base user request for all of their servers.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('user.server-list', $request->apiKey());
-
-        $servers = $request->user()->access('service', 'node', 'allocation', 'option')->get();
-
-        return Fractal::collection($servers)
-            ->transformWith(new OverviewTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-}
diff --git a/app/Http/Controllers/API/User/ServerController.php b/app/Http/Controllers/API/User/ServerController.php
deleted file mode 100644
index 270c05339..000000000
--- a/app/Http/Controllers/API/User/ServerController.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\API\User;
-
-use Fractal;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Server;
-use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Transformers\User\ServerTransformer;
-use Pterodactyl\Repositories\old_Daemon\PowerRepository;
-use Pterodactyl\Repositories\old_Daemon\CommandRepository;
-
-class ServerController extends Controller
-{
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return array
-     */
-    public function index(Request $request, $uuid)
-    {
-        $this->authorize('user.server-view', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $fractal = Fractal::create()->item($server);
-
-        if ($request->input('include')) {
-            $fractal->parseIncludes(explode(',', $request->input('include')));
-        }
-
-        return $fractal->transformWith(new ServerTransformer)
-            ->withResourceName('server')
-            ->toArray();
-    }
-
-    /**
-     * Controller to handle request for server power toggle.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function power(Request $request, $uuid)
-    {
-        $this->authorize('user.server-power', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('power-' . $request->input('action'), $server);
-
-        $repo = new PowerRepository($server, $request->user());
-        $repo->do($request->input('action'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-
-    /**
-     * Controller to handle base request for individual server information.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $uuid
-     * @return \Illuminate\Http\Response
-     */
-    public function command(Request $request, $uuid)
-    {
-        $this->authorize('user.server-command', $request->apiKey());
-
-        $server = Server::byUuid($uuid);
-        $request->user()->can('send-command', $server);
-
-        $repo = new CommandRepository($server, $request->user());
-        $repo->send($request->input('command'));
-
-        return response('', 204)->header('Content-Type', 'application/json');
-    }
-}
diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php
index 0b46bb380..5867d4788 100644
--- a/app/Http/Controllers/Admin/ServersController.php
+++ b/app/Http/Controllers/Admin/ServersController.php
@@ -91,6 +91,11 @@ class ServersController extends Controller
      */
     protected $locationRepository;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $nestRepository;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
      */
@@ -111,11 +116,6 @@ class ServersController extends Controller
      */
     protected $service;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $serviceRepository;
-
     /**
      * @var \Pterodactyl\Services\Servers\StartupModificationService
      */
@@ -144,7 +144,7 @@ class ServersController extends Controller
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $nodeRepository
      * @param \Pterodactyl\Services\Servers\ReinstallServerService            $reinstallService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface     $repository
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface       $nestRepository
      * @param \Pterodactyl\Services\Servers\StartupModificationService        $startupModificationService
      * @param \Pterodactyl\Services\Servers\SuspensionService                 $suspensionService
      */
@@ -164,7 +164,7 @@ class ServersController extends Controller
         NodeRepositoryInterface $nodeRepository,
         ReinstallServerService $reinstallService,
         ServerRepositoryInterface $repository,
-        NestRepositoryInterface $serviceRepository,
+        NestRepositoryInterface $nestRepository,
         StartupModificationService $startupModificationService,
         SuspensionService $suspensionService
     ) {
@@ -179,11 +179,11 @@ class ServersController extends Controller
         $this->detailsModificationService = $detailsModificationService;
         $this->deletionService = $deletionService;
         $this->locationRepository = $locationRepository;
+        $this->nestRepository = $nestRepository;
         $this->nodeRepository = $nodeRepository;
         $this->reinstallService = $reinstallService;
         $this->repository = $repository;
         $this->service = $service;
-        $this->serviceRepository = $serviceRepository;
         $this->startupModificationService = $startupModificationService;
         $this->suspensionService = $suspensionService;
     }
@@ -218,19 +218,19 @@ class ServersController extends Controller
             return redirect()->route('admin.nodes');
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
         ]);
 
         return view('admin.servers.new', [
             'locations' => $this->locationRepository->all(),
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -331,12 +331,12 @@ class ServersController extends Controller
             abort(404);
         }
 
-        $services = $this->serviceRepository->getWithOptions();
+        $nests = $this->nestRepository->getWithEggs();
 
         Javascript::put([
-            'services' => $services->map(function ($item) {
+            'nests' => $nests->map(function ($item) {
                 return array_merge($item->toArray(), [
-                    'options' => $item->options->keyBy('id')->toArray(),
+                    'eggs' => $item->eggs->keyBy('id')->toArray(),
                 ]);
             })->keyBy('id'),
             'server_variables' => $parameters->data,
@@ -344,7 +344,7 @@ class ServersController extends Controller
 
         return view('admin.servers.view.startup', [
             'server' => $parameters->server,
-            'services' => $services,
+            'nests' => $nests,
         ]);
     }
 
@@ -402,7 +402,7 @@ class ServersController extends Controller
     public function setDetails(Request $request, Server $server)
     {
         $this->detailsModificationService->edit($server, $request->only([
-            'owner_id', 'name', 'description', 'reset_token',
+            'owner_id', 'name', 'description',
         ]));
 
         $this->alert->success(trans('admin/server.alerts.details_updated'))->flash();
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 4824cc9b2..d3ab28c91 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -159,6 +159,7 @@ class UserController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function update(UserFormRequest $request, User $user)
     {
diff --git a/app/Http/Controllers/Daemon/ServiceController.php b/app/Http/Controllers/Daemon/ServiceController.php
deleted file mode 100644
index e37f76dac..000000000
--- a/app/Http/Controllers/Daemon/ServiceController.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Controllers\Daemon;
-
-use Pterodactyl\Models\Egg;
-use Illuminate\Http\Request;
-use Pterodactyl\Models\Nest;
-use Pterodactyl\Http\Controllers\Controller;
-
-class ServiceController extends Controller
-{
-    /**
-     * Returns a listing of all services currently on the system,
-     * as well as the associated files and the file hashes for
-     * caching purposes.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function listServices(Request $request)
-    {
-        $response = [];
-        foreach (Nest::all() as $service) {
-            $response[$service->folder] = [
-                'main.json' => sha1($this->getConfiguration($service->id)->toJson()),
-                'index.js' => sha1($service->index_file),
-            ];
-        }
-
-        return response()->json($response);
-    }
-
-    /**
-     * Returns the contents of the requested file for the given service.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param string                   $folder
-     * @param string                   $file
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\FileResponse
-     */
-    public function pull(Request $request, $folder, $file)
-    {
-        $service = Nest::where('folder', $folder)->firstOrFail();
-
-        if ($file === 'index.js') {
-            return response($service->index_file)->header('Content-Type', 'text/plain');
-        } elseif ($file === 'main.json') {
-            return response()->json($this->getConfiguration($service->id));
-        }
-
-        return abort(404);
-    }
-
-    /**
-     * Returns a `main.json` file based on the configuration
-     * of each service option.
-     *
-     * @param int $id
-     * @return \Illuminate\Support\Collection
-     */
-    protected function getConfiguration($id)
-    {
-        $options = Egg::where('service_id', $id)->get();
-
-        return $options->mapWithKeys(function ($item) use ($options) {
-            return [
-                $item->tag => array_filter([
-                    'symlink' => $options->where('id', $item->config_from)->pluck('tag')->pop(),
-                    'startup' => json_decode($item->config_startup),
-                    'stop' => $item->config_stop,
-                    'configs' => json_decode($item->config_files),
-                    'log' => json_decode($item->config_logs),
-                    'query' => 'none',
-                ]),
-            ];
-        });
-    }
-}
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
index cf82f3a0d..76696ac7b 100644
--- a/app/Models/Egg.php
+++ b/app/Models/Egg.php
@@ -54,7 +54,7 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected $casts = [
-        'service_id' => 'integer',
+        'nest_id' => 'integer',
         'config_from' => 'integer',
         'script_is_privileged' => 'boolean',
         'copy_script_from' => 'integer',
diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php
index 4a0a153ce..10805fdea 100644
--- a/app/Repositories/Eloquent/ServerRepository.php
+++ b/app/Repositories/Eloquent/ServerRepository.php
@@ -140,8 +140,9 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
      */
     public function getDaemonServiceData($id)
     {
-        $instance = $this->getBuilder()->with('egg.nest', 'pack')->find($id, $this->getColumns());
+        Assert::integerish($id, 'First argument passed to getDaemonServiceData must be integer, received %s.');
 
+        $instance = $this->getBuilder()->with('egg.nest', 'pack')->find($id, $this->getColumns());
         if (! $instance) {
             throw new RecordNotFoundException();
         }
diff --git a/app/Services/Eggs/Scripts/InstallScriptService.php b/app/Services/Eggs/Scripts/InstallScriptService.php
index 92493be35..094469944 100644
--- a/app/Services/Eggs/Scripts/InstallScriptService.php
+++ b/app/Services/Eggs/Scripts/InstallScriptService.php
@@ -47,7 +47,7 @@ class InstallScriptService
         }
 
         if (! is_null(array_get($data, 'copy_script_from'))) {
-            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $egg->service_id)) {
+            if (! $this->repository->isCopiableScript(array_get($data, 'copy_script_from'), $egg->nest_id)) {
                 throw new InvalidCopyFromException(trans('exceptions.nest.egg.invalid_copy_id'));
             }
         }
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 1a8f63006..7760a8edc 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -145,8 +145,8 @@ class ServerCreationService
             'cpu' => $data['cpu'],
             'oom_disabled' => isset($data['oom_disabled']),
             'allocation_id' => $data['allocation_id'],
-            'service_id' => $data['service_id'],
-            'option_id' => $data['option_id'],
+            'nest_id' => $data['nest_id'],
+            'egg_id' => $data['egg_id'],
             'pack_id' => (! isset($data['pack_id']) || $data['pack_id'] == 0) ? null : $data['pack_id'],
             'startup' => $data['startup'],
             'daemonSecret' => str_random(NodeCreationService::DAEMON_SECRET_LENGTH),
diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php
index fe29e6ada..25650b1c0 100644
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@@ -110,8 +110,8 @@ class StartupModificationService
         }
 
         if (
-            $server->service_id != array_get($data, 'service_id', $server->service_id) ||
-            $server->option_id != array_get($data, 'option_id', $server->option_id) ||
+            $server->nest_id != array_get($data, 'nest_id', $server->nest_id) ||
+            $server->egg_id != array_get($data, 'egg_id', $server->egg_id) ||
             $server->pack_id != array_get($data, 'pack_id', $server->pack_id)
         ) {
             $hasServiceChanges = true;
@@ -121,7 +121,7 @@ class StartupModificationService
         if (isset($data['environment'])) {
             $validator = $this->validatorService->isAdmin($this->admin)
                 ->setFields($data['environment'])
-                ->validate(array_get($data, 'option_id', $server->option_id));
+                ->validate(array_get($data, 'egg_id', $server->egg_id));
 
             foreach ($validator->getResults() as $result) {
                 $this->serverVariableRepository->withoutFresh()->updateOrCreate([
@@ -143,15 +143,15 @@ class StartupModificationService
             $server = $this->repository->update($server->id, [
                 'installed' => 0,
                 'startup' => array_get($data, 'startup', $server->startup),
-                'service_id' => array_get($data, 'service_id', $server->service_id),
-                'option_id' => array_get($data, 'option_id', $server->service_id),
-                'pack_id' => array_get($data, 'pack_id', $server->pack_id),
+                'nest_id' => array_get($data, 'nest_id', $server->nest_id),
+                'egg_id' => array_get($data, 'egg_id', $server->egg_id),
+                'pack_id' => array_get($data, 'pack_id', $server->pack_id) > 0 ? array_get($data, 'pack_id', $server->pack_id) : null,
                 'skip_scripts' => isset($data['skip_scripts']),
             ]);
 
             if (isset($hasServiceChanges)) {
                 $daemonData['service'] = array_merge(
-                    $this->repository->withColumns(['id', 'option_id', 'pack_id'])->getDaemonServiceData($server),
+                    $this->repository->withColumns(['id', 'egg_id', 'pack_id'])->getDaemonServiceData($server->id),
                     ['skip_scripts' => isset($data['skip_scripts'])]
                 );
             }
diff --git a/app/Services/Servers/VariableValidatorService.php b/app/Services/Servers/VariableValidatorService.php
index e890bfb93..7340d2f7b 100644
--- a/app/Services/Servers/VariableValidatorService.php
+++ b/app/Services/Servers/VariableValidatorService.php
@@ -106,7 +106,7 @@ class VariableValidatorService
      */
     public function validate($option)
     {
-        $variables = $this->optionVariableRepository->findWhere([['option_id', '=', $option]]);
+        $variables = $this->optionVariableRepository->findWhere([['egg_id', '=', $option]]);
         if (count($variables) === 0) {
             $this->results = [];
 
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 5be190075..2570d5ab4 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -102,7 +102,7 @@ $factory->define(Pterodactyl\Models\Egg::class, function (Faker\Generator $faker
     return [
         'id' => $faker->unique()->randomNumber(),
         'uuid' => $faker->unique()->uuid,
-        'service_id' => $faker->unique()->randomNumber(),
+        'nest_id' => $faker->unique()->randomNumber(),
         'name' => $faker->name,
         'description' => implode(' ', $faker->sentences(3)),
         'startup' => 'java -jar test.jar',
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 6afdea04d..3f894f471 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -12,12 +12,6 @@ class DatabaseSeeder extends Seeder
     {
         Model::unguard();
 
-        $this->call(MinecraftServiceTableSeeder::class);
-        $this->call(SourceServiceTableSeeder::class);
-        $this->call(RustServiceTableSeeder::class);
-        $this->call(TerrariaServiceTableSeeder::class);
-        $this->call(VoiceServiceTableSeeder::class);
-
         Model::reguard();
     }
 }
diff --git a/database/seeds/MinecraftServiceTableSeeder.php b/database/seeds/MinecraftServiceTableSeeder.php
deleted file mode 100644
index d10c93213..000000000
--- a/database/seeds/MinecraftServiceTableSeeder.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\Nest;
-use Illuminate\Database\Seeder;
-use Pterodactyl\Models\EggVariable;
-
-class MinecraftServiceTableSeeder extends Seeder
-{
-    /**
-     * The core service ID.
-     *
-     * @var \Pterodactyl\Models\Nest
-     */
-    protected $service;
-
-    /**
-     * Stores all of the option objects.
-     *
-     * @var array
-     */
-    protected $option = [];
-
-    private $default_mc = <<<'EOF'
-'use strict';
-
-/**
- * Pterodactyl - Daemon
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-const rfr = require('rfr');
-const _ = require('lodash');
-
-const Core = rfr('src/services/index.js');
-
-class Service extends Core {
-    onConsole(data) {
-        // Hide the output spam from Bungeecord getting pinged.
-        if (_.endsWith(data, '<-> InitialHandler has connected')) return;
-        return super.onConsole(data);
-    }
-}
-
-module.exports = Service;
-EOF;
-
-    /**
-     * Run the database seeds.
-     */
-    public function run()
-    {
-        $this->addCoreService();
-        $this->addCoreOptions();
-        $this->addVariables();
-    }
-
-    private function addCoreService()
-    {
-        $this->service = Nest::updateOrCreate([
-            'author' => config('pterodactyl.service.core'),
-            'folder' => 'minecraft',
-        ], [
-            'name' => 'Minecraft',
-            'description' => 'Minecraft - the classic game from Mojang. With support for Vanilla MC, Spigot, and many others!',
-            'startup' => 'java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}',
-            'index_file' => $this->default_mc,
-        ]);
-    }
-
-    private function addCoreOptions()
-    {
-        $script = <<<'EOF'
-#!/bin/ash
-# Vanilla MC Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add curl
-
-cd /mnt/server
-
-LATEST_VERSION=`curl -s https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | grep -o "[[:digit:]]\.[0-9]*\.[0-9]" | head -n 1`
-
-if [ -z "$VANILLA_VERSION" ] || [ "$VANILLA_VERSION" == "latest" ]; then
-  DL_VERSION=$LATEST_VERSION
-else
-  DL_VERSION=$VANILLA_VERSION
-fi
-
-curl -o ${SERVER_JARFILE} https://s3.amazonaws.com/Minecraft.Download/versions/${DL_VERSION}/minecraft_server.${DL_VERSION}.jar
-EOF;
-
-        $this->option['vanilla'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'vanilla',
-        ], [
-            'name' => 'Vanilla Minecraft',
-            'description' => 'Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.',
-            'docker_image' => 'quay.io/pterodactyl/core:java',
-            'config_startup' => '{"done": ")! For help, type ", "userInteraction": [ "Go to eula.txt for more info."]}',
-            'config_logs' => '{"custom": false, "location": "logs/latest.log"}',
-            'config_files' => '{"server.properties":{"parser": "properties", "find":{"server-ip": "0.0.0.0", "server-port": "{{server.build.default.port}}"}}}',
-            'config_stop' => 'stop',
-            'config_from' => null,
-            'startup' => null,
-            'script_install' => $script,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/ash
-# Spigot Installation Script
-#
-# Server Files: /mnt/server
-
-## Only download if a path is provided, otherwise continue.
-if [ ! -z "${DL_PATH}" ]; then
-    apk update
-    apk add curl
-
-    cd /mnt/server
-
-    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
-    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}
-fi
-EOF;
-
-        $this->option['spigot'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'spigot',
-        ], [
-            'name' => 'Spigot',
-            'description' => 'Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.',
-            'docker_image' => 'quay.io/pterodactyl/core:java-glibc',
-            'config_startup' => null,
-            'config_files' => '{"spigot.yml":{"parser": "yaml", "find":{"settings.restart-on-crash": false}}}',
-            'config_logs' => null,
-            'config_stop' => null,
-            'config_from' => $this->option['vanilla']->id,
-            'startup' => null,
-            'script_install' => $script,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/ash
-# Sponge Installation Script
-#
-# Server Files: /mnt/server
-
-apk update
-apk add curl
-
-cd /mnt/server
-
-curl -sSL "https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/${SPONGE_VERSION}/spongevanilla-${SPONGE_VERSION}.jar" -o ${SERVER_JARFILE}
-EOF;
-
-        $this->option['sponge'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'sponge',
-        ], [
-            'name' => 'Sponge (SpongeVanilla)',
-            'description' => 'SpongeVanilla is the SpongeAPI implementation for Vanilla Minecraft.',
-            'docker_image' => 'quay.io/pterodactyl/core:java-glibc',
-            'config_startup' => '{"userInteraction": [ "You need to agree to the EULA"]}',
-            'config_files' => null,
-            'config_logs' => null,
-            'config_stop' => null,
-            'config_from' => $this->option['vanilla']->id,
-            'startup' => null,
-            'script_install' => $script,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/ash
-# Bungeecord Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add curl
-
-cd /mnt/server
-
-if [ -z "${BUNGEE_VERSION}" ] || [ "${BUNGEE_VERSION}" == "latest" ]; then
-    BUNGEE_VERSION="lastStableBuild"
-fi
-
-curl -o ${SERVER_JARFILE} https://ci.md-5.net/job/BungeeCord/${BUNGEE_VERSION}/artifact/bootstrap/target/BungeeCord.jar
-EOF;
-
-        $this->option['bungeecord'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'bungeecord',
-        ], [
-            'name' => 'Bungeecord',
-            'description' => 'For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community\'s full potential.',
-            'docker_image' => 'quay.io/pterodactyl/core:java',
-            'config_startup' => '{"done": "Listening on ", "userInteraction": [ "Listening on /0.0.0.0:25577"]}',
-            'config_files' => '{"config.yml":{"parser": "yaml", "find":{"listeners[0].host": "0.0.0.0:{{server.build.default.port}}", "servers.*.address":{"127.0.0.1": "{{config.docker.interface}}", "localhost": "{{config.docker.interface}}"}}}}',
-            'config_logs' => '{"custom": false, "location": "proxy.log.0"}',
-            'config_stop' => 'end',
-            'config_from' => null,
-            'startup' => null,
-            'script_install' => $script,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/ash
-# Forge Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add curl
-
-GET_VERSIONS=$(curl -sl http://files.minecraftforge.net/maven/net/minecraftforge/forge/ | grep -A1 Latest | grep  -o -e '[1]\.[0-9][0-9] - [0-9][0-9]\.[0-9][0-9]\.[0-9]\.[0-9][0-9][0-9][0-9]')
-LATEST_VERSION=$(echo $GET_VERSIONS | sed 's/ //g')
-
-cd /mnt/server
-
-curl -sS http://files.minecraftforge.net/maven/net/minecraftforge/forge/$LATEST_VERSION/forge-$LATEST_VERSION-installer.jar -o installer.jar
-curl -sS http://files.minecraftforge.net/maven/net/minecraftforge/forge/$LATEST_VERSION/forge-$LATEST_VERSION-universal.jar -o server.jar
-
-java -jar installer.jar --installServer
-rm -rf installer.jar
-EOF;
-
-        $this->option['forge'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'forge',
-        ], [
-            'name' => 'Forge Minecraft',
-            'description' => 'Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.',
-            'docker_image' => 'quay.io/pterodactyl/core:java',
-            'config_startup' => '{"done": ")! For help, type ", "userInteraction": [ "Go to eula.txt for more info."]}',
-            'config_logs' => '{"custom": false, "location": "logs/latest.log"}',
-            'config_files' => '{"server.properties":{"parser": "properties", "find":{"server-ip": "0.0.0.0", "server-port": "{{server.build.default.port}}"}}}',
-            'config_stop' => 'stop',
-            'config_from' => null,
-            'startup' => 'java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}',
-            'script_install' => $script,
-            'script_container' => 'frolvlad/alpine-oraclejdk8:cleaned',
-        ]);
-    }
-
-    private function addVariables()
-    {
-        $this->addVanillaVariables();
-        $this->addSpigotVariables();
-        $this->addSpongeVariables();
-        $this->addBungeecordVariables();
-        $this->addForgeVariables();
-    }
-
-    private function addVanillaVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['vanilla']->id,
-            'env_variable' => 'SERVER_JARFILE',
-        ], [
-            'name' => 'Server Jar File',
-            'description' => 'The name of the server jarfile to run the server with.',
-            'default_value' => 'server.jar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['vanilla']->id,
-            'env_variable' => 'VANILLA_VERSION',
-        ], [
-            'name' => 'Server Version',
-            'description' => 'The version of Minecraft Vanilla to install. Use "latest" to install the latest version.',
-            'default_value' => 'latest',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|between:3,7',
-        ]);
-    }
-
-    private function addSpigotVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['spigot']->id,
-            'env_variable' => 'SERVER_JARFILE',
-        ], [
-            'name' => 'Server Jar File',
-            'description' => 'The name of the server jarfile to run the server with.',
-            'default_value' => 'server.jar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['spigot']->id,
-            'env_variable' => 'DL_VERSION',
-        ], [
-            'name' => 'Spigot Version',
-            'description' => 'The version of Spigot to download (using the --rev tag). Use "latest" for latest.',
-            'default_value' => 'latest',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|between:3,7',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['spigot']->id,
-            'env_variable' => 'DL_PATH',
-        ], [
-            'name' => 'Download Path',
-            'description' => 'A URL to use to download Spigot rather than building it on the server. This is not user viewable. Use <code>{{DL_VERSION}}</code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).',
-            'default_value' => '',
-            'user_viewable' => 0,
-            'user_editable' => 0,
-            'rules' => 'string',
-        ]);
-    }
-
-    private function addSpongeVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['sponge']->id,
-            'env_variable' => 'SPONGE_VERSION',
-        ], [
-            'name' => 'Sponge Version',
-            'description' => 'The version of SpongeVanilla to download and use.',
-            'default_value' => '1.10.2-5.2.0-BETA-381',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|regex:/^([a-zA-Z0-9.\-_]+)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['sponge']->id,
-            'env_variable' => 'SERVER_JARFILE',
-        ], [
-            'name' => 'Server Jar File',
-            'description' => 'The name of the Jarfile to use when running SpongeVanilla.',
-            'default_value' => 'server.jar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
-        ]);
-    }
-
-    private function addBungeecordVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['bungeecord']->id,
-            'env_variable' => 'BUNGEE_VERSION',
-        ], [
-            'name' => 'Bungeecord Version',
-            'description' => 'The version of Bungeecord to download and use.',
-            'default_value' => 'latest',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|alpha_num|between:1,6',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['bungeecord']->id,
-            'env_variable' => 'SERVER_JARFILE',
-        ], [
-            'name' => 'Bungeecord Jar File',
-            'description' => 'The name of the Jarfile to use when running Bungeecord.',
-            'default_value' => 'bungeecord.jar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
-        ]);
-    }
-
-    private function addForgeVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['forge']->id,
-            'env_variable' => 'SERVER_JARFILE',
-        ], [
-            'name' => 'Server Jar File',
-            'description' => 'The name of the Jarfile to use when running Forge Mod.',
-            'default_value' => 'server.jar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([\w\d._-]+)(\.jar)$/',
-        ]);
-    }
-}
diff --git a/database/seeds/RustServiceTableSeeder.php b/database/seeds/RustServiceTableSeeder.php
deleted file mode 100644
index 39e54032e..000000000
--- a/database/seeds/RustServiceTableSeeder.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\Nest;
-use Illuminate\Database\Seeder;
-use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-
-class RustServiceTableSeeder extends Seeder
-{
-    use CreatesServiceIndex;
-
-    /**
-     * The core service ID.
-     *
-     * @var Models\Service
-     */
-    protected $service;
-
-    /**
-     * Stores all of the option objects.
-     *
-     * @var array
-     */
-    protected $option = [];
-
-    /**
-     * Run the database seeds.
-     */
-    public function run()
-    {
-        $this->addCoreService();
-        $this->addCoreOptions();
-        $this->addVariables();
-    }
-
-    private function addCoreService()
-    {
-        $this->service = Nest::updateOrCreate([
-            'author' => config('pterodactyl.service.core'),
-            'folder' => 'rust',
-        ], [
-            'name' => 'Rust',
-            'description' => 'The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.',
-            'startup' => './RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity "rust" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \"{{HOSTNAME}}\" +server.level \"{{LEVEL}}\" +server.description \"{{DESCRIPTION}}\" +server.url \"{{URL}}\" +server.headerimage \"{{SERVER_IMG}}\" +server.worldsize \"{{WORLD_SIZE}}\" +server.seed \"{{SEED}}\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \"{{RCON_PASS}}\" {{ADDITIONAL_ARGS}}',
-            'index_file' => $this->getIndexScript(),
-        ]);
-    }
-
-    private function addCoreOptions()
-    {
-        $script = <<<'EOF'
-apt update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steam
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steam
-cd /mnt/server/steam
-
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update 258550 +quit
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['rustvanilla'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'rustvanilla',
-        ], [
-            'name' => 'Vanilla',
-            'description' => 'Vanilla Rust server.',
-            'docker_image' => 'quay.io/pterodactyl/core:rust',
-            'config_startup' => '{"done": "Server startup complete", "userInteraction": []}',
-            'config_files' => '{}',
-            'config_logs' => '{"custom": false, "location": "latest.log"}',
-            'config_stop' => 'quit',
-            'config_from' => null,
-            'startup' => null,
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-
-        $script = <<<'EOF'
-apt update
-apt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steam
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steam
-cd /mnt/server/steam
-
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update 258550 +quit
-
-curl "https://dl.bintray.com/oxidemod/builds/Oxide-Rust.zip" > /mnt/server/oxide.zip
-unzip -o /mnt/server/oxide.zip -d /mnt/server
-rm /mnt/server/oxide.zip
-echo "This file is used to determine whether the server is an OxideMod server or not.
-Do not delete this file or you may loose OxideMod auto updating from the server." > /mnt/server/OXIDE_FLAG
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v /mnt/server/steam/linux32/steamclient.so /mnt/server/.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['rustoxide'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'rustoxide',
-        ], [
-            'name' => 'OxideMod',
-            'description' => 'OxideMod Rust server.',
-            'docker_image' => 'quay.io/pterodactyl/core:rust',
-            'config_startup' => '{"done": "Server startup complete", "userInteraction": []}',
-            'config_files' => '{}',
-            'config_logs' => '{"custom": false, "location": "latest.log"}',
-            'config_stop' => 'quit',
-            'config_from' => null,
-            'startup' => null,
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-    }
-
-    private function addVariables()
-    {
-        $this->addVanillaVariables();
-        $this->addOxideVariables();
-    }
-
-    private function addVanillaVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'HOSTNAME',
-        ], [
-            'name' => 'Server Name',
-            'description' => 'The name of your server in the public server list.',
-            'default_value' => 'A Rust Server',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'LEVEL',
-        ], [
-            'name' => 'Level',
-            'description' => 'The world file for Rust to use.',
-            'default_value' => 'Procedural Map',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'DESCRIPTION',
-        ], [
-            'name' => 'Description',
-            'description' => 'The description under your server title. Commonly used for rules & info.',
-            'default_value' => 'Powered by Pterodactyl',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'URL',
-        ], [
-            'name' => 'URL',
-            'description' => 'The URL for your server. This is what comes up when clicking the "Visit Website" button.',
-            'default_value' => 'http://pterodactyl.io',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'url',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'WORLD_SIZE',
-        ], [
-            'name' => 'World Size',
-            'description' => 'The world size for a procedural map.',
-            'default_value' => '3000',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'SEED',
-        ], [
-            'name' => 'World Seed',
-            'description' => 'The seed for a procedural map.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'present',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'MAX_PLAYERS',
-        ], [
-            'name' => 'Max Players',
-            'description' => 'The maximum amount of players allowed in the server at once.',
-            'default_value' => '40',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'SERVER_IMG',
-        ], [
-            'name' => 'Server Header Image',
-            'description' => 'The header image for the top of your server listing.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'url',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'RCON_PORT',
-        ], [
-            'name' => 'RCON Port',
-            'description' => 'Port for RCON connections.',
-            'default_value' => '8401',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'RCON_PASS',
-        ], [
-            'name' => 'RCON Password',
-            'description' => 'Remote console access password.',
-            'default_value' => 'CHANGEME',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustvanilla']->id,
-            'env_variable' => 'ADDITIONAL_ARGS',
-        ], [
-            'name' => 'Additional Arguments',
-            'description' => 'Add additional startup parameters to the server.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'present',
-        ]);
-    }
-
-    private function addOxideVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'HOSTNAME',
-        ], [
-            'name' => 'Server Name',
-            'description' => 'The name of your server in the public server list.',
-            'default_value' => 'A Rust Server',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'LEVEL',
-        ], [
-            'name' => 'Level',
-            'description' => 'The world file for Rust to use.',
-            'default_value' => 'Procedural Map',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'DESCRIPTION',
-        ], [
-            'name' => 'Description',
-            'description' => 'The description under your server title. Commonly used for rules & info.',
-            'default_value' => 'Powered by Pterodactyl',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'URL',
-        ], [
-            'name' => 'URL',
-            'description' => 'The URL for your server. This is what comes up when clicking the "Visit Website" button.',
-            'default_value' => 'http://pterodactyl.io',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'url',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'WORLD_SIZE',
-        ], [
-            'name' => 'World Size',
-            'description' => 'The world size for a procedural map.',
-            'default_value' => '3000',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'SEED',
-        ], [
-            'name' => 'World Seed',
-            'description' => 'The seed for a procedural map.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'present',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'MAX_PLAYERS',
-        ], [
-            'name' => 'Max Players',
-            'description' => 'The maximum amount of players allowed in the server at once.',
-            'default_value' => '40',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'SERVER_IMG',
-        ], [
-            'name' => 'Server Header Image',
-            'description' => 'The header image for the top of your server listing.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'url',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'RCON_PORT',
-        ], [
-            'name' => 'RCON Port',
-            'description' => 'Port for RCON connections.',
-            'default_value' => '8401',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|integer',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'RCON_PASS',
-        ], [
-            'name' => 'RCON Password',
-            'description' => 'Remote console access password.',
-            'default_value' => 'CHANGEME',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['rustoxide']->id,
-            'env_variable' => 'ADDITIONAL_ARGS',
-        ], [
-            'name' => 'Additional Arguments',
-            'description' => 'Add additional startup parameters to the server.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'present',
-        ]);
-    }
-}
diff --git a/database/seeds/SourceServiceTableSeeder.php b/database/seeds/SourceServiceTableSeeder.php
deleted file mode 100644
index c8394444b..000000000
--- a/database/seeds/SourceServiceTableSeeder.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\Nest;
-use Illuminate\Database\Seeder;
-use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-
-class SourceServiceTableSeeder extends Seeder
-{
-    use CreatesServiceIndex;
-
-    /**
-     * The core service ID.
-     *
-     * @var Models\Service
-     */
-    protected $service;
-
-    /**
-     * Stores all of the option objects.
-     *
-     * @var array
-     */
-    protected $option = [];
-
-    /**
-     * Run the database seeds.
-     */
-    public function run()
-    {
-        $this->addCoreService();
-        $this->addCoreOptions();
-        $this->addVariables();
-    }
-
-    private function addCoreService()
-    {
-        $this->service = Nest::updateOrCreate([
-            'author' => config('pterodactyl.service.core'),
-            'folder' => 'srcds',
-        ], [
-            'name' => 'Source Engine',
-            'description' => 'Includes support for most Source Dedicated Server games.',
-            'startup' => './srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +ip 0.0.0.0 -strictportbind -norestart',
-            'index_file' => $this->getIndexScript(),
-        ]);
-    }
-
-    private function addCoreOptions()
-    {
-        $script = <<<'EOF'
-#!/bin/bash
-# SRCDS Base Installation Script
-#
-# Server Files: /mnt/server
-apt -y update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steamcmd
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd
-cd /mnt/server/steamcmd
-
-# SteamCMD fails otherwise for some reason, even running as root.
-# This is changed at the end of the install process anyways.
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update ${SRCDS_APPID} +quit
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['source'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'source',
-        ], [
-            'name' => 'Custom Source Engine Game',
-            'description' => 'This option allows modifying the startup arguments and other details to run a custo SRCDS based game on the panel.',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => '{"done": "gameserver Steam ID", "userInteraction": []}',
-            'config_files' => '{}',
-            'config_logs' => '{"custom": true, "location": "logs/latest.log"}',
-            'config_stop' => 'quit',
-            'config_from' => null,
-            'startup' => null,
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-
-        $this->option['insurgency'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'insurgency',
-        ], [
-            'name' => 'Insurgency',
-            'description' => 'Take to the streets for intense close quarters combat, where a team\'s survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience.',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => null,
-            'config_files' => null,
-            'config_logs' => null,
-            'config_stop' => null,
-            'config_from' => $this->option['source']->id,
-            'startup' => './srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart',
-            'copy_script_from' => $this->option['source']->id,
-        ]);
-
-        $this->option['tf2'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'tf2',
-        ], [
-            'name' => 'Team Fortress 2',
-            'description' => 'Team Fortress 2 is a team-based first-person shooter multiplayer video game developed and published by Valve Corporation. It is the sequel to the 1996 mod Team Fortress for Quake and its 1999 remake.',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => null,
-            'config_files' => null,
-            'config_logs' => null,
-            'config_stop' => null,
-            'config_from' => $this->option['source']->id,
-            'startup' => './srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart',
-            'copy_script_from' => $this->option['source']->id,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/bash
-# ARK: Installation Script
-#
-# Server Files: /mnt/server
-apt -y update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steamcmd
-mkdir -p /mnt/server/Engine/Binaries/ThirdParty/SteamCMD/Linux
-
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd
-tar -xzvf steamcmd.tar.gz -C /mnt/server/Engine/Binaries/ThirdParty/SteamCMD/Linux
-
-cd /mnt/server/steamcmd
-
-# SteamCMD fails otherwise for some reason, even running as root.
-# This is changed at the end of the install process anyways.
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update 376030 +quit
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['ark'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'ark',
-        ], [
-            'name' => 'Ark: Survival Evolved',
-            'description' => 'As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! — Gamepedia: ARK',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => '{"done": "Setting breakpad minidump AppID"}',
-            'config_files' => null,
-            'config_logs' => null,
-            'config_stop' => '^C',
-            'config_from' => $this->option['source']->id,
-            'startup' => './ShooterGame/Binaries/Linux/ShooterGameServer TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}',
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/bash
-# CSGO Installation Script
-#
-# Server Files: /mnt/server
-apt -y update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steamcmd
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd
-cd /mnt/server/steamcmd
-
-# SteamCMD fails otherwise for some reason, even running as root.
-# This is changed at the end of the install process anyways.
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update 740 +quit
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['csgo'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'csgo',
-        ], [
-            'name' => 'Counter-Strike: Global Offensive',
-            'description' => 'Counter-Strike: Global Offensive is a multiplayer first-person shooter video game developed by Hidden Path Entertainment and Valve Corporation.',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => '{"done": "VAC secure mode is activated.", "userInteraction": []}',
-            'config_files' => null,
-            'config_logs' => '{"custom": true, "location": "logs/latest.log"}',
-            'config_stop' => 'quit',
-            'config_from' => $this->option['source']->id,
-            'startup' => './srcds_run -game csgo -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}',
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/bash
-# Garry's Mod Installation Script
-#
-# Server Files: /mnt/server
-apt -y update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
-
-cd /tmp
-curl -sSL -o steamcmd.tar.gz http://media.steampowered.com/installer/steamcmd_linux.tar.gz
-
-mkdir -p /mnt/server/steamcmd
-tar -xzvf steamcmd.tar.gz -C /mnt/server/steamcmd
-cd /mnt/server/steamcmd
-
-# SteamCMD fails otherwise for some reason, even running as root.
-# This is changed at the end of the install process anyways.
-chown -R root:root /mnt
-
-export HOME=/mnt/server
-./steamcmd.sh +login anonymous +force_install_dir /mnt/server +app_update 4020 +quit
-
-mkdir -p /mnt/server/.steam/sdk32
-cp -v linux32/steamclient.so ../.steam/sdk32/steamclient.so
-EOF;
-
-        $this->option['gmod'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'gmod',
-        ], [
-            'name' => 'Garrys Mod',
-            'description' => 'Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.',
-            'docker_image' => 'quay.io/pterodactyl/core:source',
-            'config_startup' => '{"done": "VAC secure mode is activated.", "userInteraction": []}',
-            'config_files' => null,
-            'config_logs' => '{"custom": true, "location": "logs/latest.log"}',
-            'config_stop' => 'quit',
-            'config_from' => $this->option['source']->id,
-            'startup' => './srcds_run -game garrysmod -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}',
-            'script_install' => $script,
-            'script_entry' => 'bash',
-            'script_container' => 'ubuntu:16.04',
-        ]);
-    }
-
-    private function addVariables()
-    {
-        $this->addInsurgencyVariables();
-        $this->addTF2Variables();
-        $this->addArkVariables();
-        $this->addCSGOVariables();
-        $this->addGMODVariables();
-        $this->addCustomVariables();
-    }
-
-    private function addInsurgencyVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['insurgency']->id,
-            'env_variable' => 'SRCDS_APPID',
-        ], [
-            'name' => 'Game ID',
-            'description' => 'The ID corresponding to the game to download and run using SRCDS.',
-            'default_value' => '17705',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|regex:/^(17705)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['insurgency']->id,
-            'env_variable' => 'SRCDS_GAME',
-        ], [
-            'name' => 'Game Name',
-            'description' => 'The name corresponding to the game to download and run using SRCDS.',
-            'default_value' => 'insurgency',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|regex:/^(insurgency)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['insurgency']->id,
-            'env_variable' => 'SRCDS_MAP',
-        ], [
-            'name' => 'Default Map',
-            'description' => 'The default map to use when starting the server.',
-            'default_value' => 'sinjar',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^(\w{1,20})$/',
-        ]);
-    }
-
-    private function addTF2Variables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['tf2']->id,
-            'env_variable' => 'SRCDS_APPID',
-        ], [
-            'name' => 'Game ID',
-            'description' => 'The ID corresponding to the game to download and run using SRCDS.',
-            'default_value' => '232250',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|regex:/^(232250)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['tf2']->id,
-            'env_variable' => 'SRCDS_GAME',
-        ], [
-            'name' => 'Game Name',
-            'description' => 'The name corresponding to the game to download and run using SRCDS.',
-            'default_value' => 'tf',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|regex:/^(tf)$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['tf2']->id,
-            'env_variable' => 'SRCDS_MAP',
-        ], [
-            'name' => 'Default Map',
-            'description' => 'The default map to use when starting the server.',
-            'default_value' => 'cp_dustbowl',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^(\w{1,20})$/',
-        ]);
-    }
-
-    private function addArkVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['ark']->id,
-            'env_variable' => 'ARK_PASSWORD',
-        ], [
-            'name' => 'Server Password',
-            'description' => 'If specified, players must provide this password to join the server.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'alpha_dash|between:1,100',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['ark']->id,
-            'env_variable' => 'ARK_ADMIN_PASSWORD',
-        ], [
-            'name' => 'Admin Password',
-            'description' => 'If specified, players must provide this password (via the in-game console) to gain access to administrator commands on the server.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'alpha_dash|between:1,100',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['ark']->id,
-            'env_variable' => 'SERVER_MAX_PLAYERS',
-        ], [
-            'name' => 'Maximum Players',
-            'description' => 'Specifies the maximum number of players that can play on the server simultaneously.',
-            'default_value' => 20,
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|numeric|digits_between:1,4',
-        ]);
-    }
-
-    private function addCSGOVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['csgo']->id,
-            'env_variable' => 'SRCDS_MAP',
-        ], [
-            'name' => 'Map',
-            'description' => 'The default map for the server.',
-            'default_value' => 'de_dust2',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|alpha_dash',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['csgo']->id,
-            'env_variable' => 'STEAM_ACC',
-        ], [
-            'name' => 'Steam Account Token',
-            'description' => 'The Steam Account Token required for the server to be displayed publicly.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|alpha_num|size:32',
-        ]);
-    }
-
-    private function addGMODVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['gmod']->id,
-            'env_variable' => 'SRCDS_MAP',
-        ], [
-            'name' => 'Map',
-            'description' => 'The default map for the server.',
-            'default_value' => 'gm_flatgrass',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|alpha_dash',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['gmod']->id,
-            'env_variable' => 'STEAM_ACC',
-        ], [
-            'name' => 'Steam Account Token',
-            'description' => 'The Steam Account Token required for the server to be displayed publicly.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|string|alpha_num|size:32',
-        ]);
-    }
-
-    private function addCustomVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['source']->id,
-            'env_variable' => 'SRCDS_APPID',
-        ], [
-            'name' => 'Game ID',
-            'description' => 'The ID corresponding to the game to download and run using SRCDS.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|numeric|digits_between:1,6',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['source']->id,
-            'env_variable' => 'SRCDS_GAME',
-        ], [
-            'name' => 'Game Name',
-            'description' => 'The name corresponding to the game to download and run using SRCDS.',
-            'default_value' => '',
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|alpha_dash|between:1,100',
-        ]);
-    }
-}
diff --git a/database/seeds/TerrariaServiceTableSeeder.php b/database/seeds/TerrariaServiceTableSeeder.php
deleted file mode 100644
index 1e0303e55..000000000
--- a/database/seeds/TerrariaServiceTableSeeder.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\Nest;
-use Illuminate\Database\Seeder;
-use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-
-class TerrariaServiceTableSeeder extends Seeder
-{
-    use CreatesServiceIndex;
-
-    /**
-     * The core service ID.
-     *
-     * @var Models\Service
-     */
-    protected $service;
-
-    /**
-     * Stores all of the option objects.
-     *
-     * @var array
-     */
-    protected $option = [];
-
-    /**
-     * Run the database seeds.
-     */
-    public function run()
-    {
-        $this->addCoreService();
-        $this->addCoreOptions();
-        $this->addVariables();
-    }
-
-    private function addCoreService()
-    {
-        $this->service = Nest::updateOrCreate([
-            'author' => config('pterodactyl.service.core'),
-            'folder' => 'terraria',
-        ], [
-            'name' => 'Terraria',
-            'description' => 'Terraria is a land of adventure! A land of mystery! A land that\'s yours to shape, defend, and enjoy. Your options in Terraria are limitless. Are you an action gamer with an itchy trigger finger? A master builder? A collector? An explorer? There\'s something for everyone.',
-            'startup' => 'mono TerrariaServer.exe -port {{SERVER_PORT}} -autocreate 2 -worldname World',
-            'index_file' => $this->getIndexScript(),
-        ]);
-    }
-
-    private function addCoreOptions()
-    {
-        $script = <<<'EOF'
-#!/bin/ash
-# TShock Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add curl unzip
-
-cd /tmp
-
-curl -sSLO https://github.com/NyxStudios/TShock/releases/download/v${T_VERSION}/tshock_${T_VERSION}.zip
-
-unzip -o tshock_${T_VERSION}.zip -d /mnt/server
-EOF;
-
-        $this->option['tshock'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'tshock',
-        ], [
-            'name' => 'Terraria Server (TShock)',
-            'description' => 'TShock is a server modification for Terraria, written in C#, and based upon the Terraria Server API. It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.',
-            'docker_image' => 'quay.io/pterodactyl/core:mono',
-            'config_startup' => '{"userInteraction": [ "You need to agree to the EULA"]}',
-            'config_startup' => '{"done": "Type \'help\' for a list of commands", "userInteraction": []}',
-            'config_files' => '{"tshock/config.json":{"parser": "json", "find":{"ServerPort": "{{server.build.default.port}}", "MaxSlots": "{{server.build.env.MAX_SLOTS}}"}}}',
-            'config_logs' => '{"custom": false, "location": "ServerLog.txt"}',
-            'config_stop' => 'exit',
-            'startup' => null,
-            'script_install' => $script,
-        ]);
-    }
-
-    private function addVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['tshock']->id,
-            'env_variable' => 'T_VERSION',
-        ], [
-            'name' => 'TShock Version',
-            'description' => 'Which version of TShock to install and use.',
-            'default_value' => '4.3.22',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([0-9_\.-]{5,10})$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['tshock']->id,
-            'env_variable' => 'MAX_SLOTS',
-        ], [
-            'name' => 'Maximum Slots',
-            'description' => 'Total number of slots to allow on the server.',
-            'default_value' => 20,
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|numeric|digits_between:1,3',
-        ]);
-    }
-}
diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php
deleted file mode 100644
index f7c786c73..000000000
--- a/database/seeds/VoiceServiceTableSeeder.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-use Pterodactyl\Models\Egg;
-use Pterodactyl\Models\Nest;
-use Illuminate\Database\Seeder;
-use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-
-class VoiceServiceTableSeeder extends Seeder
-{
-    use CreatesServiceIndex;
-
-    /**
-     * The core service ID.
-     *
-     * @var Nest
-     */
-    protected $service;
-
-    /**
-     * Stores all of the option objects.
-     *
-     * @var array
-     */
-    protected $option = [];
-
-    /**
-     * Run the database seeds.
-     */
-    public function run()
-    {
-        $this->addCoreService();
-        $this->addCoreOptions();
-        $this->addVariables();
-    }
-
-    private function addCoreService()
-    {
-        $this->service = Nest::updateOrCreate([
-            'author' => config('pterodactyl.service.core'),
-            'folder' => 'voice',
-        ], [
-            'name' => 'Voice Servers',
-            'description' => 'Voice servers such as Mumble and Teamspeak 3.',
-            'startup' => '',
-            'index_file' => $this->getIndexScript(),
-        ]);
-    }
-
-    private function addCoreOptions()
-    {
-        $script = <<<'EOF'
-#!/bin/ash
-# Mumble Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add tar curl
-
-cd /tmp
-
-curl -sSLO https://github.com/mumble-voip/mumble/releases/download/${MUMBLE_VERSION}/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
-
-tar -xjvf murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
-cp -r murmur-static_x86-${MUMBLE_VERSION}/* /mnt/server
-EOF;
-
-        $this->option['mumble'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'mumble',
-        ], [
-            'name' => 'Mumble Server',
-            'description' => 'Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.',
-            'docker_image' => 'quay.io/pterodactyl/core:glibc',
-            'config_startup' => '{"done": "Server listening on", "userInteraction": [ "Generating new server certificate"]}',
-            'config_files' => '{"murmur.ini":{"parser": "ini", "find":{"logfile": "murmur.log", "port": "{{server.build.default.port}}", "host": "0.0.0.0", "users": "{{server.build.env.MAX_USERS}}"}}}',
-            'config_logs' => '{"custom": true, "location": "logs/murmur.log"}',
-            'config_stop' => '^C',
-            'config_from' => null,
-            'startup' => './murmur.x86 -fg',
-            'script_install' => $script,
-        ]);
-
-        $script = <<<'EOF'
-#!/bin/ash
-# TS3 Installation Script
-#
-# Server Files: /mnt/server
-apk update
-apk add tar curl
-
-cd /tmp
-
-curl -sSLO http://dl.4players.de/ts/releases/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2
-
-tar -xjvf teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2
-cp -r teamspeak3-server_linux_amd64/* /mnt/server
-
-echo "machine_id=
-default_voice_port=${SERVER_PORT}
-voice_ip=0.0.0.0
-licensepath=
-filetransfer_port=30033
-filetransfer_ip=
-query_port=${SERVER_PORT}
-query_ip=0.0.0.0
-query_ip_whitelist=query_ip_whitelist.txt
-query_ip_blacklist=query_ip_blacklist.txt
-dbplugin=ts3db_sqlite3
-dbpluginparameter=
-dbsqlpath=sql/
-dbsqlcreatepath=create_sqlite/
-dbconnections=10
-logpath=logs
-logquerycommands=0
-dbclientkeepdays=30
-logappend=0
-query_skipbruteforcecheck=0" > /mnt/server/ts3server.ini
-EOF;
-
-        $this->option['ts3'] = Egg::updateOrCreate([
-            'service_id' => $this->service->id,
-            'tag' => 'ts3',
-        ], [
-            'name' => 'Teamspeak3 Server',
-            'description' => 'VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.',
-            'docker_image' => 'quay.io/pterodactyl/core:glibc',
-            'config_startup' => '{"done": "listening on 0.0.0.0:", "userInteraction": []}',
-            'config_files' => '{"ts3server.ini":{"parser": "ini", "find":{"default_voice_port": "{{server.build.default.port}}", "voice_ip": "0.0.0.0", "query_port": "{{server.build.default.port}}", "query_ip": "0.0.0.0"}}}',
-            'config_logs' => '{"custom": true, "location": "logs/ts3.log"}',
-            'config_stop' => '^C',
-            'config_from' => null,
-            'startup' => './ts3server_minimal_runscript.sh default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}}',
-            'script_install' => $script,
-        ]);
-    }
-
-    private function addVariables()
-    {
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['mumble']->id,
-            'env_variable' => 'MAX_USERS',
-        ], [
-            'name' => 'Maximum Users',
-            'description' => 'Maximum concurrent users on the mumble server.',
-            'default_value' => 100,
-            'user_viewable' => 1,
-            'user_editable' => 0,
-            'rules' => 'required|numeric|digits_between:1,5',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['mumble']->id,
-            'env_variable' => 'MUMBLE_VERSION',
-        ], [
-            'name' => 'Server Version',
-            'description' => 'Version of Mumble Server to download and use.',
-            'default_value' => '1.2.19',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([0-9_\.-]{5,8})$/',
-        ]);
-
-        EggVariable::updateOrCreate([
-            'option_id' => $this->option['ts3']->id,
-            'env_variable' => 'TS_VERSION',
-        ], [
-            'name' => 'Server Version',
-            'description' => 'The version of Teamspeak 3 to use when running the server.',
-            'default_value' => '3.0.13.7',
-            'user_viewable' => 1,
-            'user_editable' => 1,
-            'rules' => 'required|regex:/^([0-9_\.-]{5,10})$/',
-        ]);
-    }
-}
diff --git a/public/themes/pterodactyl/js/admin/new-server.js b/public/themes/pterodactyl/js/admin/new-server.js
index 2501a4cc9..e15a14b73 100644
--- a/public/themes/pterodactyl/js/admin/new-server.js
+++ b/public/themes/pterodactyl/js/admin/new-server.js
@@ -18,11 +18,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 $(document).ready(function() {
-    $('#pServiceId').select2({
-        placeholder: 'Select a Service',
+    $('#pNestId').select2({
+        placeholder: 'Select a Nest',
     }).change();
-    $('#pOptionId').select2({
-        placeholder: 'Select a Service Option',
+    $('#pEggId').select2({
+        placeholder: 'Select a Nest Egg',
     });
     $('#pPackId').select2({
         placeholder: 'Select a Service Pack',
@@ -116,9 +116,9 @@ $('#pNodeId').on('change', function (event) {
     });
 });
 
-$('#pServiceId').on('change', function (event) {
-    $('#pOptionId').html('').select2({
-        data: $.map(_.get(Pterodactyl.services, $(this).val() + '.options', []), function (item) {
+$('#pNestId').on('change', function (event) {
+    $('#pEggId').html('').select2({
+        data: $.map(_.get(Pterodactyl.nests, $(this).val() + '.eggs', []), function (item) {
             return {
                 id: item.id,
                 text: item.name,
@@ -127,9 +127,9 @@ $('#pServiceId').on('change', function (event) {
     }).change();
 });
 
-$('#pOptionId').on('change', function (event) {
-    var parentChain = _.get(Pterodactyl.services, $('#pServiceId').val(), null);
-    var objectChain = _.get(parentChain, 'options.' + $(this).val(), null);
+$('#pEggId').on('change', function (event) {
+    var parentChain = _.get(Pterodactyl.nests, $('#pNestId').val(), null);
+    var objectChain = _.get(parentChain, 'eggs.' + $(this).val(), null);
 
     $('#pDefaultContainer').val(_.get(objectChain, 'docker_image', 'not defined!'));
 
diff --git a/resources/themes/pterodactyl/admin/servers/new.blade.php b/resources/themes/pterodactyl/admin/servers/new.blade.php
index a564f6ada..09c14fcec 100644
--- a/resources/themes/pterodactyl/admin/servers/new.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/new.blade.php
@@ -132,9 +132,7 @@
                     </div>
                 </div>
                 <div class="box-footer no-border no-pad-top no-pad-bottom">
-                    <div class="alert alert-info">
-                        <p class="small no-margin">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.<p>
-                    </div>
+                    <p class="text-muted small">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.<p>
                 </div>
                 <div class="box-body row">
                     <div class="form-group col-sm-4">
@@ -160,9 +158,7 @@
                     </div>
                 </div>
                 <div class="box-footer no-border no-pad-top no-pad-bottom">
-                    <div class="alert alert-info">
-                        <p class="small no-margin">If you do not want to limit CPU usage set the value to <code>0</code>. To determine a value, take the number <em>physical</em> cores and multiply it by 100. For example, on a quad core system <code>(4 * 100 = 400)</code> there is <code>400%</code> available. To limit a server to using half of a single core, you would set the value to <code>50</code>. To allow a server to use up to two physical cores, set the value to <code>200</code>. BlockIO should be a value between <code>10</code> and <code>1000</code>. Please see <a href="https://docs.docker.com/engine/reference/run/#/block-io-bandwidth-blkio-constraint" target="_blank">this documentation</a> for more information about it.<p>
-                    </div>
+                    <p class="text-muted small">If you do not want to limit CPU usage set the value to <code>0</code>. To determine a value, take the number <em>physical</em> cores and multiply it by 100. For example, on a quad core system <code>(4 * 100 = 400)</code> there is <code>400%</code> available. To limit a server to using half of a single core, you would set the value to <code>50</code>. To allow a server to use up to two physical cores, set the value to <code>200</code>. BlockIO should be a value between <code>10</code> and <code>1000</code>. Please see <a href="https://docs.docker.com/engine/reference/run/#/block-io-bandwidth-blkio-constraint" target="_blank">this documentation</a> for more information about it.<p>
                 </div>
             </div>
         </div>
@@ -171,38 +167,38 @@
         <div class="col-md-6">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">Service Configuration</h3>
+                    <h3 class="box-title">Nest Configuration</h3>
                 </div>
                 <div class="box-body row">
                     <div class="form-group col-xs-12">
-                        <label for="pServiceId">Service</label>
-                        <select name="service_id" id="pServiceId" class="form-control">
-                            @foreach($services as $service)
-                                <option value="{{ $service->id }}"
-                                    @if($service->id === old('service_id'))
+                        <label for="pNestId">Nest</label>
+                        <select name="nest_id" id="pNestId" class="form-control">
+                            @foreach($nests as $nest)
+                                <option value="{{ $nest->id }}"
+                                    @if($nest->id === old('nest_id'))
                                         selected="selected"
                                     @endif
-                                >{{ $service->name }}</option>
+                                >{{ $nest->name }}</option>
                             @endforeach
                         </select>
-                        <p class="small text-muted no-margin">Select the type of service that this server will be running.</p>
+                        <p class="small text-muted no-margin">Select the Nest that this server will be grouped under.</p>
                     </div>
                     <div class="form-group col-xs-12">
-                        <label for="pOptionId">Option</label>
-                        <select name="option_id" id="pOptionId" class="form-control"></select>
-                        <p class="small text-muted no-margin">Select the type of sub-service that this server will be running.</p>
+                        <label for="pEggId">Egg</label>
+                        <select name="egg_id" id="pEggId" class="form-control"></select>
+                        <p class="small text-muted no-margin">Select the Egg that will define how this server should operate.</p>
                     </div>
                     <div class="form-group col-xs-12">
-                        <label for="pPackId">Service Pack</label>
+                        <label for="pPackId">Data Pack</label>
                         <select name="pack_id" id="pPackId" class="form-control"></select>
-                        <p class="small text-muted no-margin">Select a service pack to be automatically installed on this server when first created.</p>
+                        <p class="small text-muted no-margin">Select a data pack to be automatically installed on this server when first created.</p>
                     </div>
                     <div class="form-group col-xs-12">
                         <div class="checkbox checkbox-primary no-margin-bottom">
                             <input id="pSkipScripting" name="skip_scripting" type="checkbox" value="1" />
-                            <label for="pSkipScripting" class="strong">Skip Service Option Install Script</label>
+                            <label for="pSkipScripting" class="strong">Skip Egg Install Script</label>
                         </div>
-                        <p class="small text-muted no-margin">If the selected <code>Option</code> has an install script attached to it, the script will run during install after the pack is installed. If you would like to skip this step, check this box.</p>
+                        <p class="small text-muted no-margin">If the selected Egg has an install script attached to it, the script will run during install after the pack is installed. If you would like to skip this step, check this box.</p>
                     </div>
                 </div>
             </div>
@@ -214,9 +210,9 @@
                 </div>
                 <div class="box-body row">
                     <div class="form-group col-xs-12">
-                        <label for="pDefaultContainer">Process Container</label>
+                        <label for="pDefaultContainer">Docker Image</label>
                         <input id="pDefaultContainer" name="docker_image" value="{{ old('docker_image') }}" class="form-control" />
-                        <p class="small text-muted no-margin">This is the default Docker container that will be used to run this server.</p>
+                        <p class="small text-muted no-margin">This is the default Docker image that will be used to run this server.</p>
                     </div>
                 </div>
             </div>
diff --git a/resources/themes/pterodactyl/admin/servers/view/details.blade.php b/resources/themes/pterodactyl/admin/servers/view/details.blade.php
index 0bf06a31f..275f99ebd 100644
--- a/resources/themes/pterodactyl/admin/servers/view/details.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/view/details.blade.php
@@ -91,7 +91,7 @@
                     <div class="form-group">
                         <label for="name" class="control-label">Docker Image</label>
                         <input type="text" name="docker_image" value="{{ $server->image }}" class="form-control" />
-                        <p class="text-muted small">The docker image to use for this server. The default image for this service and option combination is <code>{{ $server->option->docker_image }}</code>.</p>
+                        <p class="text-muted small">The docker image to use for this server. The default image for this service and option combination is <code>{{ $server->egg->docker_image }}</code>.</p>
                     </div>
                 </div>
                 <div class="box-footer">
diff --git a/resources/themes/pterodactyl/admin/servers/view/index.blade.php b/resources/themes/pterodactyl/admin/servers/view/index.blade.php
index aea9ec50e..81d73d06e 100644
--- a/resources/themes/pterodactyl/admin/servers/view/index.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/view/index.blade.php
@@ -66,8 +66,8 @@
                             <tr>
                                 <td>Service</td>
                                 <td>
-                                    <a href="{{ route('admin.services.view', $server->option->service->id) }}">{{ $server->option->service->name }}</a> ::
-                                    <a href="{{ route('admin.services.option.view', $server->option->id) }}">{{ $server->option->name }}</a>
+                                    <a href="{{ route('admin.nests.view', $server->nest_id) }}">{{ $server->nest->name }}</a> ::
+                                    <a href="{{ route('admin.nests.egg.view', $server->egg_id) }}">{{ $server->egg->name }}</a>
                                 </td>
                             </tr>
                             <tr>
diff --git a/resources/themes/pterodactyl/admin/servers/view/startup.blade.php b/resources/themes/pterodactyl/admin/servers/view/startup.blade.php
index 0f356a6d2..df78cadb8 100644
--- a/resources/themes/pterodactyl/admin/servers/view/startup.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/view/startup.blade.php
@@ -78,34 +78,34 @@
                         </p>
                     </div>
                     <div class="form-group col-xs-12">
-                        <label for="pServiceId">Service</label>
-                        <select name="service_id" id="pServiceId" class="form-control">
-                            @foreach($services as $service)
-                                <option value="{{ $service->id }}"
-                                    @if($service->id === $server->service_id)
+                        <label for="pNestId">Nest</label>
+                        <select name="nest_id" id="pNestId" class="form-control">
+                            @foreach($nests as $nest)
+                                <option value="{{ $nest->id }}"
+                                    @if($nest->id === $server->nest_id)
                                         selected
                                     @endif
-                                >{{ $service->name }}</option>
+                                >{{ $nest->name }}</option>
                             @endforeach
                         </select>
-                        <p class="small text-muted no-margin">Select the type of service that this server will be running.</p>
+                        <p class="small text-muted no-margin">Select the Nest that this server will be grouped into.</p>
                     </div>
                     <div class="form-group col-xs-12">
-                        <label for="pOptionId">Option</label>
-                        <select name="option_id" id="pOptionId" class="form-control"></select>
-                        <p class="small text-muted no-margin">Select the type of sub-service that this server will be running.</p>
+                        <label for="pEggId">Egg</label>
+                        <select name="egg_id" id="pEggId" class="form-control"></select>
+                        <p class="small text-muted no-margin">Select the Egg that will provide processing data for this server.</p>
                     </div>
                     <div class="form-group col-xs-12">
-                        <label for="pPackId">Service Pack</label>
+                        <label for="pPackId">Data Pack</label>
                         <select name="pack_id" id="pPackId" class="form-control"></select>
-                        <p class="small text-muted no-margin">Select a service pack to be automatically installed on this server when first created.</p>
+                        <p class="small text-muted no-margin">Select a data pack to be automatically installed on this server when first created.</p>
                     </div>
                     <div class="form-group col-xs-12">
                         <div class="checkbox checkbox-primary no-margin-bottom">
                             <input id="pSkipScripting" name="skip_scripting" type="checkbox" value="1" @if($server->skip_scripts) checked @endif />
-                            <label for="pSkipScripting" class="strong">Skip Service Option Install Script</label>
+                            <label for="pSkipScripting" class="strong">Skip Egg Install Script</label>
                         </div>
-                        <p class="small text-muted no-margin">If the selected <code>Option</code> has an install script attached to it, the script will run during install after the pack is installed. If you would like to skip this step, check this box.</p>
+                        <p class="small text-muted no-margin">If the selected Egg has an install script attached to it, the script will run during install after the pack is installed. If you would like to skip this step, check this box.</p>
                     </div>
                 </div>
             </div>
@@ -122,11 +122,11 @@
     {!! Theme::js('vendor/lodash/lodash.js') !!}
     <script>
     $(document).ready(function () {
-        $('#pServiceId').select2({
-            placeholder: 'Select a Service',
+        $('#pNestId').select2({
+            placeholder: 'Select a Nest',
         }).change();
-        $('#pOptionId').select2({
-            placeholder: 'Select a Service Option',
+        $('#pEggId').select2({
+            placeholder: 'Select a Nest Egg',
         });
         $('#pPackId').select2({
             placeholder: 'Select a Service Pack',
@@ -143,20 +143,20 @@
     });
     </script>
     <script>
-        $('#pServiceId').on('change', function (event) {
-            $('#pOptionId').html('').select2({
-                data: $.map(_.get(Pterodactyl.services, $(this).val() + '.options', []), function (item) {
+        $('#pNestId').on('change', function (event) {
+            $('#pEggId').html('').select2({
+                data: $.map(_.get(Pterodactyl.nests, $(this).val() + '.eggs', []), function (item) {
                     return {
                         id: item.id,
                         text: item.name,
                     };
                 }),
-            }).val('{{ $server->option_id }}').change();
+            }).change();
         });
 
-        $('#pOptionId').on('change', function (event) {
-            var parentChain = _.get(Pterodactyl.services, $('#pServiceId').val(), null);
-            var objectChain = _.get(parentChain, 'options.' + $(this).val(), null);
+        $('#pEggId').on('change', function (event) {
+            var parentChain = _.get(Pterodactyl.nests, $('#pNestId').val(), null);
+            var objectChain = _.get(parentChain, 'eggs.' + $(this).val(), null);
 
             $('#pDefaultContainer').val(_.get(objectChain, 'docker_image', 'not defined!'));
 
@@ -167,7 +167,7 @@
             }
 
             $('#pPackId').html('').select2({
-                data: [{ id: '', text: 'No Service Pack' }].concat(
+                data: [{ id: '0', text: 'No Service Pack' }].concat(
                     $.map(_.get(objectChain, 'packs', []), function (item, i) {
                         return {
                             id: item.id,
diff --git a/routes/api-admin.php b/routes/api-admin.php
index 81fe456a9..2f336555b 100644
--- a/routes/api-admin.php
+++ b/routes/api-admin.php
@@ -6,92 +6,92 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
-Route::get('/', 'CoreController@index');
-
-/*
-|--------------------------------------------------------------------------
-| Server Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/admin/servers
-|
-*/
-Route::group(['prefix' => '/servers'], function () {
-    Route::get('/', 'ServerController@index');
-    Route::get('/{id}', 'ServerController@view');
-
-    Route::post('/', 'ServerController@store');
-
-    Route::put('/{id}/details', 'ServerController@details');
-    Route::put('/{id}/container', 'ServerController@container');
-    Route::put('/{id}/build', 'ServerController@build');
-    Route::put('/{id}/startup', 'ServerController@startup');
-
-    Route::patch('/{id}/install', 'ServerController@install');
-    Route::patch('/{id}/rebuild', 'ServerController@rebuild');
-    Route::patch('/{id}/suspend', 'ServerController@suspend');
-
-    Route::delete('/{id}', 'ServerController@delete');
-});
-
-/*
-|--------------------------------------------------------------------------
-| Location Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/admin/locations
-|
-*/
-Route::group(['prefix' => '/locations'], function () {
-    Route::get('/', 'LocationController@index');
-});
-
-/*
-|--------------------------------------------------------------------------
-| Node Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/admin/nodes
-|
-*/
-Route::group(['prefix' => '/nodes'], function () {
-    Route::get('/', 'NodeController@index');
-    Route::get('/{id}', 'NodeController@view');
-    Route::get('/{id}/config', 'NodeController@viewConfig');
-
-    Route::post('/', 'NodeController@store');
-
-    Route::delete('/{id}', 'NodeController@delete');
-});
-
-/*
-|--------------------------------------------------------------------------
-| User Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/admin/users
-|
-*/
-Route::group(['prefix' => '/users'], function () {
-    Route::get('/', 'UserController@index');
-    Route::get('/{id}', 'UserController@view');
-
-    Route::post('/', 'UserController@store');
-
-    Route::put('/{id}', 'UserController@update');
-
-    Route::delete('/{id}', 'UserController@delete');
-});
-
-/*
-|--------------------------------------------------------------------------
-| Service Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/admin/services
-|
-*/
-Route::group(['prefix' => '/services'], function () {
-    Route::get('/', 'ServiceController@index');
-    Route::get('/{id}', 'ServiceController@view');
-});
+//Route::get('/', 'CoreController@index');
+//
+///*
+//|--------------------------------------------------------------------------
+//| Server Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/admin/servers
+//|
+//*/
+//Route::group(['prefix' => '/servers'], function () {
+//    Route::get('/', 'ServerController@index');
+//    Route::get('/{id}', 'ServerController@view');
+//
+//    Route::post('/', 'ServerController@store');
+//
+//    Route::put('/{id}/details', 'ServerController@details');
+//    Route::put('/{id}/container', 'ServerController@container');
+//    Route::put('/{id}/build', 'ServerController@build');
+//    Route::put('/{id}/startup', 'ServerController@startup');
+//
+//    Route::patch('/{id}/install', 'ServerController@install');
+//    Route::patch('/{id}/rebuild', 'ServerController@rebuild');
+//    Route::patch('/{id}/suspend', 'ServerController@suspend');
+//
+//    Route::delete('/{id}', 'ServerController@delete');
+//});
+//
+///*
+//|--------------------------------------------------------------------------
+//| Location Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/admin/locations
+//|
+//*/
+//Route::group(['prefix' => '/locations'], function () {
+//    Route::get('/', 'LocationController@index');
+//});
+//
+///*
+//|--------------------------------------------------------------------------
+//| Node Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/admin/nodes
+//|
+//*/
+//Route::group(['prefix' => '/nodes'], function () {
+//    Route::get('/', 'NodeController@index');
+//    Route::get('/{id}', 'NodeController@view');
+//    Route::get('/{id}/config', 'NodeController@viewConfig');
+//
+//    Route::post('/', 'NodeController@store');
+//
+//    Route::delete('/{id}', 'NodeController@delete');
+//});
+//
+///*
+//|--------------------------------------------------------------------------
+//| User Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/admin/users
+//|
+//*/
+//Route::group(['prefix' => '/users'], function () {
+//    Route::get('/', 'UserController@index');
+//    Route::get('/{id}', 'UserController@view');
+//
+//    Route::post('/', 'UserController@store');
+//
+//    Route::put('/{id}', 'UserController@update');
+//
+//    Route::delete('/{id}', 'UserController@delete');
+//});
+//
+///*
+//|--------------------------------------------------------------------------
+//| Service Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/admin/services
+//|
+//*/
+//Route::group(['prefix' => '/services'], function () {
+//    Route::get('/', 'ServiceController@index');
+//    Route::get('/{id}', 'ServiceController@view');
+//});
diff --git a/routes/api-remote.php b/routes/api-remote.php
index 39a371b2e..4aee4341f 100644
--- a/routes/api-remote.php
+++ b/routes/api-remote.php
@@ -8,7 +8,7 @@
  */
 Route::get('/authenticate/{token}', 'ValidateKeyController@index')->name('api.remote.authenticate');
 
-Route::group(['prefix' => '/options'], function () {
-    Route::get('/', 'OptionRetrievalController@index')->name('api.remote.services');
-    Route::get('/{uuid}', 'OptionRetrievalController@download')->name('api.remote.services.download');
+Route::group(['prefix' => '/eggs'], function () {
+    Route::get('/', 'EggRetrievalController@download@index')->name('api.remote.eggs');
+    Route::get('/{uuid}', 'EggRetrievalController@download')->name('api.remote.eggs.download');
 });
diff --git a/routes/api.php b/routes/api.php
index 655fe066c..1f4e69df7 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -6,22 +6,22 @@
  * This software is licensed under the terms of the MIT license.
  * https://opensource.org/licenses/MIT
  */
-Route::get('/', 'CoreController@index')->name('api.user');
-
-/*
-|--------------------------------------------------------------------------
-| Server Controller Routes
-|--------------------------------------------------------------------------
-|
-| Endpoint: /api/user/server/{server}
-|
-*/
-Route::group([
-    'prefix' => '/server/{server}',
-    'middleware' => 'server',
-], function () {
-    Route::get('/', 'ServerController@index')->name('api.user.server');
-
-    Route::post('/power', 'ServerController@power')->name('api.user.server.power');
-    Route::post('/command', 'ServerController@command')->name('api.user.server.command');
-});
+//Route::get('/', 'CoreController@index')->name('api.user');
+//
+///*
+//|--------------------------------------------------------------------------
+//| Server Controller Routes
+//|--------------------------------------------------------------------------
+//|
+//| Endpoint: /api/user/server/{server}
+//|
+//*/
+//Route::group([
+//    'prefix' => '/server/{server}',
+//    'middleware' => 'server',
+//], function () {
+//    Route::get('/', 'ServerController@index')->name('api.user.server');
+//
+//    Route::post('/power', 'ServerController@power')->name('api.user.server.power');
+//    Route::post('/command', 'ServerController@command')->name('api.user.server.command');
+//});

From c19c423568dd9de2c1f1daf5aca445b7324a0d8c Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 18:08:19 -0500
Subject: [PATCH 24/34] More fixes

---
 app/Http/Controllers/Admin/PackController.php | 15 ++++++---
 app/Http/Requests/Admin/ServerFormRequest.php |  2 +-
 app/Models/Pack.php                           |  2 +-
 app/Services/Packs/PackUpdateService.php      |  4 +--
 app/Services/Packs/TemplateUploadService.php  | 14 ++++----
 .../Servers/ServerCreationService.php         |  2 +-
 database/factories/ModelFactory.php           |  2 +-
 .../admin/nodes/view/servers.blade.php        |  2 +-
 .../pterodactyl/admin/packs/index.blade.php   |  4 +--
 .../pterodactyl/admin/packs/modal.blade.php   | 14 ++++----
 .../pterodactyl/admin/packs/new.blade.php     | 18 +++++-----
 .../pterodactyl/admin/packs/view.blade.php    | 14 ++++----
 .../pterodactyl/admin/users/view.blade.php    | 33 ++++++++++---------
 .../themes/pterodactyl/server/index.blade.php |  2 +-
 14 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php
index e25e3d3b9..742f1ed0a 100644
--- a/app/Http/Controllers/Admin/PackController.php
+++ b/app/Http/Controllers/Admin/PackController.php
@@ -114,7 +114,7 @@ class PackController extends Controller
     public function index(Request $request)
     {
         return view('admin.packs.index', [
-            'packs' => $this->repository->search($request->input('query'))->paginateWithOptionAndServerCount(
+            'packs' => $this->repository->search($request->input('query'))->paginateWithEggAndServerCount(
                 $this->config->get('pterodactyl.paginate.admin.packs')
             ),
         ]);
@@ -124,11 +124,13 @@ class PackController extends Controller
      * Display new pack creation form.
      *
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function create()
     {
         return view('admin.packs.new', [
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 
@@ -136,11 +138,13 @@ class PackController extends Controller
      * Display new pack creation modal for use with template upload.
      *
      * @return \Illuminate\View\View
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function newTemplate()
     {
         return view('admin.packs.modal', [
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 
@@ -160,7 +164,7 @@ class PackController extends Controller
     public function store(PackFormRequest $request)
     {
         if ($request->has('from_template')) {
-            $pack = $this->templateUploadService->handle($request->input('option_id'), $request->file('file_upload'));
+            $pack = $this->templateUploadService->handle($request->input('egg_id'), $request->file('file_upload'));
         } else {
             $pack = $this->creationService->handle($request->normalize(), $request->file('file_upload'));
         }
@@ -175,12 +179,13 @@ class PackController extends Controller
      *
      * @param int $pack
      * @return \Illuminate\View\View
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function view($pack)
     {
         return view('admin.packs.view', [
             'pack' => $this->repository->getWithServers($pack),
-            'services' => $this->serviceRepository->getWithOptions(),
+            'nests' => $this->serviceRepository->getWithEggs(),
         ]);
     }
 
diff --git a/app/Http/Requests/Admin/ServerFormRequest.php b/app/Http/Requests/Admin/ServerFormRequest.php
index 21f0519db..f448a953c 100644
--- a/app/Http/Requests/Admin/ServerFormRequest.php
+++ b/app/Http/Requests/Admin/ServerFormRequest.php
@@ -63,7 +63,7 @@ class ServerFormRequest extends AdminFormRequest
             $validator->sometimes('pack_id', [
                 Rule::exists('packs', 'id')->where(function ($query) {
                     $query->where('selectable', 1);
-                    $query->where('option_id', $this->input('option_id'));
+                    $query->where('egg_id', $this->input('egg_id'));
                 }),
             ], function ($input) {
                 return $input->pack_id !== 0 && $input->pack_id !== null;
diff --git a/app/Models/Pack.php b/app/Models/Pack.php
index 960199680..a029b3614 100644
--- a/app/Models/Pack.php
+++ b/app/Models/Pack.php
@@ -34,7 +34,7 @@ class Pack extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected $fillable = [
-        'option_id', 'uuid', 'name', 'version', 'description', 'selectable', 'visible', 'locked',
+        'egg_id', 'uuid', 'name', 'version', 'description', 'selectable', 'visible', 'locked',
     ];
 
     /**
diff --git a/app/Services/Packs/PackUpdateService.php b/app/Services/Packs/PackUpdateService.php
index 6d5555ce5..bb84f7b98 100644
--- a/app/Services/Packs/PackUpdateService.php
+++ b/app/Services/Packs/PackUpdateService.php
@@ -54,10 +54,10 @@ class PackUpdateService
     public function handle($pack, array $data)
     {
         if (! $pack instanceof Pack) {
-            $pack = $this->repository->withColumns(['id', 'option_id'])->find($pack);
+            $pack = $this->repository->withColumns(['id', 'egg_id'])->find($pack);
         }
 
-        if ((int) array_get($data, 'option_id', $pack->option_id) !== $pack->option_id) {
+        if ((int) array_get($data, 'egg_id', $pack->egg_id) !== $pack->egg_id) {
             $count = $this->serverRepository->findCountWhere([['pack_id', '=', $pack->id]]);
 
             if ($count !== 0) {
diff --git a/app/Services/Packs/TemplateUploadService.php b/app/Services/Packs/TemplateUploadService.php
index 7007f3bb4..045bfec48 100644
--- a/app/Services/Packs/TemplateUploadService.php
+++ b/app/Services/Packs/TemplateUploadService.php
@@ -52,7 +52,7 @@ class TemplateUploadService
     /**
      * Process an uploaded file to create a new pack from a JSON or ZIP format.
      *
-     * @param int                           $option
+     * @param int                           $egg
      * @param \Illuminate\Http\UploadedFile $file
      * @return \Pterodactyl\Models\Pack
      *
@@ -63,7 +63,7 @@ class TemplateUploadService
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      */
-    public function handle($option, UploadedFile $file)
+    public function handle($egg, UploadedFile $file)
     {
         if (! $file->isValid()) {
             throw new InvalidFileUploadException(trans('exceptions.packs.invalid_upload'));
@@ -76,10 +76,10 @@ class TemplateUploadService
         }
 
         if ($file->getMimeType() === 'application/zip') {
-            return $this->handleArchive($option, $file);
+            return $this->handleArchive($egg, $file);
         } else {
             $json = json_decode($file->openFile()->fread($file->getSize()), true);
-            $json['option_id'] = $option;
+            $json['egg_id'] = $egg;
 
             return $this->creationService->handle($json);
         }
@@ -88,7 +88,7 @@ class TemplateUploadService
     /**
      * Process a ZIP file to create a pack and stored archive.
      *
-     * @param int                           $option
+     * @param int                           $egg
      * @param \Illuminate\Http\UploadedFile $file
      * @return \Pterodactyl\Models\Pack
      *
@@ -99,7 +99,7 @@ class TemplateUploadService
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      */
-    protected function handleArchive($option, $file)
+    protected function handleArchive($egg, $file)
     {
         if (! $this->archive->open($file->getRealPath())) {
             throw new UnreadableZipArchiveException(trans('exceptions.packs.unreadable'));
@@ -110,7 +110,7 @@ class TemplateUploadService
         }
 
         $json = json_decode($this->archive->getFromName('import.json'), true);
-        $json['option_id'] = $option;
+        $json['egg_id'] = $egg;
 
         $pack = $this->creationService->handle($json);
         if (! $this->archive->extractTo(storage_path('app/packs/' . $pack->uuid), 'archive.tar.gz')) {
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 7760a8edc..0994abe55 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -124,7 +124,7 @@ class ServerCreationService
     public function create(array $data)
     {
         // @todo auto-deployment
-        $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['option_id']);
+        $validator = $this->validatorService->isAdmin()->setFields($data['environment'])->validate($data['egg_id']);
         $uniqueShort = str_random(8);
 
         $this->connection->beginTransaction();
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 2570d5ab4..f3e4f4093 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -133,7 +133,7 @@ $factory->state(Pterodactyl\Models\EggVariable::class, 'editable', function () {
 $factory->define(Pterodactyl\Models\Pack::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
-        'option_id' => $faker->randomNumber(),
+        'egg_id' => $faker->randomNumber(),
         'uuid' => $faker->uuid,
         'name' => $faker->word,
         'description' => null,
diff --git a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
index ad1944f9a..b648c760c 100644
--- a/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
+++ b/resources/themes/pterodactyl/admin/nodes/view/servers.blade.php
@@ -56,7 +56,7 @@
                             <td><code>{{ $server->uuidShort }}</code></td>
                             <td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>
                             <td><a href="{{ route('admin.users.view', $server->owner_id) }}">{{ $server->user->username }}</a></td>
-                            <td>{{ $server->service->name }} ({{ $server->option->name }})</td>
+                            <td>{{ $server->nest->name }} ({{ $server->egg->name }})</td>
                             <td class="text-center"><span data-action="memory">NaN</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>
                             <td class="text-center">{{ $server->disk }} MB</td>
                             <td class="text-center"><span data-action="cpu" data-cpumax="{{ $server->cpu }}">NaN</span> %</td>
diff --git a/resources/themes/pterodactyl/admin/packs/index.blade.php b/resources/themes/pterodactyl/admin/packs/index.blade.php
index e7b22e0d6..270bea96b 100644
--- a/resources/themes/pterodactyl/admin/packs/index.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/index.blade.php
@@ -43,7 +43,7 @@
                             <th>Pack Name</th>
                             <th>Version</th>
                             <th>Description</th>
-                            <th>Option</td>
+                            <th>Egg</th>
                             <th class="text-center">Servers</th>
                         </tr>
                         @foreach ($packs as $pack)
@@ -52,7 +52,7 @@
                                 <td class="middle"><a href="{{ route('admin.packs.view', $pack->id) }}">{{ $pack->name }}</a></td>
                                 <td class="middle"><code>{{ $pack->version }}</code></td>
                                 <td class="col-md-6">{{ str_limit($pack->description, 150) }}</td>
-                                <td class="middle"><a href="{{ route('admin.services.option.view', $pack->option->id) }}">{{ $pack->option->name }}</a></td>
+                                <td class="middle"><a href="{{ route('admin.nests.egg.view', $pack->egg->id) }}">{{ $pack->egg->name }}</a></td>
                                 <td class="middle text-center">{{ $pack->servers_count }}</td>
                             </tr>
                         @endforeach
diff --git a/resources/themes/pterodactyl/admin/packs/modal.blade.php b/resources/themes/pterodactyl/admin/packs/modal.blade.php
index fd4263575..2ce57f2b1 100644
--- a/resources/themes/pterodactyl/admin/packs/modal.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/modal.blade.php
@@ -10,17 +10,17 @@
                     <div class="well" style="margin-bottom:0">
                         <div class="row">
                             <div class="col-md-12">
-                                <label for="pOptionIdModal" class="form-label">Associated Service Option:</label>
-                                <select id="pOptionIdModal" name="option_id" class="form-control">
-                                    @foreach($services as $service)
-                                        <optgroup label="{{ $service->name }}">
-                                            @foreach($service->options as $option)
-                                                <option value="{{ $option->id }}">{{ $option->name }}</option>
+                                <label for="pEggIdModal" class="form-label">Associated Egg:</label>
+                                <select id="pEggIdModal" name="egg_id" class="form-control">
+                                    @foreach($nests as $nest)
+                                        <optgroup label="{{ $nest->name }}">
+                                            @foreach($nest->eggs as $egg)
+                                                <option value="{{ $egg->id }}">{{ $egg->name }}</option>
                                             @endforeach
                                         </optgroup>
                                     @endforeach
                                 </select>
-                                <p class="text-muted small">The option that this pack is assocaited with. Only servers that are assigned this option will be able to access this pack.</p>
+                                <p class="text-muted small">The Egg that this pack is assocaited with. Only servers that are assigned this Egg will be able to access this pack.</p>
                             </div>
                         </div>
                         <div class="row" style="margin-top:15px;">
diff --git a/resources/themes/pterodactyl/admin/packs/new.blade.php b/resources/themes/pterodactyl/admin/packs/new.blade.php
index fe89c904f..35acdb540 100644
--- a/resources/themes/pterodactyl/admin/packs/new.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/new.blade.php
@@ -52,12 +52,12 @@
                         <p class="text-muted small">The version of this package, or the version of the files contained within the package.</p>
                     </div>
                     <div class="form-group">
-                        <label for="pOptionId" class="form-label">Associated Option</label>
-                        <select id="pOptionId" name="option_id" class="form-control">
-                            @foreach($services as $service)
-                                <optgroup label="{{ $service->name }}">
-                                    @foreach($service->options as $option)
-                                        <option value="{{ $option->id }}">{{ $option->name }}</option>
+                        <label for="pEggId" class="form-label">Associated Egg</label>
+                        <select id="pEggId" name="egg_id" class="form-control">
+                            @foreach($nests as $nest)
+                                <optgroup label="{{ $nest->name }}">
+                                    @foreach($nest->eggs as $egg)
+                                        <option value="{{ $egg->id }}">{{ $egg->name }}</option>
                                     @endforeach
                                 </optgroup>
                             @endforeach
@@ -124,7 +124,7 @@
 @section('footer-scripts')
     @parent
     <script>
-        $('#pOptionId').select2();
+        $('#pEggId').select2();
         $('#toggleModal').on('click', function (event) {
             event.preventDefault();
 
@@ -135,9 +135,9 @@
             }).fail(function (jqXhr) {
                 console.error(jqXhr);
                 alert('There was an error trying to create the upload modal.');
-            }).success(function (data) {
+            }).done(function (data) {
                 $(data).modal();
-                $('#pOptionIdModal').select2();
+                $('#pEggIdModal').select2();
             });
         });
     </script>
diff --git a/resources/themes/pterodactyl/admin/packs/view.blade.php b/resources/themes/pterodactyl/admin/packs/view.blade.php
index 25a604d09..e9e5804e5 100644
--- a/resources/themes/pterodactyl/admin/packs/view.blade.php
+++ b/resources/themes/pterodactyl/admin/packs/view.blade.php
@@ -51,12 +51,12 @@
                 </div>
                 <div class="box-body">
                     <div class="form-group">
-                        <label for="pOptionId" class="form-label">Associated Option</label>
-                        <select id="pOptionId" name="option_id" class="form-control">
-                            @foreach($services as $service)
-                                <optgroup label="{{ $service->name }}">
-                                    @foreach($service->options as $option)
-                                        <option value="{{ $option->id }}" {{ $pack->option_id !== $option->id ?: 'selected' }}>{{ $option->name }}</option>
+                        <label for="pEggId" class="form-label">Associated Option</label>
+                        <select id="pEggId" name="egg_id" class="form-control">
+                            @foreach($nests as $nest)
+                                <optgroup label="{{ $nest->name }}">
+                                    @foreach($nest->eggs as $egg)
+                                        <option value="{{ $egg->id }}" {{ $pack->egg_id !== $egg->id ?: 'selected' }}>{{ $egg->name }}</option>
                                     @endforeach
                                 </optgroup>
                             @endforeach
@@ -173,6 +173,6 @@
 @section('footer-scripts')
     @parent
     <script>
-        $('#pOptionId').select2();
+        $('#pEggId').select2();
     </script>
 @endsection
diff --git a/resources/themes/pterodactyl/admin/users/view.blade.php b/resources/themes/pterodactyl/admin/users/view.blade.php
index 755255505..1c1946ecb 100644
--- a/resources/themes/pterodactyl/admin/users/view.blade.php
+++ b/resources/themes/pterodactyl/admin/users/view.blade.php
@@ -113,22 +113,23 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($user->setAccessLevel('subuser')->access()->get() as $server)
-                            <tr>
-                                <td><a href="{{ route('server.index', $server->uuidShort) }}/"><i class="fa fa-tachometer"></i></a></td>
-                                <td><code>{{ $server->uuidShort }}</code></td>
-                                <td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>
-                                <td>
-                                    @if($server->owner_id === $user->id)
-                                        <span class="label bg-purple">Owner</span>
-                                    @else
-                                        <span class="label bg-blue">Subuser</span>
-                                    @endif
-                                </td>
-                                <td><a href="{{ route('admin.nodes.view', $server->node->id) }}">{{ $server->node->name }}</a></td>
-                                <td class="centered">@if($server->suspended === 0)<span class="label muted muted-hover label-success">Active</span>@else<span class="label label-warning">Suspended</span>@endif</td>
-                            </td>
-                        @endforeach
+                        Oh dear, this hasn't been fixed yet?
+                        {{--@foreach($user->setAccessLevel('subuser')->access()->get() as $server)--}}
+                            {{--<tr>--}}
+                                {{--<td><a href="{{ route('server.index', $server->uuidShort) }}/"><i class="fa fa-tachometer"></i></a></td>--}}
+                                {{--<td><code>{{ $server->uuidShort }}</code></td>--}}
+                                {{--<td><a href="{{ route('admin.servers.view', $server->id) }}">{{ $server->name }}</a></td>--}}
+                                {{--<td>--}}
+                                    {{--@if($server->owner_id === $user->id)--}}
+                                        {{--<span class="label bg-purple">Owner</span>--}}
+                                    {{--@else--}}
+                                        {{--<span class="label bg-blue">Subuser</span>--}}
+                                    {{--@endif--}}
+                                {{--</td>--}}
+                                {{--<td><a href="{{ route('admin.nodes.view', $server->node->id) }}">{{ $server->node->name }}</a></td>--}}
+                                {{--<td class="centered">@if($server->suspended === 0)<span class="label muted muted-hover label-success">Active</span>@else<span class="label label-warning">Suspended</span>@endif</td>--}}
+                            {{--</td>--}}
+                        {{--@endforeach--}}
                     </tbody>
                 </table>
             </div>
diff --git a/resources/themes/pterodactyl/server/index.blade.php b/resources/themes/pterodactyl/server/index.blade.php
index be68ffc88..6470a7703 100644
--- a/resources/themes/pterodactyl/server/index.blade.php
+++ b/resources/themes/pterodactyl/server/index.blade.php
@@ -79,7 +79,7 @@
     {!! Theme::js('js/frontend/console.js') !!}
     {!! Theme::js('vendor/chartjs/chart.min.js') !!}
     {!! Theme::js('vendor/jquery/date-format.min.js') !!}
-    @if($server->service->folder === 'minecraft')
+    @if($server->nest->name === 'Minecraft' && $server->nest->author === 'support@pterodactyl.io')
         {!! Theme::js('js/plugins/minecraft/eula.js') !!}
     @endif
 @endsection

From a1a1fa081a1c285a03a1137686ec795bc7a14d89 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 18:08:43 -0500
Subject: [PATCH 25/34] Apply fixes from StyleCI (#669)

---
 routes/api-admin.php | 2 +-
 routes/api.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes/api-admin.php b/routes/api-admin.php
index 2f336555b..a36adf3b4 100644
--- a/routes/api-admin.php
+++ b/routes/api-admin.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Pterodactyl - Panel
  * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
  *
diff --git a/routes/api.php b/routes/api.php
index 1f4e69df7..96dfe5dde 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Pterodactyl - Panel
  * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
  *

From 787346525b754fe3cba27389fb57d120c879c451 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 7 Oct 2017 23:29:08 -0500
Subject: [PATCH 26/34] Update a batch of failing tests

---
 .../Eggs/Sharing/EggImporterService.php       |  24 ++--
 .../Variables/VariableCreationService.php     |  24 ++--
 app/Services/Nests/NestCreationService.php    |   6 +-
 tests/TestCase.php                            |  14 +++
 tests/Traits/KnownUuid.php                    |  47 ++++++++
 .../Scripts/InstallScriptServiceTest.php}     |  16 +--
 .../Sharing/EggExporterServiceTest.php}       |  20 ++--
 .../Sharing/EggImporterServiceTest.php}       | 108 ++++++------------
 .../Variables/VariableCreationServiceTest.php |  56 ++++-----
 .../Variables/VariableUpdateServiceTest.php   |  42 +++++--
 .../NestCreationServiceTest.php}              |  27 ++---
 .../NestDeletionServiceTest.php}              |  21 ++--
 .../NestUpdateServiceTest.php}                |   8 +-
 13 files changed, 218 insertions(+), 195 deletions(-)
 create mode 100644 tests/Traits/KnownUuid.php
 rename tests/Unit/Services/{Services/Options/InstallScriptUpdateServiceTest.php => Eggs/Scripts/InstallScriptServiceTest.php} (86%)
 rename tests/Unit/Services/{Services/Sharing/ServiceOptionExporterServiceTest.php => Eggs/Sharing/EggExporterServiceTest.php} (76%)
 rename tests/Unit/Services/{Services/Sharing/ServiceOptionImporterServiceTest.php => Eggs/Sharing/EggImporterServiceTest.php} (55%)
 rename tests/Unit/Services/{Services => Eggs}/Variables/VariableCreationServiceTest.php (58%)
 rename tests/Unit/Services/{Services => Eggs}/Variables/VariableUpdateServiceTest.php (73%)
 rename tests/Unit/Services/{Services/ServiceCreationServiceTest.php => Nests/NestCreationServiceTest.php} (68%)
 rename tests/Unit/Services/{Services/ServiceDeletionServiceTest.php => Nests/NestDeletionServiceTest.php} (81%)
 rename tests/Unit/Services/{Services/ServiceUpdateServiceTest.php => Nests/NestUpdateServiceTest.php} (90%)

diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index abc74f647..d42c51ccf 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -30,34 +30,34 @@ class EggImporterService
      */
     protected $eggVariableRepository;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     */
+    protected $nestRepository;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
      */
     protected $repository;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
-     */
-    protected $serviceRepository;
-
     /**
      * EggImporterService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface                         $connection
      * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
      * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $eggVariableRepository
-     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface        $serviceRepository
+     * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface        $nestRepository
      */
     public function __construct(
         ConnectionInterface $connection,
         EggRepositoryInterface $repository,
         EggVariableRepositoryInterface $eggVariableRepository,
-        NestRepositoryInterface $serviceRepository
+        NestRepositoryInterface $nestRepository
     ) {
         $this->connection = $connection;
-        $this->repository = $repository;
-        $this->serviceRepository = $serviceRepository;
         $this->eggVariableRepository = $eggVariableRepository;
+        $this->repository = $repository;
+        $this->nestRepository = $nestRepository;
     }
 
     /**
@@ -74,16 +74,16 @@ class EggImporterService
     public function handle(UploadedFile $file, int $nest): Egg
     {
         if (! $file->isValid() || ! $file->isFile()) {
-            throw new InvalidFileUploadException(trans('exceptions.egg.importer.file_error'));
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));
 
         if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
-            throw new InvalidFileUploadException(trans('exceptions.egg.importer.invalid_json_provided'));
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
         }
 
-        $nest = $this->serviceRepository->getWithEggs($nest);
+        $nest = $this->nestRepository->getWithEggs($nest);
         $this->connection->beginTransaction();
 
         $egg = $this->repository->create([
diff --git a/app/Services/Eggs/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php
index 76aac4456..920ca312e 100644
--- a/app/Services/Eggs/Variables/VariableCreationService.php
+++ b/app/Services/Eggs/Variables/VariableCreationService.php
@@ -10,34 +10,24 @@
 namespace Pterodactyl\Services\Eggs\Variables;
 
 use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableCreationService
 {
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
-     */
-    protected $eggRepository;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
      */
-    protected $variableRepository;
+    protected $repository;
 
     /**
      * VariableCreationService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $eggRepository
-     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $repository
      */
-    public function __construct(
-        EggRepositoryInterface $eggRepository,
-        EggVariableRepositoryInterface $variableRepository
-    ) {
-        $this->eggRepository = $eggRepository;
-        $this->variableRepository = $variableRepository;
+    public function __construct(EggVariableRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
     }
 
     /**
@@ -61,10 +51,10 @@ class VariableCreationService
 
         $options = array_get($data, 'options', []);
 
-        return $this->variableRepository->create(array_merge([
+        return $this->repository->create(array_merge($data, [
             'egg_id' => $egg,
             'user_viewable' => in_array('user_viewable', $options),
             'user_editable' => in_array('user_editable', $options),
-        ], $data));
+        ]));
     }
 }
diff --git a/app/Services/Nests/NestCreationService.php b/app/Services/Nests/NestCreationService.php
index 797ad8a42..cad638844 100644
--- a/app/Services/Nests/NestCreationService.php
+++ b/app/Services/Nests/NestCreationService.php
@@ -32,10 +32,8 @@ class NestCreationService
      * @param \Illuminate\Contracts\Config\Repository                   $config
      * @param \Pterodactyl\Contracts\Repository\NestRepositoryInterface $repository
      */
-    public function __construct(
-        ConfigRepository $config,
-        NestRepositoryInterface $repository
-    ) {
+    public function __construct(ConfigRepository $config, NestRepositoryInterface $repository)
+    {
         $this->config = $config;
         $this->repository = $repository;
     }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 664e4a9c3..5f9ba7482 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -8,8 +8,22 @@ abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
 
+    /**
+     * Setup tests.
+     */
     public function setUp()
     {
         parent::setUp();
+
+        $this->setKnownUuidFactory();
+    }
+
+    /**
+     * Handles the known UUID handling in certain unit tests. Use the "KnownUuid" trait
+     * in order to enable this ability.
+     */
+    public function setKnownUuidFactory()
+    {
+        // do nothing
     }
 }
diff --git a/tests/Traits/KnownUuid.php b/tests/Traits/KnownUuid.php
new file mode 100644
index 000000000..03d198380
--- /dev/null
+++ b/tests/Traits/KnownUuid.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Traits;
+
+use Mockery as m;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidFactory;
+
+trait KnownUuid
+{
+    /**
+     * The known UUID string.
+     *
+     * @var string
+     */
+    protected $knownUuid = 'ffb5c3a6-ab17-43ab-97f0-8ff37ccd7f5f';
+
+    /**
+     * Setup a factory mock to produce the same UUID whenever called.
+     */
+    public function setKnownUuidFactory()
+    {
+        $uuid = Uuid::fromString($this->getKnownUuid());
+        $factoryMock = m::mock(UuidFactory::class . '[uuid4]', [
+            'uuid4' => $uuid,
+        ]);
+
+        Uuid::setFactory($factoryMock);
+    }
+
+    /**
+     * Returns the known UUID for tests to use.
+     *
+     * @return string
+     */
+    public function getKnownUuid(): string
+    {
+        return $this->knownUuid;
+    }
+}
diff --git a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php b/tests/Unit/Services/Eggs/Scripts/InstallScriptServiceTest.php
similarity index 86%
rename from tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
rename to tests/Unit/Services/Eggs/Scripts/InstallScriptServiceTest.php
index 2492dc600..ac29f44c4 100644
--- a/tests/Unit/Services/Services/Options/InstallScriptUpdateServiceTest.php
+++ b/tests/Unit/Services/Eggs/Scripts/InstallScriptServiceTest.php
@@ -13,11 +13,11 @@ use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
+use Pterodactyl\Services\Eggs\Scripts\InstallScriptService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\InstallScriptService;
-use Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException;
+use Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException;
 
-class InstallScriptUpdateServiceTest extends TestCase
+class InstallScriptServiceTest extends TestCase
 {
     /**
      * @var array
@@ -36,12 +36,12 @@ class InstallScriptUpdateServiceTest extends TestCase
     protected $model;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\InstallScriptService
+     * @var \Pterodactyl\Services\Eggs\Scripts\InstallScriptService
      */
     protected $service;
 
@@ -65,7 +65,7 @@ class InstallScriptUpdateServiceTest extends TestCase
     {
         $this->data['copy_script_from'] = 1;
 
-        $this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->service_id)->once()->andReturn(true);
+        $this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->nest_id)->once()->andReturn(true);
         $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
             ->shouldReceive('update')->with($this->model->id, $this->data)->andReturnNull();
 
@@ -79,12 +79,12 @@ class InstallScriptUpdateServiceTest extends TestCase
     {
         $this->data['copy_script_from'] = 1;
 
-        $this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->service_id)->once()->andReturn(false);
+        $this->repository->shouldReceive('isCopiableScript')->with(1, $this->model->nest_id)->once()->andReturn(false);
         try {
             $this->service->handle($this->model, $this->data);
         } catch (Exception $exception) {
             $this->assertInstanceOf(InvalidCopyFromException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.invalid_copy_id'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.egg.invalid_copy_id'), $exception->getMessage());
         }
     }
 
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php b/tests/Unit/Services/Eggs/Sharing/EggExporterServiceTest.php
similarity index 76%
rename from tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
rename to tests/Unit/Services/Eggs/Sharing/EggExporterServiceTest.php
index 60f9a2eb9..c40531b97 100644
--- a/tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php
+++ b/tests/Unit/Services/Eggs/Sharing/EggExporterServiceTest.php
@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Tests\Unit\Services\Services\Sharing;
+namespace Tests\Unit\Services\Eggs\Sharing;
 
 use Mockery as m;
 use Carbon\Carbon;
@@ -15,10 +15,10 @@ use Tests\TestCase;
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\EggVariable;
 use Tests\Assertions\NestedObjectAssertionsTrait;
+use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService;
 
-class ServiceOptionExporterServiceTest extends TestCase
+class EggExporterServiceTest extends TestCase
 {
     use NestedObjectAssertionsTrait;
 
@@ -33,7 +33,7 @@ class ServiceOptionExporterServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\ServiceOptionExporterService
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
      */
     protected $service;
 
@@ -48,7 +48,7 @@ class ServiceOptionExporterServiceTest extends TestCase
         $this->carbon = new Carbon();
         $this->repository = m::mock(EggRepositoryInterface::class);
 
-        $this->service = new ServiceOptionExporterService($this->carbon, $this->repository);
+        $this->service = new EggExporterService($this->repository);
     }
 
     /**
@@ -56,18 +56,20 @@ class ServiceOptionExporterServiceTest extends TestCase
      */
     public function testJsonStructureIsExported()
     {
-        $option = factory(Egg::class)->make();
-        $option->variables = collect([$variable = factory(EggVariable::class)->make()]);
+        $egg = factory(Egg::class)->make();
+        $egg->variables = collect([$variable = factory(EggVariable::class)->make()]);
 
-        $this->repository->shouldReceive('getWithExportAttributes')->with($option->id)->once()->andReturn($option);
+        $this->repository->shouldReceive('getWithExportAttributes')->with($egg->id)->once()->andReturn($egg);
 
-        $response = $this->service->handle($option->id);
+        $response = $this->service->handle($egg->id);
         $this->assertNotEmpty($response);
 
         $data = json_decode($response);
         $this->assertEquals(JSON_ERROR_NONE, json_last_error());
         $this->assertObjectHasNestedAttribute('meta.version', $data);
         $this->assertObjectNestedValueEquals('meta.version', 'PTDL_v1', $data);
+        $this->assertObjectHasNestedAttribute('author', $data);
+        $this->assertObjectNestedValueEquals('author', $egg->author, $data);
         $this->assertObjectHasNestedAttribute('exported_at', $data);
         $this->assertObjectNestedValueEquals('exported_at', Carbon::now()->toIso8601String(), $data);
         $this->assertObjectHasNestedAttribute('scripts.installation.script', $data);
diff --git a/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
similarity index 55%
rename from tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
rename to tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
index db9992db6..7e8c37601 100644
--- a/tests/Unit/Services/Services/Sharing/ServiceOptionImporterServiceTest.php
+++ b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
@@ -11,57 +11,53 @@ namespace Tests\Unit\Services\Services\Sharing;
 
 use Mockery as m;
 use Tests\TestCase;
-use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;
+use Tests\Traits\KnownUuid;
 use Pterodactyl\Models\Nest;
 use Illuminate\Http\UploadedFile;
 use Pterodactyl\Models\EggVariable;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Services\Services\Sharing\EggImporterService;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\DuplicateOptionTagException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
-class ServiceOptionImporterServiceTest extends TestCase
+class EggImporterServiceTest extends TestCase
 {
+    use KnownUuid;
+
     /**
      * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
      */
     protected $connection;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface|\Mockery\Mock
+     */
+    protected $eggVariableRepository;
+
     /**
      * @var \Illuminate\Http\UploadedFile|\Mockery\Mock
      */
     protected $file;
 
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
+     */
+    protected $nestRepository;
+
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Sharing\EggImporterService
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggImporterService
      */
     protected $service;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
-     */
-    protected $serviceRepository;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface|\Mockery\Mock
-     */
-    protected $serviceVariableRepository;
-
-    /**
-     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
-     */
-    protected $uuid;
-
     /**
      * Setup tests.
      */
@@ -70,58 +66,54 @@ class ServiceOptionImporterServiceTest extends TestCase
         parent::setUp();
 
         $this->connection = m::mock(ConnectionInterface::class);
+        $this->eggVariableRepository = m::mock(EggVariableRepositoryInterface::class);
         $this->file = m::mock(UploadedFile::class);
+        $this->nestRepository = m::mock(NestRepositoryInterface::class);
         $this->repository = m::mock(EggRepositoryInterface::class);
-        $this->serviceRepository = m::mock(NestRepositoryInterface::class);
-        $this->serviceVariableRepository = m::mock(ServiceVariableRepositoryInterface::class);
-        $this->uuid = m::mock('overload:' . Uuid::class);
 
         $this->service = new EggImporterService(
-            $this->connection, $this->serviceRepository, $this->repository, $this->serviceVariableRepository
+            $this->connection, $this->repository, $this->eggVariableRepository, $this->nestRepository
         );
     }
 
     /**
      * Test that a service option can be successfully imported.
      */
-    public function testServiceOptionIsImported()
+    public function testEggConfigurationIsImported()
     {
-        $option = factory(Egg::class)->make();
-        $service = factory(Nest::class)->make();
-        $service->options = collect([factory(Egg::class)->make()]);
+        $egg = factory(Egg::class)->make();
+        $nest = factory(Nest::class)->make();
 
         $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
         $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
             'meta' => ['version' => 'PTDL_v1'],
-            'name' => $option->name,
-            'tag' => $option->tag,
+            'name' => $egg->name,
+            'tag' => $egg->tag,
             'variables' => [
                 $variable = factory(EggVariable::class)->make(),
             ],
         ]));
-        $this->serviceRepository->shouldReceive('getWithOptions')->with($service->id)->once()->andReturn($service);
+        $this->nestRepository->shouldReceive('getWithEggs')->with($nest->id)->once()->andReturn($nest);
 
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn($option->uuid);
         $this->repository->shouldReceive('create')->with(m::subset([
-            'uuid' => $option->uuid,
-            'service_id' => $service->id,
-            'name' => $option->name,
-            'tag' => $option->tag,
-        ]), true, true)->once()->andReturn($option);
+            'uuid' => $this->getKnownUuid(),
+            'nest_id' => $nest->id,
+            'name' => $egg->name,
+        ]), true, true)->once()->andReturn($egg);
 
-        $this->serviceVariableRepository->shouldReceive('create')->with(m::subset([
-            'option_id' => $option->id,
+        $this->eggVariableRepository->shouldReceive('create')->with(m::subset([
+            'egg_id' => $egg->id,
             'env_variable' => $variable->env_variable,
         ]))->once()->andReturnNull();
         $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
 
-        $response = $this->service->handle($this->file, $service->id);
+        $response = $this->service->handle($this->file, $nest->id);
         $this->assertNotEmpty($response);
         $this->assertInstanceOf(Egg::class, $response);
-        $this->assertSame($option, $response);
+        $this->assertSame($egg, $response);
     }
 
     /**
@@ -134,7 +126,7 @@ class ServiceOptionImporterServiceTest extends TestCase
             $this->service->handle($this->file, 1234);
         } catch (PterodactylException $exception) {
             $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.exporter.import_file_error'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.importer.file_error'), $exception->getMessage());
         }
     }
 
@@ -150,7 +142,7 @@ class ServiceOptionImporterServiceTest extends TestCase
             $this->service->handle($this->file, 1234);
         } catch (PterodactylException $exception) {
             $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.exporter.import_file_error'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.importer.file_error'), $exception->getMessage());
         }
     }
 
@@ -170,33 +162,7 @@ class ServiceOptionImporterServiceTest extends TestCase
             $this->service->handle($this->file, 1234);
         } catch (PterodactylException $exception) {
             $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.exporter.invalid_json_provided'), $exception->getMessage());
-        }
-    }
-
-    /**
-     * Test that an exception is thrown if a duplicate tag exists.
-     */
-    public function testExceptionIsThrownIfDuplicateTagExists()
-    {
-        $option = factory(Egg::class)->make();
-        $service = factory(Nest::class)->make();
-        $service->options = collect([factory(Egg::class)->make(['tag' => $option->tag])]);
-
-        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
-        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
-        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
-        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
-            'meta' => ['version' => 'PTDL_v1'],
-            'tag' => $option->tag,
-        ]));
-        $this->serviceRepository->shouldReceive('getWithOptions')->with($service->id)->once()->andReturn($service);
-
-        try {
-            $this->service->handle($this->file, $service->id);
-        } catch (PterodactylException $exception) {
-            $this->assertInstanceOf(DuplicateOptionTagException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.duplicate_tag'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.importer.invalid_json_provided'), $exception->getMessage());
         }
     }
 }
diff --git a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php b/tests/Unit/Services/Eggs/Variables/VariableCreationServiceTest.php
similarity index 58%
rename from tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php
rename to tests/Unit/Services/Eggs/Variables/VariableCreationServiceTest.php
index dc0303202..320d85aa5 100644
--- a/tests/Unit/Services/Services/Variables/VariableCreationServiceTest.php
+++ b/tests/Unit/Services/Eggs/Variables/VariableCreationServiceTest.php
@@ -7,30 +7,24 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Tests\Unit\Services\Services\Variables;
+namespace Tests\Unit\Services\Eggs\Variables;
 
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\EggVariable;
-use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Variables\VariableCreationService;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
+use Pterodactyl\Services\Eggs\Variables\VariableCreationService;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class VariableCreationServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface|\Mockery\Mock
      */
-    protected $serviceOptionRepository;
+    protected $repository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
-     */
-    protected $serviceVariableRepository;
-
-    /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableCreationService
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableCreationService
      */
     protected $service;
 
@@ -41,10 +35,9 @@ class VariableCreationServiceTest extends TestCase
     {
         parent::setUp();
 
-        $this->serviceOptionRepository = m::mock(EggRepositoryInterface::class);
-        $this->serviceVariableRepository = m::mock(ServiceVariableRepositoryInterface::class);
+        $this->repository = m::mock(EggVariableRepositoryInterface::class);
 
-        $this->service = new VariableCreationService($this->serviceOptionRepository, $this->serviceVariableRepository);
+        $this->service = new VariableCreationService($this->repository);
     }
 
     /**
@@ -53,11 +46,11 @@ class VariableCreationServiceTest extends TestCase
     public function testVariableIsCreatedAndStored()
     {
         $data = ['env_variable' => 'TEST_VAR_123'];
-        $this->serviceVariableRepository->shouldReceive('create')->with([
-           'option_id' => 1,
-           'user_viewable' => false,
-           'user_editable' => false,
-           'env_variable' => 'TEST_VAR_123',
+        $this->repository->shouldReceive('create')->with([
+            'egg_id' => 1,
+            'user_viewable' => false,
+            'user_editable' => false,
+            'env_variable' => 'TEST_VAR_123',
         ])->once()->andReturn(new EggVariable);
 
         $this->assertInstanceOf(EggVariable::class, $this->service->handle(1, $data));
@@ -69,8 +62,8 @@ class VariableCreationServiceTest extends TestCase
     public function testOptionsPassedInArrayKeyAreParsedProperly()
     {
         $data = ['env_variable' => 'TEST_VAR_123', 'options' => ['user_viewable', 'user_editable']];
-        $this->serviceVariableRepository->shouldReceive('create')->with([
-            'option_id' => 1,
+        $this->repository->shouldReceive('create')->with([
+            'egg_id' => 1,
             'user_viewable' => true,
             'user_editable' => true,
             'env_variable' => 'TEST_VAR_123',
@@ -84,29 +77,28 @@ class VariableCreationServiceTest extends TestCase
      * Test that all of the reserved variables defined in the model trigger an exception.
      *
      * @dataProvider reservedNamesProvider
-     * @expectedException \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
+     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
-    public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames($variable)
+    public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames(string $variable)
     {
         $this->service->handle(1, ['env_variable' => $variable]);
     }
 
     /**
-     * Test that a model can be passed in place of an integer.
+     * Test that the egg ID applied in the function takes higher priority than an
+     * ID passed into the handler.
      */
-    public function testModelCanBePassedInPlaceOfInteger()
+    public function testEggIdPassedInDataIsNotApplied()
     {
-        $model = factory(Egg::class)->make();
-        $data = ['env_variable' => 'TEST_VAR_123'];
-
-        $this->serviceVariableRepository->shouldReceive('create')->with([
-            'option_id' => $model->id,
+        $data = ['egg_id' => 123456, 'env_variable' => 'TEST_VAR_123'];
+        $this->repository->shouldReceive('create')->with([
+            'egg_id' => 1,
             'user_viewable' => false,
             'user_editable' => false,
             'env_variable' => 'TEST_VAR_123',
         ])->once()->andReturn(new EggVariable);
 
-        $this->assertInstanceOf(EggVariable::class, $this->service->handle($model, $data));
+        $this->assertInstanceOf(EggVariable::class, $this->service->handle(1, $data));
     }
 
     /**
diff --git a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php b/tests/Unit/Services/Eggs/Variables/VariableUpdateServiceTest.php
similarity index 73%
rename from tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php
rename to tests/Unit/Services/Eggs/Variables/VariableUpdateServiceTest.php
index 58e9fdc8a..48703f8e4 100644
--- a/tests/Unit/Services/Services/Variables/VariableUpdateServiceTest.php
+++ b/tests/Unit/Services/Eggs/Variables/VariableUpdateServiceTest.php
@@ -7,15 +7,15 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Tests\Unit\Services\Services\Variables;
+namespace Tests\Unit\Services\Eggs\Variables;
 
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Services\Services\Variables\VariableUpdateService;
-use Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface;
+use Pterodactyl\Services\Eggs\Variables\VariableUpdateService;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class VariableUpdateServiceTest extends TestCase
 {
@@ -25,12 +25,12 @@ class VariableUpdateServiceTest extends TestCase
     protected $model;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface|\Mockery\Mock
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Variables\VariableUpdateService
+     * @var \Pterodactyl\Services\Eggs\Variables\VariableUpdateService
      */
     protected $service;
 
@@ -42,7 +42,7 @@ class VariableUpdateServiceTest extends TestCase
         parent::setUp();
 
         $this->model = factory(EggVariable::class)->make();
-        $this->repository = m::mock(ServiceVariableRepositoryInterface::class);
+        $this->repository = m::mock(EggVariableRepositoryInterface::class);
 
         $this->service = new VariableUpdateService($this->repository);
     }
@@ -86,7 +86,7 @@ class VariableUpdateServiceTest extends TestCase
         $this->repository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
             ->shouldReceive('findCountWhere')->with([
                 ['env_variable', '=', 'TEST_VAR_123'],
-                ['option_id', '=', $this->model->option_id],
+                ['egg_id', '=', $this->model->option_id],
                 ['id', '!=', $this->model->id],
             ])->once()->andReturn(0);
 
@@ -100,6 +100,28 @@ class VariableUpdateServiceTest extends TestCase
         $this->assertTrue($this->service->handle($this->model, ['env_variable' => 'TEST_VAR_123']));
     }
 
+    /**
+     * Test that data passed into the handler is overwritten inside the handler.
+     */
+    public function testDataPassedIntoHandlerTakesLowerPriorityThanDataSet()
+    {
+        $this->repository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
+            ->shouldReceive('findCountWhere')->with([
+                ['env_variable', '=', 'TEST_VAR_123'],
+                ['egg_id', '=', $this->model->option_id],
+                ['id', '!=', $this->model->id],
+            ])->once()->andReturn(0);
+
+        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
+            ->shouldReceive('update')->with($this->model->id, [
+                'user_viewable' => false,
+                'user_editable' => false,
+                'env_variable' => 'TEST_VAR_123',
+            ])->once()->andReturn(true);
+
+        $this->assertTrue($this->service->handle($this->model, ['user_viewable' => 123456, 'env_variable' => 'TEST_VAR_123']));
+    }
+
     /**
      * Test that a non-unique environment variable triggers an exception.
      */
@@ -108,7 +130,7 @@ class VariableUpdateServiceTest extends TestCase
         $this->repository->shouldReceive('withColumns')->with('id')->once()->andReturnSelf()
             ->shouldReceive('findCountWhere')->with([
                 ['env_variable', '=', 'TEST_VAR_123'],
-                ['option_id', '=', $this->model->option_id],
+                ['egg_id', '=', $this->model->option_id],
                 ['id', '!=', $this->model->id],
             ])->once()->andReturn(1);
 
@@ -126,9 +148,9 @@ class VariableUpdateServiceTest extends TestCase
      * Test that all of the reserved variables defined in the model trigger an exception.
      *
      * @dataProvider reservedNamesProvider
-     * @expectedException \Pterodactyl\Exceptions\Service\ServiceVariable\ReservedVariableNameException
+     * @expectedException \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
-    public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames($variable)
+    public function testExceptionIsThrownIfEnvironmentVariableIsInListOfReservedNames(string $variable)
     {
         $this->service->handle($this->model, ['env_variable' => $variable]);
     }
diff --git a/tests/Unit/Services/Services/ServiceCreationServiceTest.php b/tests/Unit/Services/Nests/NestCreationServiceTest.php
similarity index 68%
rename from tests/Unit/Services/Services/ServiceCreationServiceTest.php
rename to tests/Unit/Services/Nests/NestCreationServiceTest.php
index 0d9ae6b9c..67467e87f 100644
--- a/tests/Unit/Services/Services/ServiceCreationServiceTest.php
+++ b/tests/Unit/Services/Nests/NestCreationServiceTest.php
@@ -12,15 +12,15 @@ namespace Tests\Unit\Services\Services;
 use Mockery as m;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
+use Tests\Traits\KnownUuid;
 use Pterodactyl\Models\Nest;
 use Illuminate\Contracts\Config\Repository;
-use Pterodactyl\Traits\Services\CreatesServiceIndex;
-use Pterodactyl\Services\Services\NestCreationService;
+use Pterodactyl\Services\Nests\NestCreationService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
-class ServiceCreationServiceTest extends TestCase
+class NestCreationServiceTest extends TestCase
 {
-    use CreatesServiceIndex;
+    use KnownUuid;
 
     /**
      * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
@@ -33,15 +33,10 @@ class ServiceCreationServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\NestCreationService
+     * @var \Pterodactyl\Services\Nests\NestCreationService
      */
     protected $service;
 
-    /**
-     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
-     */
-    protected $uuid;
-
     /**
      * Setup tests.
      */
@@ -51,7 +46,6 @@ class ServiceCreationServiceTest extends TestCase
 
         $this->config = m::mock(Repository::class);
         $this->repository = m::mock(NestRepositoryInterface::class);
-        $this->uuid = m::mock('overload:' . Uuid::class);
 
         $this->service = new NestCreationService($this->config, $this->repository);
     }
@@ -65,19 +59,14 @@ class ServiceCreationServiceTest extends TestCase
         $data = [
             'name' => $model->name,
             'description' => $model->description,
-            'folder' => $model->folder,
-            'startup' => $model->startup,
         ];
 
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
-        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('0000-author');
+        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('testauthor@example.com');
         $this->repository->shouldReceive('create')->with([
-            'uuid' => 'uuid-0000',
-            'author' => '0000-author',
+            'uuid' => $this->getKnownUuid(),
+            'author' => 'testauthor@example.com',
             'name' => $data['name'],
             'description' => $data['description'],
-            'startup' => $data['startup'],
-            'index_file' => $this->getIndexScript(),
         ], true, true)->once()->andReturn($model);
 
         $response = $this->service->handle($data);
diff --git a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php b/tests/Unit/Services/Nests/NestDeletionServiceTest.php
similarity index 81%
rename from tests/Unit/Services/Services/ServiceDeletionServiceTest.php
rename to tests/Unit/Services/Nests/NestDeletionServiceTest.php
index 396690e0e..b0bc0b2bb 100644
--- a/tests/Unit/Services/Services/ServiceDeletionServiceTest.php
+++ b/tests/Unit/Services/Nests/NestDeletionServiceTest.php
@@ -12,25 +12,26 @@ namespace Tests\Unit\Services\Services;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Services\Services\NestDeletionService;
+use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Services\Nests\NestDeletionService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
-class ServiceDeletionServiceTest extends TestCase
+class NestDeletionServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\NestDeletionService
+     * @var \Pterodactyl\Services\Nests\NestDeletionService
      */
     protected $service;
 
@@ -52,7 +53,7 @@ class ServiceDeletionServiceTest extends TestCase
      */
     public function testServiceIsDeleted()
     {
-        $this->serverRepository->shouldReceive('findCountWhere')->with([['service_id', '=', 1]])->once()->andReturn(0);
+        $this->serverRepository->shouldReceive('findCountWhere')->with([['nest_id', '=', 1]])->once()->andReturn(0);
         $this->repository->shouldReceive('delete')->with(1)->once()->andReturn(1);
 
         $this->assertEquals(1, $this->service->handle(1));
@@ -62,14 +63,16 @@ class ServiceDeletionServiceTest extends TestCase
      * Test that an exception is thrown when there are servers attached to a service.
      *
      * @dataProvider serverCountProvider
+     *
+     * @param int $count
      */
-    public function testExceptionIsThrownIfServersAreAttached($count)
+    public function testExceptionIsThrownIfServersAreAttached(int $count)
     {
-        $this->serverRepository->shouldReceive('findCountWhere')->with([['service_id', '=', 1]])->once()->andReturn($count);
+        $this->serverRepository->shouldReceive('findCountWhere')->with([['nest_id', '=', 1]])->once()->andReturn($count);
 
         try {
             $this->service->handle(1);
-        } catch (Exception $exception) {
+        } catch (PterodactylException $exception) {
             $this->assertInstanceOf(HasActiveServersException::class, $exception);
             $this->assertEquals(trans('exceptions.service.delete_has_servers'), $exception->getMessage());
         }
diff --git a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php b/tests/Unit/Services/Nests/NestUpdateServiceTest.php
similarity index 90%
rename from tests/Unit/Services/Services/ServiceUpdateServiceTest.php
rename to tests/Unit/Services/Nests/NestUpdateServiceTest.php
index 612d684b2..e5b03e974 100644
--- a/tests/Unit/Services/Services/ServiceUpdateServiceTest.php
+++ b/tests/Unit/Services/Nests/NestUpdateServiceTest.php
@@ -11,18 +11,18 @@ namespace Tests\Unit\Services\Services;
 
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Services\Services\NestUpdateService;
+use Pterodactyl\Services\Nests\NestUpdateService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
-class ServiceUpdateServiceTest extends TestCase
+class NestUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NestRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\NestUpdateService
+     * @var \Pterodactyl\Services\Nests\NestUpdateService
      */
     protected $service;
 

From 6e02e9491a478b95a2ac9544a109b797439f7149 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 15:29:46 -0500
Subject: [PATCH 27/34] Egg tests updated

---
 app/Services/Eggs/EggCreationService.php      |   2 +-
 .../Traits/{KnownUuid.php => MocksUuids.php}  |   2 +-
 .../EggCreationServiceTest.php}               | 112 ++++++++----------
 .../EggDeletionServiceTest.php}               |  32 ++---
 .../EggUpdateServiceTest.php}                 |  45 ++++---
 .../Eggs/Sharing/EggImporterServiceTest.php   |   4 +-
 .../Nests/NestCreationServiceTest.php         |   4 +-
 7 files changed, 99 insertions(+), 102 deletions(-)
 rename tests/Traits/{KnownUuid.php => MocksUuids.php} (98%)
 rename tests/Unit/Services/{Services/Options/OptionCreationServiceTest.php => Eggs/EggCreationServiceTest.php} (62%)
 rename tests/Unit/Services/{Services/Options/OptionDeletionServiceTest.php => Eggs/EggDeletionServiceTest.php} (68%)
 rename tests/Unit/Services/{Services/Options/OptionUpdateServiceTest.php => Eggs/EggUpdateServiceTest.php} (60%)

diff --git a/app/Services/Eggs/EggCreationService.php b/app/Services/Eggs/EggCreationService.php
index 13f04c3b0..aaf9823f1 100644
--- a/app/Services/Eggs/EggCreationService.php
+++ b/app/Services/Eggs/EggCreationService.php
@@ -59,7 +59,7 @@ class EggCreationService
             ]);
 
             if ($results !== 1) {
-                throw new NoParentConfigurationFoundException(trans('exceptions.service.options.must_be_child'));
+                throw new NoParentConfigurationFoundException(trans('exceptions.nest.egg.must_be_child'));
             }
         }
 
diff --git a/tests/Traits/KnownUuid.php b/tests/Traits/MocksUuids.php
similarity index 98%
rename from tests/Traits/KnownUuid.php
rename to tests/Traits/MocksUuids.php
index 03d198380..af57f93a8 100644
--- a/tests/Traits/KnownUuid.php
+++ b/tests/Traits/MocksUuids.php
@@ -13,7 +13,7 @@ use Mockery as m;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidFactory;
 
-trait KnownUuid
+trait MocksUuids
 {
     /**
      * The known UUID string.
diff --git a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php b/tests/Unit/Services/Eggs/EggCreationServiceTest.php
similarity index 62%
rename from tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
rename to tests/Unit/Services/Eggs/EggCreationServiceTest.php
index 3e7ddade5..7afa07871 100644
--- a/tests/Unit/Services/Services/Options/OptionCreationServiceTest.php
+++ b/tests/Unit/Services/Eggs/EggCreationServiceTest.php
@@ -12,15 +12,18 @@ namespace Tests\Unit\Services\Services\Options;
 use Exception;
 use Mockery as m;
 use Tests\TestCase;
-use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;
+use Tests\Traits\MocksUuids;
 use Illuminate\Contracts\Config\Repository;
+use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Services\Eggs\EggCreationService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Services\Services\Options\EggCreationService;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 
-class OptionCreationServiceTest extends TestCase
+class EggCreationServiceTest extends TestCase
 {
+    use MocksUuids;
+
     /**
      * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
      */
@@ -32,15 +35,10 @@ class OptionCreationServiceTest extends TestCase
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\EggCreationService
+     * @var \Pterodactyl\Services\Eggs\EggCreationService
      */
     protected $service;
 
-    /**
-     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
-     */
-    protected $uuid;
-
     /**
      * Setup tests.
      */
@@ -50,7 +48,6 @@ class OptionCreationServiceTest extends TestCase
 
         $this->config = m::mock(Repository::class);
         $this->repository = m::mock(EggRepositoryInterface::class);
-        $this->uuid = m::mock('overload:' . Uuid::class);
 
         $this->service = new EggCreationService($this->config, $this->repository);
     }
@@ -60,52 +57,23 @@ class OptionCreationServiceTest extends TestCase
      */
     public function testCreateNewModelWithoutUsingConfigFrom()
     {
-        $model = factory(Egg::class)->make([
-            'tag' => str_random(10),
-        ]);
+        $model = factory(Egg::class)->make();
 
         $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
         $this->repository->shouldReceive('create')->with([
-            'name' => $model->name,
-            'tag' => 'test@example.com:' . $model->tag,
+            'uuid' => $this->getKnownUuid(),
+            'author' => 'test@example.com',
             'config_from' => null,
-            'uuid' => 'uuid-string',
+            'name' => $model->name,
         ], true, true)->once()->andReturn($model);
 
-        $response = $this->service->handle(['name' => $model->name, 'tag' => $model->tag]);
+        $response = $this->service->handle(['name' => $model->name]);
 
         $this->assertNotEmpty($response);
         $this->assertNull(object_get($response, 'config_from'));
         $this->assertEquals($model->name, $response->name);
     }
 
-    /**
-     * Test that passing a bad tag into the function will set the correct tag.
-     */
-    public function testCreateNewModelUsingLongTagForm()
-    {
-        $model = factory(Egg::class)->make([
-            'tag' => 'test@example.com:tag',
-        ]);
-
-        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
-        $this->repository->shouldReceive('create')->with([
-            'name' => $model->name,
-            'config_from' => null,
-            'tag' => $model->tag,
-            'uuid' => 'uuid-string',
-        ], true, true)->once()->andReturn($model);
-
-        $response = $this->service->handle(['name' => $model->name, 'tag' => 'bad@example.com:tag']);
-
-        $this->assertNotEmpty($response);
-        $this->assertNull(object_get($response, 'config_from'));
-        $this->assertEquals($model->name, $response->name);
-        $this->assertEquals('test@example.com:tag', $response->tag);
-    }
-
     /**
      * Test that a new model is created when using the config from attribute.
      */
@@ -113,44 +81,66 @@ class OptionCreationServiceTest extends TestCase
     {
         $model = factory(Egg::class)->make();
 
-        $data = [
-            'name' => $model->name,
-            'service_id' => $model->service_id,
-            'tag' => 'test@example.com:tag',
-            'config_from' => 1,
-            'uuid' => 'uuid-string',
-        ];
-
         $this->repository->shouldReceive('findCountWhere')->with([
-            ['service_id', '=', $data['service_id']],
-            ['id', '=', $data['config_from']],
+            ['nest_id', '=', $model->nest_id],
+            ['id', '=', 12345],
         ])->once()->andReturn(1);
 
         $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
-        $this->repository->shouldReceive('create')->with($data, true, true)->once()->andReturn($model);
+        $this->repository->shouldReceive('create')->with([
+            'nest_id' => $model->nest_id,
+            'config_from' => 12345,
+            'uuid' => $this->getKnownUuid(),
+            'author' => 'test@example.com',
+        ], true, true)->once()->andReturn($model);
 
-        $response = $this->service->handle($data);
+        $response = $this->service->handle([
+            'nest_id' => $model->nest_id,
+            'config_from' => 12345,
+        ]);
 
         $this->assertNotEmpty($response);
         $this->assertEquals($response, $model);
     }
 
+    /**
+     * Test that certain data, such as the UUID or author takes priority over data
+     * that is passed into the function.
+     */
+    public function testDataProvidedByHandlerTakesPriorityOverPassedData()
+    {
+        $model = factory(Egg::class)->make();
+
+        $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
+        $this->repository->shouldReceive('create')->with([
+            'uuid' => $this->getKnownUuid(),
+            'author' => 'test@example.com',
+            'config_from' => null,
+            'name' => $model->name,
+        ], true, true)->once()->andReturn($model);
+
+        $response = $this->service->handle(['name' => $model->name, 'uuid' => 'should-be-ignored', 'author' => 'should-be-ignored']);
+
+        $this->assertNotEmpty($response);
+        $this->assertNull(object_get($response, 'config_from'));
+        $this->assertEquals($model->name, $response->name);
+    }
+
     /**
      * Test that an exception is thrown if no parent configuration can be located.
      */
     public function testExceptionIsThrownIfNoParentConfigurationIsFound()
     {
         $this->repository->shouldReceive('findCountWhere')->with([
-            ['service_id', '=', null],
+            ['nest_id', '=', null],
             ['id', '=', 1],
         ])->once()->andReturn(0);
 
         try {
             $this->service->handle(['config_from' => 1]);
-        } catch (Exception $exception) {
+        } catch (PterodactylException $exception) {
             $this->assertInstanceOf(NoParentConfigurationFoundException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.must_be_child'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.egg.must_be_child'), $exception->getMessage());
         }
     }
 }
diff --git a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php b/tests/Unit/Services/Eggs/EggDeletionServiceTest.php
similarity index 68%
rename from tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
rename to tests/Unit/Services/Eggs/EggDeletionServiceTest.php
index 875b3a547..c3ef3ef1b 100644
--- a/tests/Unit/Services/Services/Options/OptionDeletionServiceTest.php
+++ b/tests/Unit/Services/Eggs/EggDeletionServiceTest.php
@@ -11,14 +11,14 @@ namespace Tests\Unit\Services\Services\Options;
 
 use Mockery as m;
 use Tests\TestCase;
-use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Services\Eggs\EggDeletionService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\HasChildrenException;
 use Pterodactyl\Exceptions\Service\HasActiveServersException;
-use Pterodactyl\Services\Services\Options\EggDeletionService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\HasChildrenException;
 
-class OptionDeletionServiceTest extends TestCase
+class EggDeletionServiceTest extends TestCase
 {
     /**
      * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
@@ -31,7 +31,7 @@ class OptionDeletionServiceTest extends TestCase
     protected $serverRepository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\EggDeletionService
+     * @var \Pterodactyl\Services\Eggs\EggDeletionService
      */
     protected $service;
 
@@ -49,11 +49,11 @@ class OptionDeletionServiceTest extends TestCase
     }
 
     /**
-     * Test that option is deleted if no servers are found.
+     * Test that Egg is deleted if no servers are found.
      */
-    public function testOptionIsDeletedIfNoServersAreFound()
+    public function testEggIsDeletedIfNoServersAreFound()
     {
-        $this->serverRepository->shouldReceive('findCountWhere')->with([['option_id', '=', 1]])->once()->andReturn(0);
+        $this->serverRepository->shouldReceive('findCountWhere')->with([['egg_id', '=', 1]])->once()->andReturn(0);
         $this->repository->shouldReceive('findCountWhere')->with([['config_from', '=', 1]])->once()->andReturn(0);
         $this->repository->shouldReceive('delete')->with(1)->once()->andReturn(1);
 
@@ -61,33 +61,33 @@ class OptionDeletionServiceTest extends TestCase
     }
 
     /**
-     * Test that option is not deleted if servers are found.
+     * Test that Egg is not deleted if servers are found.
      */
     public function testExceptionIsThrownIfServersAreFound()
     {
-        $this->serverRepository->shouldReceive('findCountWhere')->with([['option_id', '=', 1]])->once()->andReturn(1);
+        $this->serverRepository->shouldReceive('findCountWhere')->with([['egg_id', '=', 1]])->once()->andReturn(1);
 
         try {
             $this->service->handle(1);
-        } catch (DisplayException $exception) {
+        } catch (PterodactylException $exception) {
             $this->assertInstanceOf(HasActiveServersException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.delete_has_servers'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.egg.delete_has_servers'), $exception->getMessage());
         }
     }
 
     /**
-     * Test that an exception is thrown if children options exist.
+     * Test that an exception is thrown if children Eggs exist.
      */
     public function testExceptionIsThrownIfChildrenArePresent()
     {
-        $this->serverRepository->shouldReceive('findCountWhere')->with([['option_id', '=', 1]])->once()->andReturn(0);
+        $this->serverRepository->shouldReceive('findCountWhere')->with([['egg_id', '=', 1]])->once()->andReturn(0);
         $this->repository->shouldReceive('findCountWhere')->with([['config_from', '=', 1]])->once()->andReturn(1);
 
         try {
             $this->service->handle(1);
-        } catch (DisplayException $exception) {
+        } catch (PterodactylException $exception) {
             $this->assertInstanceOf(HasChildrenException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.has_children'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.egg.has_children'), $exception->getMessage());
         }
     }
 }
diff --git a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php b/tests/Unit/Services/Eggs/EggUpdateServiceTest.php
similarity index 60%
rename from tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
rename to tests/Unit/Services/Eggs/EggUpdateServiceTest.php
index 0da64ca58..89f02c49c 100644
--- a/tests/Unit/Services/Services/Options/OptionUpdateServiceTest.php
+++ b/tests/Unit/Services/Eggs/EggUpdateServiceTest.php
@@ -13,11 +13,12 @@ use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
-use Pterodactyl\Services\Services\Options\EggUpdateService;
+use Pterodactyl\Services\Eggs\EggUpdateService;
+use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException;
+use Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException;
 
-class OptionUpdateServiceTest extends TestCase
+class EggUpdateServiceTest extends TestCase
 {
     /**
      * @var \Pterodactyl\Models\Egg
@@ -25,12 +26,12 @@ class OptionUpdateServiceTest extends TestCase
     protected $model;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Services\Services\Options\EggUpdateService
+     * @var \Pterodactyl\Services\Eggs\EggUpdateService
      */
     protected $service;
 
@@ -48,30 +49,34 @@ class OptionUpdateServiceTest extends TestCase
     }
 
     /**
-     * Test that an option is updated when no config_from attribute is passed.
+     * Test that an Egg is updated when no config_from attribute is passed.
      */
-    public function testOptionIsUpdatedWhenNoConfigFromIsProvided()
+    public function testEggIsUpdatedWhenNoConfigFromIsProvided()
     {
-        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('update')->with($this->model->id, ['test_field' => 'field_value'])->once()->andReturnNull();
+        $this->repository->shouldReceive('withoutFresh->update')
+            ->with($this->model->id, ['test_field' => 'field_value'])->once()->andReturnNull();
 
         $this->service->handle($this->model, ['test_field' => 'field_value']);
+
+        $this->assertTrue(true);
     }
 
     /**
-     * Test that option is updated when a valid config_from attribute is passed.
+     * Test that Egg is updated when a valid config_from attribute is passed.
      */
     public function testOptionIsUpdatedWhenValidConfigFromIsPassed()
     {
         $this->repository->shouldReceive('findCountWhere')->with([
-            ['service_id', '=', $this->model->service_id],
+            ['nest_id', '=', $this->model->nest_id],
             ['id', '=', 1],
         ])->once()->andReturn(1);
 
-        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('update')->with($this->model->id, ['config_from' => 1])->once()->andReturnNull();
+        $this->repository->shouldReceive('withoutFresh->update')
+            ->with($this->model->id, ['config_from' => 1])->once()->andReturnNull();
 
         $this->service->handle($this->model, ['config_from' => 1]);
+
+        $this->assertTrue(true);
     }
 
     /**
@@ -80,27 +85,29 @@ class OptionUpdateServiceTest extends TestCase
     public function testExceptionIsThrownIfInvalidParentConfigIsPassed()
     {
         $this->repository->shouldReceive('findCountWhere')->with([
-            ['service_id', '=', $this->model->service_id],
+            ['nest_id', '=', $this->model->nest_id],
             ['id', '=', 1],
         ])->once()->andReturn(0);
 
         try {
             $this->service->handle($this->model, ['config_from' => 1]);
-        } catch (Exception $exception) {
+        } catch (PterodactylException $exception) {
             $this->assertInstanceOf(NoParentConfigurationFoundException::class, $exception);
-            $this->assertEquals(trans('exceptions.service.options.must_be_child'), $exception->getMessage());
+            $this->assertEquals(trans('exceptions.nest.egg.must_be_child'), $exception->getMessage());
         }
     }
 
     /**
-     * Test that an integer linking to a model can be passed in place of the ServiceOption model.
+     * Test that an integer linking to a model can be passed in place of the Egg model.
      */
     public function testIntegerCanBePassedInPlaceOfModel()
     {
         $this->repository->shouldReceive('find')->with($this->model->id)->once()->andReturn($this->model);
-        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('update')->with($this->model->id, ['test_field' => 'field_value'])->once()->andReturnNull();
+        $this->repository->shouldReceive('withoutFresh->update')
+            ->with($this->model->id, ['test_field' => 'field_value'])->once()->andReturnNull();
 
         $this->service->handle($this->model->id, ['test_field' => 'field_value']);
+
+        $this->assertTrue(true);
     }
 }
diff --git a/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
index 7e8c37601..870482e68 100644
--- a/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
+++ b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
@@ -12,8 +12,8 @@ namespace Tests\Unit\Services\Services\Sharing;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Egg;
-use Tests\Traits\KnownUuid;
 use Pterodactyl\Models\Nest;
+use Tests\Traits\MocksUuids;
 use Illuminate\Http\UploadedFile;
 use Pterodactyl\Models\EggVariable;
 use Illuminate\Database\ConnectionInterface;
@@ -26,7 +26,7 @@ use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class EggImporterServiceTest extends TestCase
 {
-    use KnownUuid;
+    use MocksUuids;
 
     /**
      * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
diff --git a/tests/Unit/Services/Nests/NestCreationServiceTest.php b/tests/Unit/Services/Nests/NestCreationServiceTest.php
index 67467e87f..b5d38e071 100644
--- a/tests/Unit/Services/Nests/NestCreationServiceTest.php
+++ b/tests/Unit/Services/Nests/NestCreationServiceTest.php
@@ -12,15 +12,15 @@ namespace Tests\Unit\Services\Services;
 use Mockery as m;
 use Tests\TestCase;
 use Ramsey\Uuid\Uuid;
-use Tests\Traits\KnownUuid;
 use Pterodactyl\Models\Nest;
+use Tests\Traits\MocksUuids;
 use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Services\Nests\NestCreationService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 
 class NestCreationServiceTest extends TestCase
 {
-    use KnownUuid;
+    use MocksUuids;
 
     /**
      * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock

From 159ad3079f8b0a7bfc77d163a248d947534e4834 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 15:44:28 -0500
Subject: [PATCH 28/34] Fix existing tests

---
 .../Packs/PackCreationServiceTest.php         | 29 +++++++------------
 .../Services/Packs/PackUpdateServiceTest.php  | 16 +++++-----
 .../Packs/TemplateUploadServiceTest.php       | 13 ++++-----
 .../Servers/ServerCreationServiceTest.php     | 25 ++++++++--------
 .../Servers/VariableValidatorServiceTest.php  |  8 ++---
 5 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/tests/Unit/Services/Packs/PackCreationServiceTest.php b/tests/Unit/Services/Packs/PackCreationServiceTest.php
index 518fa9090..972ee7a45 100644
--- a/tests/Unit/Services/Packs/PackCreationServiceTest.php
+++ b/tests/Unit/Services/Packs/PackCreationServiceTest.php
@@ -13,6 +13,7 @@ use Exception;
 use Mockery as m;
 use Tests\TestCase;
 use Pterodactyl\Models\Pack;
+use Tests\Traits\MocksUuids;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Database\ConnectionInterface;
@@ -23,18 +24,20 @@ use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationServiceTest extends TestCase
 {
+    use MocksUuids;
+
     /**
-     * @var \Illuminate\Database\ConnectionInterface
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
      */
     protected $connection;
 
     /**
-     * @var \Illuminate\Http\UploadedFile
+     * @var \Illuminate\Http\UploadedFile|\Mockery\Mock
      */
     protected $file;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -44,15 +47,10 @@ class PackCreationServiceTest extends TestCase
     protected $service;
 
     /**
-     * @var \Illuminate\Contracts\Filesystem\Factory
+     * @var \Illuminate\Contracts\Filesystem\Factory|\Mockery\Mock
      */
     protected $storage;
 
-    /**
-     * @var \Ramsey\Uuid\Uuid
-     */
-    protected $uuid;
-
     /**
      * Setup tests.
      */
@@ -64,7 +62,6 @@ class PackCreationServiceTest extends TestCase
         $this->file = m::mock(UploadedFile::class);
         $this->repository = m::mock(PackRepositoryInterface::class);
         $this->storage = m::mock(Factory::class);
-        $this->uuid = m::mock('overload:\Ramsey\Uuid\Uuid');
 
         $this->service = new PackCreationService($this->connection, $this->storage, $this->repository);
     }
@@ -77,17 +74,15 @@ class PackCreationServiceTest extends TestCase
         $model = factory(Pack::class)->make();
 
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4')->withNoArgs()->once()->andReturn($model->uuid);
         $this->repository->shouldReceive('create')->with([
-            'uuid' => $model->uuid,
+            'uuid' => $this->getKnownUuid(),
             'selectable' => false,
             'visible' => false,
             'locked' => false,
             'test-data' => 'value',
         ])->once()->andReturn($model);
 
-        $this->storage->shouldReceive('disk')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('makeDirectory')->with('packs/' . $model->uuid)->once()->andReturnNull();
+        $this->storage->shouldReceive('disk->makeDirectory')->with('packs/' . $model->uuid)->once()->andReturnNull();
         $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
 
         $response = $this->service->handle(['test-data' => 'value']);
@@ -107,17 +102,15 @@ class PackCreationServiceTest extends TestCase
         $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('getMimeType')->withNoArgs()->once()->andReturn($mime);
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4')->withNoArgs()->once()->andReturn($model->uuid);
         $this->repository->shouldReceive('create')->with([
-            'uuid' => $model->uuid,
+            'uuid' => $this->getKnownUuid(),
             'selectable' => false,
             'visible' => false,
             'locked' => false,
             'test-data' => 'value',
         ])->once()->andReturn($model);
 
-        $this->storage->shouldReceive('disk')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('makeDirectory')->with('packs/' . $model->uuid)->once()->andReturnNull();
+        $this->storage->shouldReceive('disk->makeDirectory')->with('packs/' . $model->uuid)->once()->andReturnNull();
         $this->file->shouldReceive('storeAs')->with('packs/' . $model->uuid, 'archive.tar.gz')->once()->andReturnNull();
         $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
 
diff --git a/tests/Unit/Services/Packs/PackUpdateServiceTest.php b/tests/Unit/Services/Packs/PackUpdateServiceTest.php
index 02dd45fd4..8a09311f1 100644
--- a/tests/Unit/Services/Packs/PackUpdateServiceTest.php
+++ b/tests/Unit/Services/Packs/PackUpdateServiceTest.php
@@ -20,12 +20,12 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 class PackUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\PackRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $serverRepository;
 
@@ -53,8 +53,7 @@ class PackUpdateServiceTest extends TestCase
     public function testPackIsUpdated()
     {
         $model = factory(Pack::class)->make();
-        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('update')->with($model->id, [
+        $this->repository->shouldReceive('withoutFresh->update')->with($model->id, [
                 'locked' => false,
                 'visible' => false,
                 'selectable' => false,
@@ -67,13 +66,13 @@ class PackUpdateServiceTest extends TestCase
     /**
      * Test that an exception is thrown if the pack option ID is changed while servers are using the pack.
      */
-    public function testExceptionIsThrownIfModifyingOptionIdWhenServersAreAttached()
+    public function testExceptionIsThrownIfModifyingEggIdWhenServersAreAttached()
     {
         $model = factory(Pack::class)->make();
         $this->serverRepository->shouldReceive('findCountWhere')->with([['pack_id', '=', $model->id]])->once()->andReturn(1);
 
         try {
-            $this->service->handle($model, ['option_id' => 0]);
+            $this->service->handle($model, ['egg_id' => 0]);
         } catch (HasActiveServersException $exception) {
             $this->assertEquals(trans('exceptions.packs.update_has_servers'), $exception->getMessage());
         }
@@ -86,10 +85,9 @@ class PackUpdateServiceTest extends TestCase
     {
         $model = factory(Pack::class)->make();
 
-        $this->repository->shouldReceive('withColumns')->with(['id', 'option_id'])->once()->andReturnSelf()
+        $this->repository->shouldReceive('withColumns')->with(['id', 'egg_id'])->once()->andReturnSelf()
             ->shouldReceive('find')->with($model->id)->once()->andReturn($model);
-        $this->repository->shouldReceive('withoutFresh')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('update')->with($model->id, [
+        $this->repository->shouldReceive('withoutFresh->update')->with($model->id, [
                 'locked' => false,
                 'visible' => false,
                 'selectable' => false,
diff --git a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
index 115241087..4082fdd59 100644
--- a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
+++ b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
@@ -27,17 +27,17 @@ class TemplateUploadServiceTest extends TestCase
     const JSON_FILE_CONTENTS = '{"test_content": "value"}';
 
     /**
-     * @var \ZipArchive
+     * @var \ZipArchive|\Mockery\Mock
      */
     protected $archive;
 
     /**
-     * @var \Pterodactyl\Services\Packs\PackCreationService
+     * @var \Pterodactyl\Services\Packs\PackCreationService|\Mockery\Mock
      */
     protected $creationService;
 
     /**
-     * @var \Illuminate\Http\UploadedFile
+     * @var \Illuminate\Http\UploadedFile|\Mockery\Mock
      */
     protected $file;
 
@@ -70,10 +70,9 @@ class TemplateUploadServiceTest extends TestCase
         $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
         $this->file->shouldReceive('getMimeType')->withNoArgs()->twice()->andReturn($mime);
         $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(128);
-        $this->file->shouldReceive('openFile')->withNoArgs()->once()->andReturnSelf()
-            ->shouldReceive('fread')->with(128)->once()->andReturn(self::JSON_FILE_CONTENTS);
+        $this->file->shouldReceive('openFile->fread')->with(128)->once()->andReturn(self::JSON_FILE_CONTENTS);
 
-        $this->creationService->shouldReceive('handle')->with(['test_content' => 'value', 'option_id' => 1])
+        $this->creationService->shouldReceive('handle')->with(['test_content' => 'value', 'egg_id' => 1])
             ->once()->andReturn(factory(Pack::class)->make());
 
         $this->assertInstanceOf(Pack::class, $this->service->handle(1, $this->file));
@@ -94,7 +93,7 @@ class TemplateUploadServiceTest extends TestCase
         $this->archive->shouldReceive('locateName')->with('import.json')->once()->andReturn(true);
         $this->archive->shouldReceive('locateName')->with('archive.tar.gz')->once()->andReturn(true);
         $this->archive->shouldReceive('getFromName')->with('import.json')->once()->andReturn(self::JSON_FILE_CONTENTS);
-        $this->creationService->shouldReceive('handle')->with(['test_content' => 'value', 'option_id' => 1])
+        $this->creationService->shouldReceive('handle')->with(['test_content' => 'value', 'egg_id' => 1])
             ->once()->andReturn($model);
         $this->archive->shouldReceive('extractTo')->with(storage_path('app/packs/' . $model->uuid), 'archive.tar.gz')
             ->once()->andReturn(true);
diff --git a/tests/Unit/Services/Servers/ServerCreationServiceTest.php b/tests/Unit/Services/Servers/ServerCreationServiceTest.php
index 0b22486e5..da2e33af2 100644
--- a/tests/Unit/Services/Servers/ServerCreationServiceTest.php
+++ b/tests/Unit/Services/Servers/ServerCreationServiceTest.php
@@ -12,6 +12,7 @@ namespace Tests\Unit\Services\Servers;
 use Mockery as m;
 use Tests\TestCase;
 use phpmock\phpunit\PHPMock;
+use Tests\Traits\MocksUuids;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\PterodactylException;
@@ -32,7 +33,7 @@ use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonS
  */
 class ServerCreationServiceTest extends TestCase
 {
-    use PHPMock;
+    use MocksUuids, PHPMock;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface|\Mockery\Mock
@@ -72,8 +73,8 @@ class ServerCreationServiceTest extends TestCase
         'environment' => [
             'TEST_VAR_1' => 'var1-value',
         ],
-        'service_id' => 1,
-        'option_id' => 1,
+        'nest_id' => 1,
+        'egg_id' => 1,
         'startup' => 'startup-param',
         'docker_image' => 'some/image',
     ];
@@ -118,11 +119,6 @@ class ServerCreationServiceTest extends TestCase
      */
     protected $validatorService;
 
-    /**
-     * @var \Ramsey\Uuid\Uuid|\Mockery\Mock
-     */
-    protected $uuid;
-
     /**
      * Setup tests.
      */
@@ -141,7 +137,6 @@ class ServerCreationServiceTest extends TestCase
         $this->userRepository = m::mock(UserRepositoryInterface::class);
         $this->usernameService = m::mock(UsernameGenerationService::class);
         $this->validatorService = m::mock(VariableValidatorService::class);
-        $this->uuid = m::mock('overload:Ramsey\Uuid\Uuid');
 
         $this->getFunctionMock('\\Pterodactyl\\Services\\Servers', 'str_random')
             ->expects($this->any())->willReturn('random_string');
@@ -167,14 +162,19 @@ class ServerCreationServiceTest extends TestCase
     {
         $this->validatorService->shouldReceive('isAdmin')->withNoArgs()->once()->andReturnSelf()
             ->shouldReceive('setFields')->with($this->data['environment'])->once()->andReturnSelf()
-            ->shouldReceive('validate')->with($this->data['option_id'])->once()->andReturnSelf();
+            ->shouldReceive('validate')->with($this->data['egg_id'])->once()->andReturnSelf();
 
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
         $this->usernameService->shouldReceive('generate')->with($this->data['name'], 'random_string')
             ->once()->andReturn('user_name');
 
-        $this->repository->shouldReceive('create')->withAnyArgs()->once()->andReturn((object) [
+        $this->repository->shouldReceive('create')->with(m::subset([
+            'uuid' => $this->getKnownUuid(),
+            'node_id' => $this->data['node_id'],
+            'owner_id' => 1,
+            'nest_id' => 1,
+            'egg_id' => 1,
+        ]))->once()->andReturn((object) [
             'node_id' => 1,
             'id' => 1,
         ]);
@@ -212,7 +212,6 @@ class ServerCreationServiceTest extends TestCase
         $this->validatorService->shouldReceive('isAdmin->setFields->validate->getResults')->once()->andReturn([]);
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
         $this->usernameService->shouldReceive('generate')->once()->andReturn('user_name');
-        $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
         $this->repository->shouldReceive('create')->once()->andReturn((object) [
             'node_id' => 1,
             'id' => 1,
diff --git a/tests/Unit/Services/Servers/VariableValidatorServiceTest.php b/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
index 2e9c5fc60..ce2eaf7d8 100644
--- a/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
+++ b/tests/Unit/Services/Servers/VariableValidatorServiceTest.php
@@ -115,7 +115,7 @@ class VariableValidatorServiceTest extends TestCase
      */
     public function testEmptyResultSetShouldBeReturnedIfNoVariablesAreFound()
     {
-        $this->optionVariableRepository->shouldReceive('findWhere')->with([['option_id', '=', 1]])->andReturn([]);
+        $this->optionVariableRepository->shouldReceive('findWhere')->with([['egg_id', '=', 1]])->andReturn([]);
 
         $response = $this->service->validate(1);
 
@@ -129,7 +129,7 @@ class VariableValidatorServiceTest extends TestCase
      */
     public function testValidatorShouldNotProcessVariablesSetAsNotUserEditableWhenAdminFlagIsNotPassed()
     {
-        $this->optionVariableRepository->shouldReceive('findWhere')->with([['option_id', '=', 1]])->andReturn($this->variables);
+        $this->optionVariableRepository->shouldReceive('findWhere')->with([['egg_id', '=', 1]])->andReturn($this->variables);
 
         $this->validator->shouldReceive('make')->with([
             'variable_value' => 'Test_SomeValue_0',
@@ -161,7 +161,7 @@ class VariableValidatorServiceTest extends TestCase
      */
     public function testValidatorShouldProcessAllVariablesWhenAdminFlagIsSet()
     {
-        $this->optionVariableRepository->shouldReceive('findWhere')->with([['option_id', '=', 1]])->andReturn($this->variables);
+        $this->optionVariableRepository->shouldReceive('findWhere')->with([['egg_id', '=', 1]])->andReturn($this->variables);
 
         foreach ($this->variables as $key => $variable) {
             $this->validator->shouldReceive('make')->with([
@@ -198,7 +198,7 @@ class VariableValidatorServiceTest extends TestCase
      */
     public function testValidatorShouldThrowExceptionWhenAValidationErrorIsEncountered()
     {
-        $this->optionVariableRepository->shouldReceive('findWhere')->with([['option_id', '=', 1]])->andReturn($this->variables);
+        $this->optionVariableRepository->shouldReceive('findWhere')->with([['egg_id', '=', 1]])->andReturn($this->variables);
 
         $this->validator->shouldReceive('make')->with([
             'variable_value' => null,

From 864513c44b9630183f9468b7c0bad8f4c7180fed Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 20:57:59 -0500
Subject: [PATCH 29/34] Fix failing test suite

---
 app/Repositories/Wings/ServerRepository.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Repositories/Wings/ServerRepository.php b/app/Repositories/Wings/ServerRepository.php
index 71774f3b4..3a7653d96 100644
--- a/app/Repositories/Wings/ServerRepository.php
+++ b/app/Repositories/Wings/ServerRepository.php
@@ -9,6 +9,7 @@
 
 namespace Pterodactyl\Repositories\Wings;
 
+use Psr\Http\Message\ResponseInterface;
 use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
 
@@ -17,7 +18,7 @@ class ServerRepository extends BaseRepository implements ServerRepositoryInterfa
     /**
      * {@inheritdoc}
      */
-    public function create($id, array $overrides = [], $start = false)
+    public function create(array $structure, array $overrides = []): ResponseInterface
     {
         throw new PterodactylException('This feature is not yet implemented.');
     }

From aaf96669d4cb0ad5f87a2cbe2d0eedfcc1e16744 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 21:36:22 -0500
Subject: [PATCH 30/34] Misc fixes

---
 .../API/Remote/EggRetrievalController.php     |  6 ++---
 .../Admin/Nests/EggShareController.php        | 16 +++++++++---
 .../EggImportFormRequest.php}                 |  6 ++---
 .../Service/ServiceFunctionsFormRequest.php   | 25 -------------------
 app/Models/Egg.php                            |  3 +++
 app/Models/Nest.php                           |  2 +-
 app/Services/Eggs/EggConfigurationService.php | 16 ++++++------
 .../Eggs/Sharing/EggExporterService.php       |  1 +
 .../Eggs/Sharing/EggImporterService.php       |  1 +
 .../ServerConfigurationStructureService.php   |  2 +-
 resources/lang/en/admin/nests.php             |  1 +
 .../pterodactyl/admin/eggs/view.blade.php     | 24 ++++++++++++------
 .../pterodactyl/admin/nests/index.blade.php   |  6 ++---
 .../pterodactyl/admin/nests/view.blade.php    |  4 +--
 routes/api-remote.php                         |  2 +-
 15 files changed, 58 insertions(+), 57 deletions(-)
 rename app/Http/Requests/Admin/{Service/OptionImportFormRequest.php => Egg/EggImportFormRequest.php} (71%)
 delete mode 100644 app/Http/Requests/Admin/Service/ServiceFunctionsFormRequest.php

diff --git a/app/Http/Controllers/API/Remote/EggRetrievalController.php b/app/Http/Controllers/API/Remote/EggRetrievalController.php
index 28a60c5b4..6e45ae346 100644
--- a/app/Http/Controllers/API/Remote/EggRetrievalController.php
+++ b/app/Http/Controllers/API/Remote/EggRetrievalController.php
@@ -47,11 +47,11 @@ class EggRetrievalController extends Controller
      */
     public function index(): JsonResponse
     {
-        $options = $this->repository->getAllWithCopyAttributes();
+        $eggs = $this->repository->getAllWithCopyAttributes();
 
         $response = [];
-        $options->each(function ($option) use (&$response) {
-            $response[$option->uuid] = sha1(json_encode($this->configurationFileService->handle($option)));
+        $eggs->each(function ($egg) use (&$response) {
+            $response[$egg->uuid] = sha1(json_encode($this->configurationFileService->handle($egg)));
         });
 
         return response()->json($response);
diff --git a/app/Http/Controllers/Admin/Nests/EggShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php
index a9808d6cf..8a4e9e76d 100644
--- a/app/Http/Controllers/Admin/Nests/EggShareController.php
+++ b/app/Http/Controllers/Admin/Nests/EggShareController.php
@@ -11,14 +11,20 @@ namespace Pterodactyl\Http\Controllers\Admin\Nests;
 
 use Pterodactyl\Models\Egg;
 use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
-use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
+use Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest;
 
 class EggShareController extends Controller
 {
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
     /**
      * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
      */
@@ -32,13 +38,16 @@ class EggShareController extends Controller
     /**
      * OptionShareController constructor.
      *
+     * @param \Prologue\Alerts\AlertsMessageBag                     $alert
      * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService
      * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService
      */
     public function __construct(
+        AlertsMessageBag $alert,
         EggExporterService $exporterService,
         EggImporterService $importerService
     ) {
+        $this->alert = $alert;
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
     }
@@ -62,16 +71,17 @@ class EggShareController extends Controller
     /**
      * Import a new service option using an XML file.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest $request
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
      */
-    public function import(OptionImportFormRequest $request): RedirectResponse
+    public function import(EggImportFormRequest $request): RedirectResponse
     {
         $egg = $this->importerService->handle($request->file('import_file'), $request->input('import_to_nest'));
+        $this->alert->success(trans('admin/nests.eggs.notices.imported'))->flash();
 
         return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }
diff --git a/app/Http/Requests/Admin/Service/OptionImportFormRequest.php b/app/Http/Requests/Admin/Egg/EggImportFormRequest.php
similarity index 71%
rename from app/Http/Requests/Admin/Service/OptionImportFormRequest.php
rename to app/Http/Requests/Admin/Egg/EggImportFormRequest.php
index 5c464c658..776c291e2 100644
--- a/app/Http/Requests/Admin/Service/OptionImportFormRequest.php
+++ b/app/Http/Requests/Admin/Egg/EggImportFormRequest.php
@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class OptionImportFormRequest extends AdminFormRequest
+class EggImportFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -20,7 +20,7 @@ class OptionImportFormRequest extends AdminFormRequest
     {
         return [
             'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
-            'import_to_service' => 'bail|required|integer|exists:services,id',
+            'import_to_nest' => 'bail|required|integer|exists:nests,id',
         ];
     }
 }
diff --git a/app/Http/Requests/Admin/Service/ServiceFunctionsFormRequest.php b/app/Http/Requests/Admin/Service/ServiceFunctionsFormRequest.php
deleted file mode 100644
index 249593507..000000000
--- a/app/Http/Requests/Admin/Service/ServiceFunctionsFormRequest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-
-namespace Pterodactyl\Http\Requests\Admin\Service;
-
-use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
-
-class ServiceFunctionsFormRequest extends AdminFormRequest
-{
-    /**
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'index_file' => 'required|nullable|string',
-        ];
-    }
-}
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
index 76696ac7b..1c1b9e815 100644
--- a/app/Models/Egg.php
+++ b/app/Models/Egg.php
@@ -65,8 +65,10 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      */
     protected static $applicationRules = [
         'nest_id' => 'required',
+        'uuid' => 'required',
         'name' => 'required',
         'description' => 'required',
+        'author' => 'required',
         'docker_image' => 'required',
         'startup' => 'required',
         'config_from' => 'sometimes',
@@ -84,6 +86,7 @@ class Egg extends Model implements CleansAttributes, ValidableContract
         'uuid' => 'string|size:36',
         'name' => 'string|max:255',
         'description' => 'string',
+        'author' => 'string|email',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
         'config_from' => 'bail|nullable|numeric|exists:eggs,id',
diff --git a/app/Models/Nest.php b/app/Models/Nest.php
index 1be898c05..3631bc6e3 100644
--- a/app/Models/Nest.php
+++ b/app/Models/Nest.php
@@ -49,7 +49,7 @@ class Nest extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'author' => 'email',
+        'author' => 'string|email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
     ];
diff --git a/app/Services/Eggs/EggConfigurationService.php b/app/Services/Eggs/EggConfigurationService.php
index b308ca1e5..a73e3f6a8 100644
--- a/app/Services/Eggs/EggConfigurationService.php
+++ b/app/Services/Eggs/EggConfigurationService.php
@@ -32,22 +32,22 @@ class EggConfigurationService
     /**
      * Return an Egg file to be used by the Daemon.
      *
-     * @param int|\Pterodactyl\Models\Egg $option
+     * @param int|\Pterodactyl\Models\Egg $egg
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($option): array
+    public function handle($egg): array
     {
-        if (! $option instanceof Egg) {
-            $option = $this->repository->getWithCopyAttributes($option);
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->getWithCopyAttributes($egg);
         }
 
         return [
-            'startup' => json_decode($option->inherit_config_startup),
-            'stop' => $option->inherit_config_stop,
-            'configs' => json_decode($option->inherit_config_files),
-            'log' => json_decode($option->inherit_config_logs),
+            'startup' => json_decode($egg->inherit_config_startup),
+            'stop' => $egg->inherit_config_stop,
+            'configs' => json_decode($egg->inherit_config_files),
+            'log' => json_decode($egg->inherit_config_logs),
             'query' => 'none',
         ];
     }
diff --git a/app/Services/Eggs/Sharing/EggExporterService.php b/app/Services/Eggs/Sharing/EggExporterService.php
index 82d68fe36..25a7131fa 100644
--- a/app/Services/Eggs/Sharing/EggExporterService.php
+++ b/app/Services/Eggs/Sharing/EggExporterService.php
@@ -51,6 +51,7 @@ class EggExporterService
             'author' => $egg->author,
             'description' => $egg->description,
             'image' => $egg->docker_image,
+            'startup' => $egg->startup,
             'config' => [
                 'files' => $egg->inherit_config_files,
                 'startup' => $egg->inherit_config_startup,
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index d42c51ccf..3155eefe8 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -89,6 +89,7 @@ class EggImporterService
         $egg = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
             'nest_id' => $nest->id,
+            'author' => object_get($parsed, 'author'),
             'name' => object_get($parsed, 'name'),
             'description' => object_get($parsed, 'description'),
             'docker_image' => object_get($parsed, 'image'),
diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php
index 78fee994a..b92191711 100644
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@@ -72,7 +72,7 @@ class ServerConfigurationStructureService
             ],
             'keys' => [],
             'service' => [
-                'option' => $server->option->uuid,
+                'egg' => $server->egg->uuid,
                 'pack' => object_get($server, 'pack.uuid'),
                 'skip_scripts' => $server->skip_scripts,
             ],
diff --git a/resources/lang/en/admin/nests.php b/resources/lang/en/admin/nests.php
index 6ddb44fac..b78af4903 100644
--- a/resources/lang/en/admin/nests.php
+++ b/resources/lang/en/admin/nests.php
@@ -15,6 +15,7 @@ return [
     ],
     'eggs' => [
         'notices' => [
+            'imported' => 'Successfully imported this Egg and its associated variables.',
             'deleted' => 'Successfully deleted the requested egg from the Panel.',
             'updated' => 'Egg configuration has been updated successfully.',
             'script_updated' => 'Egg install script has been updated and will run whenever servers are installed.',
diff --git a/resources/themes/pterodactyl/admin/eggs/view.blade.php b/resources/themes/pterodactyl/admin/eggs/view.blade.php
index dc99434eb..215273005 100644
--- a/resources/themes/pterodactyl/admin/eggs/view.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/view.blade.php
@@ -52,20 +52,30 @@
                                 <p class="text-muted small">A simple, human-readable name to use as an identifier for this Egg.</p>
                             </div>
                             <div class="form-group">
-                                <label for="pDescription" class="control-label">Description <span class="field-required"></span></label>
-                                <textarea id="pDescription" name="description" class="form-control" rows="10">{{ $egg->description }}</textarea>
-                                <p class="text-muted small">A description of this Egg that will be displayed throughout the Panel as needed.</p>
+                                <label for="pUuid" class="control-label">UUID</label>
+                                <input type="text" id="pUuid" readonly value="{{ $egg->uuid }}" class="form-control" />
+                                <p class="text-muted small">This is the globally unique identifier for this Egg which the Daemon uses as an identifier.</p>
+                            </div>
+                            <div class="form-group">
+                                <label for="pAuthor" class="control-label">Author</label>
+                                <input type="text" id="pAuthor" readonly value="{{ $egg->author }}" class="form-control" />
+                                <p class="text-muted small">The author of this version of the Egg. Uploading a new Egg configuration from a different author will change this.</p>
                             </div>
-                        </div>
-                        <div class="col-sm-6">
                             <div class="form-group">
                                 <label for="pDockerImage" class="control-label">Docker Image <span class="field-required"></span></label>
                                 <input type="text" id="pDockerImage" name="docker_image" value="{{ $egg->docker_image }}" class="form-control" />
                                 <p class="text-muted small">The default docker image that should be used for new servers using this Egg. This can be changed per-server as needed.</p>
                             </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label for="pDescription" class="control-label">Description <span class="field-required"></span></label>
+                                <textarea id="pDescription" name="description" class="form-control" rows="6">{{ $egg->description }}</textarea>
+                                <p class="text-muted small">A description of this Egg that will be displayed throughout the Panel as needed.</p>
+                            </div>
                             <div class="form-group">
                                 <label for="pStartup" class="control-label">Startup Command <span class="field-required"></span></label>
-                                <textarea id="pStartup" name="startup" class="form-control" rows="9">{{ $egg->startup }}</textarea>
+                                <textarea id="pStartup" name="startup" class="form-control" rows="6">{{ $egg->startup }}</textarea>
                                 <p class="text-muted small">The default statup command that should be used for new servers using this Egg.</p>
                             </div>
                         </div>
@@ -141,7 +151,7 @@
     <script>
     $('#pConfigFrom').select2();
     $('#deleteButton').on('mouseenter', function (event) {
-        $(this).find('i').html(' Delete Option');
+        $(this).find('i').html(' Delete Egg');
     }).on('mouseleave', function (event) {
         $(this).find('i').html('');
     });
diff --git a/resources/themes/pterodactyl/admin/nests/index.blade.php b/resources/themes/pterodactyl/admin/nests/index.blade.php
index c19a8099c..dd47a55d3 100644
--- a/resources/themes/pterodactyl/admin/nests/index.blade.php
+++ b/resources/themes/pterodactyl/admin/nests/index.blade.php
@@ -75,9 +75,9 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label" for="pImportToService">Associated Nest <span class="field-required"></span></label>
+                        <label class="control-label" for="pImportToNest">Associated Nest <span class="field-required"></span></label>
                         <div>
-                            <select id="pImportToService" name="import_to_service">
+                            <select id="pImportToNest" name="import_to_nest">
                                 @foreach($nests as $nest)
                                    <option value="{{ $nest->id }}">{{ $nest->name }} &lt;{{ $nest->author }}&gt;</option>
                                 @endforeach
@@ -101,7 +101,7 @@
     @parent
     <script>
         $(document).ready(function() {
-            $('#pImportToService').select2();
+            $('#pImportToNest').select2();
         });
     </script>
 @endsection
diff --git a/resources/themes/pterodactyl/admin/nests/view.blade.php b/resources/themes/pterodactyl/admin/nests/view.blade.php
index 32e229579..2f30932fa 100644
--- a/resources/themes/pterodactyl/admin/nests/view.blade.php
+++ b/resources/themes/pterodactyl/admin/nests/view.blade.php
@@ -83,7 +83,7 @@
                     </tr>
                     @foreach($nest->eggs as $egg)
                         <tr>
-                            <td class="align-middle"><a href="{{ route('admin.nests.egg.view', $egg->id) }}">{{ $egg->name }}</a></td>
+                            <td class="align-middle"><a href="{{ route('admin.nests.egg.view', $egg->id) }}" data-toggle="tooltip" data-placement="right" title="{{ $egg->author }}">{{ $egg->name }}</a></td>
                             <td class="col-xs-8 align-middle">{!! $egg->description !!}</td>
                             <td class="text-center align-middle"><code>{{ $egg->servers->count() }}</code></td>
                             <td class="align-middle">
@@ -105,7 +105,7 @@
     @parent
     <script>
         $('#deleteButton').on('mouseenter', function (event) {
-            $(this).find('i').html(' Delete Service');
+            $(this).find('i').html(' Delete Nest');
         }).on('mouseleave', function (event) {
             $(this).find('i').html('');
         });
diff --git a/routes/api-remote.php b/routes/api-remote.php
index 4aee4341f..28f1edb38 100644
--- a/routes/api-remote.php
+++ b/routes/api-remote.php
@@ -9,6 +9,6 @@
 Route::get('/authenticate/{token}', 'ValidateKeyController@index')->name('api.remote.authenticate');
 
 Route::group(['prefix' => '/eggs'], function () {
-    Route::get('/', 'EggRetrievalController@download@index')->name('api.remote.eggs');
+    Route::get('/', 'EggRetrievalController@index')->name('api.remote.eggs');
     Route::get('/{uuid}', 'EggRetrievalController@download')->name('api.remote.eggs.download');
 });

From e2cb789b2b2b70f2602766f4ce435c8a2592ac83 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 23:44:27 -0500
Subject: [PATCH 31/34] Stop Dane from submitting invalid arrays and breaking
 the entire application...

---
 app/Repositories/Eloquent/EloquentRepository.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Repositories/Eloquent/EloquentRepository.php b/app/Repositories/Eloquent/EloquentRepository.php
index d6d82f7ab..ea333d2dc 100644
--- a/app/Repositories/Eloquent/EloquentRepository.php
+++ b/app/Repositories/Eloquent/EloquentRepository.php
@@ -249,6 +249,10 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
         Assert::boolean($validate, 'Third argument passed to updateOrCreate must be boolean, received %s.');
         Assert::boolean($force, 'Fourth argument passed to updateOrCreate must be boolean, received %s.');
 
+        foreach ($where as $item) {
+            Assert::true(is_scalar($item) || is_null($item), 'First argument passed to updateOrCreate should be an array of scalar or null values, received an array value of %s.');
+        }
+
         $instance = $this->withColumns('id')->findWhere($where)->first();
 
         if (! $instance) {

From e01d7497f56f8486d1296b7949374e061f9bb5ed Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 8 Oct 2017 23:50:52 -0500
Subject: [PATCH 32/34] Add ability to update an Egg by re-uploading a file.

---
 .../Service/Egg/BadJsonFormatException.php    |   9 +
 .../{Pack => }/InvalidFileUploadException.php |   2 +-
 .../Admin/Nests/EggShareController.php        |  40 +++-
 app/Http/Controllers/Admin/PackController.php |   2 +-
 .../Admin/Egg/EggImportFormRequest.php        |   9 +-
 .../Eggs/Sharing/EggImporterService.php       |  11 +-
 .../Eggs/Sharing/EggUpdateImporterService.php | 113 ++++++++++
 app/Services/Packs/PackCreationService.php    |   4 +-
 app/Services/Packs/TemplateUploadService.php  |   6 +-
 resources/lang/en/admin/nests.php             |   1 +
 resources/lang/en/exceptions.php              |   1 +
 .../pterodactyl/admin/eggs/view.blade.php     |  31 ++-
 routes/admin.php                              |   2 +
 .../Eggs/Sharing/EggImporterServiceTest.php   |  25 ++-
 .../Sharing/EggUpdateImporterServiceTest.php  | 212 ++++++++++++++++++
 .../Packs/PackCreationServiceTest.php         |   2 +-
 .../Packs/TemplateUploadServiceTest.php       |   2 +-
 17 files changed, 449 insertions(+), 23 deletions(-)
 create mode 100644 app/Exceptions/Service/Egg/BadJsonFormatException.php
 rename app/Exceptions/Service/{Pack => }/InvalidFileUploadException.php (87%)
 create mode 100644 app/Services/Eggs/Sharing/EggUpdateImporterService.php
 create mode 100644 tests/Unit/Services/Eggs/Sharing/EggUpdateImporterServiceTest.php

diff --git a/app/Exceptions/Service/Egg/BadJsonFormatException.php b/app/Exceptions/Service/Egg/BadJsonFormatException.php
new file mode 100644
index 000000000..0246f031c
--- /dev/null
+++ b/app/Exceptions/Service/Egg/BadJsonFormatException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Egg;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class BadJsonFormatException extends DisplayException
+{
+}
diff --git a/app/Exceptions/Service/Pack/InvalidFileUploadException.php b/app/Exceptions/Service/InvalidFileUploadException.php
similarity index 87%
rename from app/Exceptions/Service/Pack/InvalidFileUploadException.php
rename to app/Exceptions/Service/InvalidFileUploadException.php
index 36a1194bf..6d0585d2a 100644
--- a/app/Exceptions/Service/Pack/InvalidFileUploadException.php
+++ b/app/Exceptions/Service/InvalidFileUploadException.php
@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\Pack;
+namespace Pterodactyl\Exceptions\Service;
 
 use Pterodactyl\Exceptions\DisplayException;
 
diff --git a/app/Http/Controllers/Admin/Nests/EggShareController.php b/app/Http/Controllers/Admin/Nests/EggShareController.php
index 8a4e9e76d..b56f8fd2f 100644
--- a/app/Http/Controllers/Admin/Nests/EggShareController.php
+++ b/app/Http/Controllers/Admin/Nests/EggShareController.php
@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
 use Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest;
+use Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService;
 
 class EggShareController extends Controller
 {
@@ -35,21 +36,29 @@ class EggShareController extends Controller
      */
     protected $importerService;
 
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService
+     */
+    protected $updateImporterService;
+
     /**
      * OptionShareController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                     $alert
-     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService
-     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService
+     * @param \Prologue\Alerts\AlertsMessageBag                           $alert
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService       $exporterService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService       $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService $updateImporterService
      */
     public function __construct(
         AlertsMessageBag $alert,
         EggExporterService $exporterService,
-        EggImporterService $importerService
+        EggImporterService $importerService,
+        EggUpdateImporterService $updateImporterService
     ) {
         $this->alert = $alert;
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
+        $this->updateImporterService = $updateImporterService;
     }
 
     /**
@@ -76,7 +85,8 @@ class EggShareController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function import(EggImportFormRequest $request): RedirectResponse
     {
@@ -85,4 +95,24 @@ class EggShareController extends Controller
 
         return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }
+
+    /**
+     * Update an existing Egg using a new imported file.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
+     * @param int                                                       $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function update(EggImportFormRequest $request, int $egg): RedirectResponse
+    {
+        $this->updateImporterService->handle($egg, $request->file('import_file'));
+        $this->alert->success(trans('admin/nests.eggs.notices.updated_via_import'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg]);
+    }
 }
diff --git a/app/Http/Controllers/Admin/PackController.php b/app/Http/Controllers/Admin/PackController.php
index 742f1ed0a..ae6c86fda 100644
--- a/app/Http/Controllers/Admin/PackController.php
+++ b/app/Http/Controllers/Admin/PackController.php
@@ -156,7 +156,7 @@ class PackController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
diff --git a/app/Http/Requests/Admin/Egg/EggImportFormRequest.php b/app/Http/Requests/Admin/Egg/EggImportFormRequest.php
index 776c291e2..b6adb768e 100644
--- a/app/Http/Requests/Admin/Egg/EggImportFormRequest.php
+++ b/app/Http/Requests/Admin/Egg/EggImportFormRequest.php
@@ -18,9 +18,14 @@ class EggImportFormRequest extends AdminFormRequest
      */
     public function rules()
     {
-        return [
+        $rules = [
             'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
-            'import_to_nest' => 'bail|required|integer|exists:nests,id',
         ];
+
+        if ($this->method() !== 'PUT') {
+            $rules['import_to_nest'] = 'bail|required|integer|exists:nests,id';
+        }
+
+        return $rules;
     }
 }
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index 3155eefe8..7143bbc6e 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -15,7 +15,8 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class EggImporterService
@@ -69,7 +70,8 @@ class EggImporterService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function handle(UploadedFile $file, int $nest): Egg
     {
@@ -78,6 +80,11 @@ class EggImporterService
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
 
         if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
             throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
diff --git a/app/Services/Eggs/Sharing/EggUpdateImporterService.php b/app/Services/Eggs/Sharing/EggUpdateImporterService.php
new file mode 100644
index 000000000..41bc29f06
--- /dev/null
+++ b/app/Services/Eggs/Sharing/EggUpdateImporterService.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggUpdateImporterService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $variableRepository;
+
+    /**
+     * EggUpdateImporterService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                         $connection
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $variableRepository
+    ) {
+        $this->connection = $connection;
+        $this->repository = $repository;
+        $this->variableRepository = $variableRepository;
+    }
+
+    /**
+     * Update an existing Egg using an uploaded JSON file.
+     *
+     * @param int                           $egg
+     * @param \Illuminate\Http\UploadedFile $file
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function handle(int $egg, UploadedFile $file)
+    {
+        if (! $file->isValid() || ! $file->isFile()) {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+        }
+
+        $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
+
+        if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
+        }
+
+        $this->connection->beginTransaction();
+        $this->repository->update($egg, [
+            'author' => object_get($parsed, 'author'),
+            'name' => object_get($parsed, 'name'),
+            'description' => object_get($parsed, 'description'),
+            'docker_image' => object_get($parsed, 'image'),
+            'config_files' => object_get($parsed, 'config.files'),
+            'config_startup' => object_get($parsed, 'config.startup'),
+            'config_logs' => object_get($parsed, 'config.logs'),
+            'config_stop' => object_get($parsed, 'config.stop'),
+            'startup' => object_get($parsed, 'startup'),
+            'script_install' => object_get($parsed, 'scripts.installation.script'),
+            'script_entry' => object_get($parsed, 'scripts.installation.entrypoint'),
+            'script_container' => object_get($parsed, 'scripts.installation.container'),
+        ], true, true);
+
+        // Update Existing Variables
+        collect($parsed->variables)->each(function ($variable) use ($egg) {
+            $this->variableRepository->withoutFresh()->updateOrCreate([
+                'egg_id' => $egg,
+                'env_variable' => $variable->env_variable,
+            ], collect($variable)->except(['egg_id', 'env_variable'])->toArray());
+        });
+
+        $imported = collect($parsed->variables)->pluck('env_variable')->toArray();
+        $existing = $this->variableRepository->withColumns(['id', 'env_variable'])->findWhere([['egg_id', '=', $egg]]);
+
+        // Delete variables not present in the import.
+        collect($existing)->each(function ($variable) use ($egg, $imported) {
+            if (! in_array($variable->env_variable, $imported)) {
+                $this->variableRepository->deleteWhere([
+                    ['egg_id', '=', $egg],
+                    ['env_variable', '=', $variable->env_variable],
+                ]);
+            }
+        });
+
+        $this->connection->commit();
+    }
+}
diff --git a/app/Services/Packs/PackCreationService.php b/app/Services/Packs/PackCreationService.php
index ff40f072a..80b452d88 100644
--- a/app/Services/Packs/PackCreationService.php
+++ b/app/Services/Packs/PackCreationService.php
@@ -13,8 +13,8 @@ use Ramsey\Uuid\Uuid;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationService
@@ -65,7 +65,7 @@ class PackCreationService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function handle(array $data, UploadedFile $file = null)
     {
diff --git a/app/Services/Packs/TemplateUploadService.php b/app/Services/Packs/TemplateUploadService.php
index 045bfec48..6495edd68 100644
--- a/app/Services/Packs/TemplateUploadService.php
+++ b/app/Services/Packs/TemplateUploadService.php
@@ -11,8 +11,8 @@ namespace Pterodactyl\Services\Packs;
 
 use ZipArchive;
 use Illuminate\Http\UploadedFile;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
@@ -58,7 +58,7 @@ class TemplateUploadService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
@@ -94,7 +94,7 @@ class TemplateUploadService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
diff --git a/resources/lang/en/admin/nests.php b/resources/lang/en/admin/nests.php
index b78af4903..19e6b5a1e 100644
--- a/resources/lang/en/admin/nests.php
+++ b/resources/lang/en/admin/nests.php
@@ -16,6 +16,7 @@ return [
     'eggs' => [
         'notices' => [
             'imported' => 'Successfully imported this Egg and its associated variables.',
+            'updated_via_import' => 'This Egg has been updated using the file provided.',
             'deleted' => 'Successfully deleted the requested egg from the Panel.',
             'updated' => 'Egg configuration has been updated successfully.',
             'script_updated' => 'Egg install script has been updated and will run whenever servers are installed.',
diff --git a/resources/lang/en/exceptions.php b/resources/lang/en/exceptions.php
index c700b62ff..e5bee177d 100644
--- a/resources/lang/en/exceptions.php
+++ b/resources/lang/en/exceptions.php
@@ -31,6 +31,7 @@ return [
             'reserved_name' => 'The environment variable :name is protected and cannot be assigned to a variable.',
         ],
         'importer' => [
+            'json_error' => 'There was an error while attempting to parse the JSON file: :error.',
             'file_error' => 'The JSON file provided was not valid.',
             'invalid_json_provided' => 'The JSON file provided is not in a format that can be recognized.',
         ],
diff --git a/resources/themes/pterodactyl/admin/eggs/view.blade.php b/resources/themes/pterodactyl/admin/eggs/view.blade.php
index 215273005..e5b615c6f 100644
--- a/resources/themes/pterodactyl/admin/eggs/view.blade.php
+++ b/resources/themes/pterodactyl/admin/eggs/view.blade.php
@@ -30,14 +30,39 @@
             </ul>
         </div>
     </div>
+    <div class="col-xs-12">
+        <div class="callout callout-info">
+            <strong>Notice:</strong> Editing an Egg or any of the Process Management fields <em>requires</em> that each Daemon be rebooted in order to apply the changes.
+        </div>
+    </div>
 </div>
-<form action="{{ route('admin.nests.egg.view', $egg->id) }}" method="POST">
+<form action="{{ route('admin.nests.egg.view', $egg->id) }}" enctype="multipart/form-data" method="POST">
     <div class="row">
         <div class="col-xs-12">
-            <div class="callout callout-info">
-                <strong>Notice:</strong> Editing an Egg or any of the Process Management fields <em>requires</em> that each Daemon be rebooted in order to apply the changes.
+            <div class="box box-danger">
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <div class="form-group no-margin-bottom">
+                                <label for="pName" class="control-label">Egg File</label>
+                                <div>
+                                    <input type="file" name="import_file" class="form-control" style="border: 0;margin-left:-10px;" />
+                                    <p class="text-muted small no-margin-bottom">If you would like to replace settings for this Egg by uploading a new JSON file, simply select it here and press "Update Egg". This will not change any existing startup strings or Docker images for existing servers.</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-4">
+                            {!! csrf_field() !!}
+                            <button type="submit" name="_method" value="PUT" class="btn btn-sm btn-danger pull-right">Update Egg</button>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
+    </div>
+</form>
+<form action="{{ route('admin.nests.egg.view', $egg->id) }}" method="POST">
+    <div class="row">
         <div class="col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
diff --git a/routes/admin.php b/routes/admin.php
index 8952f3217..da1451cb9 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -163,6 +163,8 @@ Route::group(['prefix' => 'nests'], function () {
     Route::post('/egg/new', 'Nests\EggController@store');
     Route::post('/egg/{egg}/variables', 'Nests\EggVariableController@store');
 
+    Route::put('/egg/{egg}', 'Nests\EggShareController@update');
+
     Route::patch('/view/{nest}', 'Nests\NestController@update');
     Route::patch('/egg/{egg}', 'Nests\EggController@update');
     Route::patch('/egg/{egg}/scripts', 'Nests\EggScriptController@update');
diff --git a/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
index 870482e68..db6618784 100644
--- a/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
+++ b/tests/Unit/Services/Eggs/Sharing/EggImporterServiceTest.php
@@ -21,7 +21,8 @@ use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class EggImporterServiceTest extends TestCase
@@ -90,7 +91,7 @@ class EggImporterServiceTest extends TestCase
         $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
             'meta' => ['version' => 'PTDL_v1'],
             'name' => $egg->name,
-            'tag' => $egg->tag,
+            'author' => $egg->author,
             'variables' => [
                 $variable = factory(EggVariable::class)->make(),
             ],
@@ -165,4 +166,24 @@ class EggImporterServiceTest extends TestCase
             $this->assertEquals(trans('exceptions.nest.importer.invalid_json_provided'), $exception->getMessage());
         }
     }
+
+    /**
+     * Test that an exception is thrown if bad JSON is provided.
+     */
+    public function testExceptionIsThrownIfBadJsonIsProvided()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn('}');
+
+        try {
+            $this->service->handle($this->file, 1234);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(BadJsonFormatException::class, $exception);
+            $this->assertEquals(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]), $exception->getMessage());
+        }
+    }
 }
diff --git a/tests/Unit/Services/Eggs/Sharing/EggUpdateImporterServiceTest.php b/tests/Unit/Services/Eggs/Sharing/EggUpdateImporterServiceTest.php
new file mode 100644
index 000000000..b376b80b6
--- /dev/null
+++ b/tests/Unit/Services/Eggs/Sharing/EggUpdateImporterServiceTest.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Tests\Unit\Services\Eggs\Sharing;
+
+use Mockery as m;
+use Tests\TestCase;
+use Pterodactyl\Models\Egg;
+use Illuminate\Http\UploadedFile;
+use Pterodactyl\Models\EggVariable;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Exceptions\PterodactylException;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
+use Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggUpdateImporterServiceTest extends TestCase
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
+     */
+    protected $connection;
+
+    /**
+     * @var \Illuminate\Http\UploadedFile|\Mockery\Mock
+     */
+    protected $file;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService
+     */
+    protected $service;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface|\Mockery\Mock
+     */
+    protected $variableRepository;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->connection = m::mock(ConnectionInterface::class);
+        $this->file = m::mock(UploadedFile::class);
+        $this->repository = m::mock(EggRepositoryInterface::class);
+        $this->variableRepository = m::mock(EggVariableRepositoryInterface::class);
+
+        $this->service = new EggUpdateImporterService($this->connection, $this->repository, $this->variableRepository);
+    }
+
+    /**
+     * Test that an egg update is handled correctly using an uploaded file.
+     */
+    public function testEggIsUpdated()
+    {
+        $egg = factory(Egg::class)->make();
+        $variable = factory(EggVariable::class)->make();
+
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'PTDL_v1'],
+            'name' => $egg->name,
+            'author' => 'newauthor@example.com',
+            'variables' => [$variable->toArray()],
+        ]));
+
+        $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
+        $this->repository->shouldReceive('update')->with($egg->id, m::subset([
+            'author' => 'newauthor@example.com',
+            'name' => $egg->name,
+        ]), true, true)->once()->andReturn($egg);
+
+        $this->variableRepository->shouldReceive('withoutFresh->updateOrCreate')->with([
+            'egg_id' => $egg->id,
+            'env_variable' => $variable->env_variable,
+        ], collect($variable)->except(['egg_id', 'env_variable'])->toArray())->once()->andReturnNull();
+
+        $this->variableRepository->shouldReceive('withColumns')->with(['id', 'env_variable'])->once()->andReturnSelf()
+            ->shouldReceive('findWhere')->with([['egg_id', '=', $egg->id]])->once()->andReturn([$variable]);
+
+        $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
+
+        $this->service->handle($egg->id, $this->file);
+        $this->assertTrue(true);
+    }
+
+    /**
+     * Test that an imported file with less variables than currently existing deletes
+     * the un-needed variables from the database.
+     */
+    public function testVariablesMissingFromImportAreDeleted()
+    {
+        $egg = factory(Egg::class)->make();
+        $variable1 = factory(EggVariable::class)->make();
+        $variable2 = factory(EggVariable::class)->make();
+
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'PTDL_v1'],
+            'name' => $egg->name,
+            'author' => 'newauthor@example.com',
+            'variables' => [$variable1->toArray()],
+        ]));
+
+        $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
+        $this->repository->shouldReceive('update')->with($egg->id, m::subset([
+            'author' => 'newauthor@example.com',
+            'name' => $egg->name,
+        ]), true, true)->once()->andReturn($egg);
+
+        $this->variableRepository->shouldReceive('withoutFresh->updateOrCreate')->with([
+            'egg_id' => $egg->id,
+            'env_variable' => $variable1->env_variable,
+        ], collect($variable1)->except(['egg_id', 'env_variable'])->toArray())->once()->andReturnNull();
+
+        $this->variableRepository->shouldReceive('withColumns')->with(['id', 'env_variable'])->once()->andReturnSelf()
+            ->shouldReceive('findWhere')->with([['egg_id', '=', $egg->id]])->once()->andReturn([$variable1, $variable2]);
+
+        $this->variableRepository->shouldReceive('deleteWhere')->with([
+            ['egg_id', '=', $egg->id],
+            ['env_variable', '=', $variable2->env_variable],
+        ])->once()->andReturnNull();
+
+        $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
+
+        $this->service->handle($egg->id, $this->file);
+        $this->assertTrue(true);
+    }
+
+    /**
+     * Test that an exception is thrown if the file is invalid.
+     */
+    public function testExceptionIsThrownIfFileIsInvalid()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(false);
+        try {
+            $this->service->handle(1234, $this->file);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.nest.importer.file_error'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if the file is not a file.
+     */
+    public function testExceptionIsThrownIfFileIsNotAFile()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(false);
+
+        try {
+            $this->service->handle(1234, $this->file);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.nest.importer.file_error'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if the JSON metadata is invalid.
+     */
+    public function testExceptionIsThrownIfJsonMetaDataIsInvalid()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn(json_encode([
+            'meta' => ['version' => 'hodor'],
+        ]));
+
+        try {
+            $this->service->handle(1234, $this->file);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(InvalidFileUploadException::class, $exception);
+            $this->assertEquals(trans('exceptions.nest.importer.invalid_json_provided'), $exception->getMessage());
+        }
+    }
+
+    /**
+     * Test that an exception is thrown if bad JSON is provided.
+     */
+    public function testExceptionIsThrownIfBadJsonIsProvided()
+    {
+        $this->file->shouldReceive('isValid')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('isFile')->withNoArgs()->once()->andReturn(true);
+        $this->file->shouldReceive('getSize')->withNoArgs()->once()->andReturn(100);
+        $this->file->shouldReceive('openFile->fread')->with(100)->once()->andReturn('}');
+
+        try {
+            $this->service->handle(1234, $this->file);
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(BadJsonFormatException::class, $exception);
+            $this->assertEquals(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]), $exception->getMessage());
+        }
+    }
+}
diff --git a/tests/Unit/Services/Packs/PackCreationServiceTest.php b/tests/Unit/Services/Packs/PackCreationServiceTest.php
index 972ee7a45..d0baddf30 100644
--- a/tests/Unit/Services/Packs/PackCreationServiceTest.php
+++ b/tests/Unit/Services/Packs/PackCreationServiceTest.php
@@ -19,7 +19,7 @@ use Illuminate\Contracts\Filesystem\Factory;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Services\Packs\PackCreationService;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationServiceTest extends TestCase
diff --git a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
index 4082fdd59..c1df4c207 100644
--- a/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
+++ b/tests/Unit/Services/Packs/TemplateUploadServiceTest.php
@@ -16,8 +16,8 @@ use Pterodactyl\Models\Pack;
 use Illuminate\Http\UploadedFile;
 use Pterodactyl\Services\Packs\PackCreationService;
 use Pterodactyl\Services\Packs\TemplateUploadService;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;

From b602ea1f661c3510b9dcbcf75d52b2f97e723772 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 9 Oct 2017 00:02:33 -0500
Subject: [PATCH 33/34] Trying to make tests not fail for random reasons?

---
 app/Jobs/Schedule/RunTaskJob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php
index 0e025740a..3f1b5195f 100644
--- a/app/Jobs/Schedule/RunTaskJob.php
+++ b/app/Jobs/Schedule/RunTaskJob.php
@@ -162,7 +162,7 @@ class RunTaskJob extends Job implements ShouldQueue
         $repository = app()->make(ScheduleRepositoryInterface::class);
         $repository->withoutFresh()->update($this->schedule, [
             'is_processing' => false,
-            'last_run_at' => app()->make(Carbon::class)->now()->toDateTimeString(),
+            'last_run_at' => Carbon::now()->toDateTimeString(),
         ]);
     }
 

From 91619101ac02f783741d46d5edfd87de32560b9f Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 9 Oct 2017 00:30:23 -0500
Subject: [PATCH 34/34] Final test before PR from hell.

---
 .../Eggs/EggConfigurationServiceTest.php      | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 tests/Unit/Services/Eggs/EggConfigurationServiceTest.php

diff --git a/tests/Unit/Services/Eggs/EggConfigurationServiceTest.php b/tests/Unit/Services/Eggs/EggConfigurationServiceTest.php
new file mode 100644
index 000000000..1dd124ab4
--- /dev/null
+++ b/tests/Unit/Services/Eggs/EggConfigurationServiceTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\Unit\Services\Eggs;
+
+use Mockery as m;
+use Tests\TestCase;
+use Pterodactyl\Models\Egg;
+use Pterodactyl\Services\Eggs\EggConfigurationService;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+
+class EggConfigurationServiceTest extends TestCase
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface|\Mockery\Mock
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Services\Eggs\EggConfigurationService
+     */
+    protected $service;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->repository = m::mock(EggRepositoryInterface::class);
+
+        $this->service = new EggConfigurationService($this->repository);
+    }
+
+    /**
+     * Test that the correct array is returned.
+     */
+    public function testCorrectArrayIsReturned()
+    {
+        $egg = factory(Egg::class)->make([
+            'config_startup' => '{"test": "start"}',
+            'config_stop' => 'test',
+            'config_files' => '{"test": "file"}',
+            'config_logs' => '{"test": "logs"}',
+        ]);
+
+        $response = $this->service->handle($egg);
+        $this->assertNotEmpty($response);
+        $this->assertTrue(is_array($response), 'Assert response is an array.');
+        $this->assertArrayHasKey('startup', $response);
+        $this->assertArrayHasKey('stop', $response);
+        $this->assertArrayHasKey('configs', $response);
+        $this->assertArrayHasKey('log', $response);
+        $this->assertArrayHasKey('query', $response);
+        $this->assertEquals('start', object_get($response['startup'], 'test'));
+        $this->assertEquals('test', 'test');
+        $this->assertEquals('file', object_get($response['configs'], 'test'));
+        $this->assertEquals('logs', object_get($response['log'], 'test'));
+        $this->assertEquals('none', $response['query']);
+    }
+
+    /**
+     * Test that an integer referencing a model can be passed in place of the model.
+     */
+    public function testFunctionHandlesIntegerPassedInPlaceOfModel()
+    {
+        $egg = factory(Egg::class)->make([
+            'config_startup' => '{"test": "start"}',
+            'config_stop' => 'test',
+            'config_files' => '{"test": "file"}',
+            'config_logs' => '{"test": "logs"}',
+        ]);
+
+        $this->repository->shouldReceive('getWithCopyAttributes')->with($egg->id)->once()->andReturn($egg);
+
+        $response = $this->service->handle($egg->id);
+        $this->assertNotEmpty($response);
+        $this->assertTrue(is_array($response), 'Assert response is an array.');
+        $this->assertArrayHasKey('startup', $response);
+        $this->assertArrayHasKey('stop', $response);
+        $this->assertArrayHasKey('configs', $response);
+        $this->assertArrayHasKey('log', $response);
+        $this->assertArrayHasKey('query', $response);
+        $this->assertEquals('start', object_get($response['startup'], 'test'));
+        $this->assertEquals('test', 'test');
+        $this->assertEquals('file', object_get($response['configs'], 'test'));
+        $this->assertEquals('logs', object_get($response['log'], 'test'));
+        $this->assertEquals('none', $response['query']);
+    }
+}