diff --git a/app/Http/Controllers/Flex/FlexAdminController.php b/app/Http/Controllers/Flex/FlexAdminController.php
index cdbb53129..8772700e7 100644
--- a/app/Http/Controllers/Flex/FlexAdminController.php
+++ b/app/Http/Controllers/Flex/FlexAdminController.php
@@ -91,6 +91,14 @@ class FlexAdminController extends Controller
             'system' => 'required',
             'structure_type' => 'required',
         ]);
+
+        FlexStructure::where([
+            'requestor_name' => $request->requestor_name,
+            'system' => $request->system,
+            'structure_type' => $request->structure_type,
+        ])->delete();
+
+        return redirect('/flex/display')->with('success', 'Flex Structure Entry Removed.');
     }
 
 }
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 98f02ac73..9100fc2b2 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -12,10 +12,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->call([
-            WikiTableSeeder::class,
-            ConfigTableSeeder::class,
-            OrePricesSeeder::class,
-        ]);
+        $this->call(SolarSystemSeeder::class);
     }
 }
diff --git a/database/seeds/SolarSystemSeeder.php b/database/seeds/SolarSystemSeeder.php
new file mode 100644
index 000000000..65318f473
--- /dev/null
+++ b/database/seeds/SolarSystemSeeder.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+use App\Models\Lookups\SolarSystem;
+
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use Seat\Eseye\Containers\EsiAuthentication;
+use Seat\Eseye\Eseye;
+
+class SolarSystemSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $configuration = Configuration::getInstance();
+        $configuration->cache = NullCache::class;
+
+        $esi = new Eseye();
+
+        $systems = $esi->invoke('get', '/universe/systems/');
+
+        foreach($systems as $system) {
+            try {
+                $info = $esi->invoke('get', '/universe/systems/{system_id}/', [
+                    'system_id' => $system,
+                ]);
+            } catch(RequestFailedException $e) {
+
+            }
+            
+            $count = SolarSystem::where(['solar_system_id' => $system])->count();
+            if($count == 0) {
+                SolarSystem::insert([
+                    'name' => $info->name,
+                    'solar_system_id' => $system,
+                    'security_status' => $info->security_status,
+                ]);
+            }
+        }
+    }
+}
diff --git a/resources/views/flex/add.blade.php b/resources/views/flex/add.blade.php
index 2d4397cbf..eab56fe58 100644
--- a/resources/views/flex/add.blade.php
+++ b/resources/views/flex/add.blade.php
@@ -21,7 +21,12 @@
             </div>
             <div class="form-group">
                 {{ Form::label('structure_type', 'Structure Type') }}
-                {{ Form::select('structure_type', '', ['class' => 'form-control']) }}
+                {{ Form::select('structure_type', [
+                    'Cyno Jammer' => 'Cyno Jammer',
+                    'Cyno Beacon' => 'Cyno Beacon',
+                    'Jump Bridge' => 'Jump Bridge',
+                    'Super Construction Facilities' => 'Super Construction Facilities',
+                ], 'None', ['class' => 'form-control']) }}
             </div>
             <div class="form-group">
                 {{ Form::label('structure_cost', 'Structure Cost') }}
diff --git a/resources/views/flex/list.blade.php b/resources/views/flex/list.blade.php
index 2b97a98c3..66f65cc22 100644
--- a/resources/views/flex/list.blade.php
+++ b/resources/views/flex/list.blade.php
@@ -8,6 +8,7 @@
         </div>
         <div class="card-body">
             @if($structures != null)
+            {!! Form::open(['action' => 'Flex\FlexAdminController@removeFlexStructure', 'method' => 'POST']) !!}
             <table class="table table-bordered table-striped">
                 <thead>
                     <th>Requestor</th>
@@ -15,6 +16,7 @@
                     <th>System</th>
                     <th>Structure Type</th>
                     <th>Cost</th>
+                    <th>Remove?</th>
                 </thead>
                 <tbody>
                     @foreach($structures as $structure)
@@ -23,7 +25,13 @@
                         <td>{{ $structure->requestor_corp_name }}</td>
                         <td>{{ $structure->system }}</td>
                         <td>{{ $structure->structure_type }}</td>
-                        <td>{{ number_format($structure->structure_cost, "2", ".", ",") }}
+                        <td>{{ number_format($structure->structure_cost, "2", ".", ",") }}</td>
+                        <td>
+                            {{ Form::radio('remove', 'Yes', false, ['class' => 'form-control']) }}
+                            {{ Form::hidden('requestor_name', $structure->requestor_name) }}
+                            {{ Form::hidden('system', $structure->system) }}
+                            {{ Form::hidden('structure_type', $structure->structure_type) }}
+                        </td>
                     </tr>
                     @endforeach
                 </tbody>
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index f4dab82a9..3ee604712 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -112,6 +112,12 @@
                     <a class="dropdown-item" href="/admin/dashboard/taxes">Taxes</a>
                     <a class="dropdown-item" href="/admin/dashboard/logins">Allowed Logins</a>
                     <a class="dropdown-item" href="/admin/dashboard/purgewiki">Wiki Purge</a>
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Flex</a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                        <a class="dropdown-item" href="/flex/display">Display</a>
+                        <a class="dropdown-item" href="/flex/display/add">Add</a>
+                        <a class="dropdown-item" href="/flex/display/remove">Remove</a>
+                    </div>
                 </div>
             </li>
             @endif
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 60d982e78..0d54417c3 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -3729,6 +3729,7 @@ return array(
     'SebastianBergmann\\Timer\\RuntimeException' => $vendorDir . '/phpunit/php-timer/src/RuntimeException.php',
     'SebastianBergmann\\Timer\\Timer' => $vendorDir . '/phpunit/php-timer/src/Timer.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
+    'SolarSystemSeeder' => $baseDir . '/database/seeds/SolarSystemSeeder.php',
     'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
     'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => $vendorDir . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
     'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => $vendorDir . '/symfony/console/CommandLoader/ContainerCommandLoader.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 832dd8341..697a82b34 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4193,6 +4193,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'SebastianBergmann\\Timer\\RuntimeException' => __DIR__ . '/..' . '/phpunit/php-timer/src/RuntimeException.php',
         'SebastianBergmann\\Timer\\Timer' => __DIR__ . '/..' . '/phpunit/php-timer/src/Timer.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
+        'SolarSystemSeeder' => __DIR__ . '/../..' . '/database/seeds/SolarSystemSeeder.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
         'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => __DIR__ . '/..' . '/symfony/console/CommandLoader/ContainerCommandLoader.php',