diff --git a/app/Database/migrations/2018_04_01_193443_create_files_table.php b/app/Database/migrations/2018_04_01_193443_create_files_table.php
index 57137620..1b97f757 100644
--- a/app/Database/migrations/2018_04_01_193443_create_files_table.php
+++ b/app/Database/migrations/2018_04_01_193443_create_files_table.php
@@ -13,15 +13,19 @@ class CreateFilesTable extends Migration
     public function up()
     {
         Schema::create('files', function (Blueprint $table) {
-            $table->increments('id');
+            $table->string('id', \App\Interfaces\Model::ID_MAX_LENGTH);
             $table->string('name');
             $table->string('description')->nullable();
             $table->string('disk')->nullable();
             $table->string('path');
             $table->boolean('public')->default(true);
+            $table->unsignedInteger('download_count')->default(0);
             $table->string('ref_model', 50)->nullable();
             $table->string('ref_model_id', 36)->nullable();
             $table->timestamps();
+
+            $table->primary('id');
+            $table->index(['ref_model', 'ref_model_id']);
         });
     }
 
diff --git a/app/Http/Controllers/Admin/FilesController.php b/app/Http/Controllers/Admin/FilesController.php
index 5ff8d333..8ce12d09 100644
--- a/app/Http/Controllers/Admin/FilesController.php
+++ b/app/Http/Controllers/Admin/FilesController.php
@@ -57,7 +57,7 @@ class FilesController extends Controller
         $asset->description = $attrs['file_description'];
         $asset->disk = config('filesystems.public_files');
         $asset->path = $file_path;
-        $asset->public = true;
+        $asset->public = false;  // need to be logged in to see. default (for now)
         $asset->ref_model = $attrs['ref_model'];
         $asset->ref_model_id = $attrs['ref_model_id'];
 
diff --git a/app/Http/Controllers/Frontend/FileController.php b/app/Http/Controllers/Frontend/FileController.php
new file mode 100644
index 00000000..fd85c170
--- /dev/null
+++ b/app/Http/Controllers/Frontend/FileController.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Controllers\Frontend;
+
+use App\Interfaces\Controller;
+use App\Models\File;
+use Auth;
+use Flash;
+use Illuminate\Support\Facades\Storage;
+
+/**
+ * Class FileController
+ * @package App\Http\Controllers\Frontend
+ */
+class FileController extends Controller
+{
+    /**
+     * Show the application dashboard.
+     */
+    public function show($id)
+    {
+        /**
+         * @var File $file
+         */
+        $file = File::find($id);
+        if (!$file) {
+            Flash::error('File doesn\'t exist');
+            return redirect()->back();
+        }
+
+        // Allowed to download? If not, direct to login
+        if (!$file->public && !Auth::check()) {
+            return redirect(config('app.login_redirect'));
+        }
+
+        ++$file->download_count;
+        $file->save();
+
+        if($file->disk === 'public') {
+            $storage = Storage::disk('public');
+            return $storage->download($file->path, $file->filename);
+        }
+
+        // TODO: Config for streamed response?
+        return redirect()->to($file->url);
+    }
+}
diff --git a/app/Models/File.php b/app/Models/File.php
index ac266282..210d2e11 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -4,23 +4,28 @@ namespace App\Models;
 
 
 use App\Interfaces\Model;
+use App\Models\Traits\HashIdTrait;
 use App\Models\Traits\ReferenceTrait;
 use Illuminate\Support\Facades\Storage;
 
 /**
- * File property
  * @property string  $name
  * @property string  $description
  * @property string  $disk
  * @property string  $path
  * @property boolean $public
+ * @property int     $download_count
+ * @property string  $url
+ * @property string  $filename
  * @package App\Models
  */
 class File extends Model
 {
+    use HashIdTrait;
     use ReferenceTrait;
 
     protected $table = 'files';
+    public $incrementing = false;
 
     protected $fillable = [
         'name',
@@ -32,10 +37,42 @@ class File extends Model
         'ref_model_id',
     ];
 
+    protected $casts = [
+        'public' => 'boolean',
+    ];
+
     public static $rules = [
         'name'        => 'required',
     ];
 
+    private $pathinfo;
+
+    /**
+     * Return the file extension
+     * @return string
+     */
+    public function getExtensionAttribute(): string
+    {
+        if (!$this->pathinfo) {
+            $this->pathinfo = pathinfo($this->path);
+        }
+
+        return $this->pathinfo['extension'];
+    }
+
+    /**
+     * Get just the filename
+     * @return string
+     */
+    public function getFilenameAttribute() :string
+    {
+        if (!$this->pathinfo) {
+            $this->pathinfo = pathinfo($this->path);
+        }
+
+        return $this->pathinfo['filename'].'.'.$this->pathinfo['extension'];
+    }
+
     /**
      * Get the full URL to this attribute
      * @return string
diff --git a/app/Routes/web.php b/app/Routes/web.php
index ce33b1ec..91f45a12 100755
--- a/app/Routes/web.php
+++ b/app/Routes/web.php
@@ -27,6 +27,9 @@ Route::group([
 
     Route::get('airports/{id}', 'AirportController@show')->name('airports.show');
 
+    // Download a file
+    Route::get('files/{id}', 'FileController@show')->name('files.show');
+
     Route::get('flights/bids', 'FlightController@bids')->name('flights.bids');
     Route::get('flights/search', 'FlightController@search')->name('flights.search');
     Route::resource('flights', 'FlightController');
diff --git a/app/Widgets/CheckWx.php b/app/Widgets/CheckWx.php
index 3743190c..ac15d84f 100644
--- a/app/Widgets/CheckWx.php
+++ b/app/Widgets/CheckWx.php
@@ -41,7 +41,6 @@ class CheckWx extends Widget
                 return $data;
             });
 
-
             if($data->results === 1) {
                 $data = $data->data[0];
             } else {
diff --git a/resources/views/admin/common/file_upload.blade.php b/resources/views/admin/common/file_upload.blade.php
index 10f52af6..bfae7910 100644
--- a/resources/views/admin/common/file_upload.blade.php
+++ b/resources/views/admin/common/file_upload.blade.php
@@ -16,7 +16,8 @@ Pass in:
         <thead>
             <tr>
                 <td>Name</td>
-                <td>Current File</td>
+                <td>Direct Link</td>
+                <td>Downloads</td>
                 <td class="text-right"></td>
             </tr>
         </thead>
@@ -26,6 +27,7 @@ Pass in:
             <tr>
                 <td>{{ $file->name }}</td>
                 <td><a href="{{ $file->url }}" target="_blank">Link to file</a></td>
+                <td>{{$file->download_count}}</td>
                 <td class="text-right">
                     {{ Form::open(['route' => ['admin.files.delete', $file->id], 'method' => 'delete']) }}
                     {{ Form::hidden('id', $file->id) }}
diff --git a/resources/views/layouts/default/airports/show.blade.php b/resources/views/layouts/default/airports/show.blade.php
index 66bdb72c..bb093112 100644
--- a/resources/views/layouts/default/airports/show.blade.php
+++ b/resources/views/layouts/default/airports/show.blade.php
@@ -2,17 +2,19 @@
 @section('title', $airport->full_name)
 
 @section('content')
-<div class="row">
+<div class="row" style="margin-bottom: 30px;">
     <div class="col-12">
         <h2 class="description">{{ $airport->full_name }}</h2>
     </div>
-    <div class="col-5">
 
+    {{-- Show the weather widget in one column --}}
+    <div class="col-5">
         {{ Widget::checkWx([
             'icao' => $airport->icao,
           ]) }}
-
     </div>
+
+    {{-- Show the airspace map in the other column --}}
     <div class="col-7">
         {{ Widget::airspaceMap([
             'width' => '100%',
@@ -22,21 +24,47 @@
           ]) }}
     </div>
 </div>
-<div class="row" style="height: 30px;">
+<div class="row" style="margin-bottom: 30px;">
+    {{-- There are files uploaded and a user is logged in--}}
+    @if($airport->files && Auth::check())
+        <div class="col-12">
+            <h3 class="description">Downloads</h3>
+            <ul class="list-group">
+                @foreach($airport->files as $file)
+                <li class="list-group-item">
+                    <a href="{{route('frontend.files.show', [$file->id])}}" target="_blank">
+                        {{ $file->name }}
+                    </a>
 
+                    {{-- only show description is one is provided --}}
+                    @if($file->description)
+                        - {{$file->description}}
+                    @endif
+                    <span style="margin-left: 20px">{{$file->download_count}} downloads</span>
+                </li>
+                @endforeach
+            </ul>
+        </div>
+    @endif
 </div>
 <div class="row">
     <div class="col-md-12">
         <h3 class="description">Inbound Flights</h3>
         @if(!$inbound_flights)
-            <div class="mini-splash">
+            <div class="jumbotron text-center">
                 no flights found
             </div>
         @else
             @each('airports.table', $inbound_flights, 'flight')
         @endif
         <h3 class="description">Outbound Flights</h3>
-        @each('airports.table', $outbound_flights, 'flight')
+        @if(!$outbound_flights)
+            <div class="jumbotron text-center">
+                no flights found
+            </div>
+        @else
+            @each('airports.table', $outbound_flights, 'flight')
+        @endif
     </div>
 </div>
 @endsection