diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index aacff45918..b8de5e8f59 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -52,7 +52,6 @@ class AssetsController extends Controller
      */
     public function index(Request $request, $audit = null) 
     {
-
         \Log::debug(Route::currentRouteName());
         $filter_non_deprecable_assets = false;
 
@@ -345,8 +344,6 @@ class AssetsController extends Controller
             }]);
         }
 
-        
-
 
         /**
          * Here we're just determining which Transformer (via $transformer) to use based on the 
@@ -371,9 +368,8 @@ class AssetsController extends Controller
 
             return (new AssetsTransformer)->transformAsset($asset, $request);
         }
+
         return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
-
-
     }
 
     /**
@@ -734,7 +730,6 @@ class AssetsController extends Controller
             $logaction->logaction('restored');
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.restore.success')));
-        
 
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
@@ -838,8 +833,8 @@ class AssetsController extends Controller
         $this->authorize('checkin', $asset);
 
 
-        $user = $asset->assignedUser;
-        if (is_null($target = $asset->assignedTo)) {
+        $target = $asset->assignedTo;
+        if (is_null($target)) {
             return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.already_checked_in')));
         }
 
@@ -852,7 +847,7 @@ class AssetsController extends Controller
         if ($request->filled('name')) {
             $asset->name = $request->input('name');
         }
-        
+
         $asset->location_id = $asset->rtd_location_id;
 
         if ($request->filled('location_id')) {
@@ -869,7 +864,28 @@ class AssetsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
+    }
+
+    /**
+     * Checkin an asset by asset tag
+     *
+     * @author [A. Janes] [<ajanes@adagiohealth.org>]
+     * @since [v6.0]
+     * @return JsonResponse
+     */
+    public function checkinByTag(Request $request)
+    {
+        $this->authorize('checkin', Asset::class);
+        $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();
+
+        if($asset) {
+            return $this->checkin($request, $asset->id);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', [
+            'asset'=> e($request->input('asset_tag'))
+        ], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
     }
 
 
@@ -883,8 +899,6 @@ class AssetsController extends Controller
      */
     public function audit(Request $request)
     {
-
-
         $this->authorize('audit', Asset::class);
         $rules = [
             'asset_tag' => 'required',
@@ -932,11 +946,6 @@ class AssetsController extends Controller
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
-
-
-
-
-
     }
 
 
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index b985012c98..2125d1f6ba 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -761,6 +761,13 @@ class AssetsController extends Controller
         return view('hardware/quickscan')->with('next_audit_date', $dt);
     }
 
+    public function quickScanCheckin()
+    {
+        $this->authorize('checkin', Asset::class);
+
+        return view('hardware/quickscan-checkin');
+    }
+
     public function audit($id)
     {
         $settings = Setting::getSettings();
diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php
index 1ac49efef1..67226061b1 100644
--- a/resources/lang/en/admin/hardware/general.php
+++ b/resources/lang/en/admin/hardware/general.php
@@ -6,6 +6,7 @@ return [
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
     'bulk_checkout'             => 'Checkout Assets',
+    'bulk_checkin'              => 'Checkin Assets',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 2e358c77f9..1f2f6341c9 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -192,6 +192,8 @@
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
     'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
     'recent_activity'		=> 'Recent Activity',
     'remaining'             => 'Remaining',
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
new file mode 100644
index 0000000000..b2075c51d0
--- /dev/null
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -0,0 +1,171 @@
+@extends('layouts/default')
+
+{{-- Page title --}}
+@section('title')
+    {{ trans('general.quickscan_checkin') }}
+    @parent
+@stop
+
+{{-- Page content --}}
+@section('content')
+
+    <style>
+
+        .input-group {
+            padding-left: 0px !important;
+        }
+    </style>
+
+    
+
+    <div class="row">
+    {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'checkin-form' ]) }}
+        <!-- left column -->
+        <div class="col-md-6">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h2 class="box-title"> {{ trans('admin/hardware/general.bulk_checkin') }} </h2>
+                </div>
+                <div class="box-body">
+                    {{csrf_field()}}
+
+                    <!-- Asset Tag -->
+                    <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
+                        {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'checkin_tag')) }}
+                        <div class="col-md-9">
+                            <div class="input-group date col-md-5" data-date-format="yyyy-mm-dd">
+                                <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ Request::old('asset_tag') }}">
+
+                            </div>
+                            {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        </div>
+                    </div>
+    
+                    <!-- Locations -->
+                    @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+
+                    <!-- Note -->
+                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+    
+    
+
+                </div> <!--/.box-body-->
+                <div class="box-footer">
+                    <a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
+                    <button type="submit" id="checkin_button" class="btn btn-success pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
+                </div>
+
+
+
+            </div>
+
+
+
+            {{Form::close()}}
+        </div> <!--/.col-md-6-->
+
+        <div class="col-md-6">
+            <div class="box box-default" id="checkedin-div" style="display: none">
+                <div class="box-header with-border">
+                    <h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> assets checked in) </h2>
+                </div>
+                <div class="box-body">
+    
+                    <table id="checkedin" class="table table-striped snipe-table">
+                        <thead>
+                        <tr>
+                            <th>{{ trans('general.asset_tag') }}</th>
+                            <th>{{ trans('general.quickscan_checkin_status') }}</th>
+                            <th></th>
+                        </tr>
+                        <tr id="checkin-loader" style="display: none;">
+                            <td colspan="3">
+                                <i class="fas fa-spinner spin" aria-hidden="true"></i> Processing...
+                            </td>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+
+@stop
+
+
+@section('moar_scripts')
+    <script nonce="{{ csrf_token() }}">
+
+        $("#checkin-form").submit(function (event) {
+            $('#checkedin-div').show();
+            $('#checkin-loader').show();
+
+            event.preventDefault();
+
+            var form = $("#checkin-form").get(0);
+            var formData = $('#checkin-form').serializeArray();
+
+            $.ajax({
+                url: "{{ route('api.asset.checkinbytag') }}",
+                type : 'POST',
+                headers: {
+                    "X-Requested-With": 'XMLHttpRequest',
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                },
+                dataType : 'json',
+                data : formData,
+                success : function (data) {
+                    if (data.status == 'success') {
+                        $('#checkedin tbody').prepend("<tr class='success'><td>" + data.payload.asset + "</td><td>" + data.messages + "</td><td><i class='fas fa-check text-success'></i></td></tr>");
+                        incrementOnSuccess();
+                    } else {
+                        handlecheckinFail(data);
+                    }
+                    $('input#asset_tag').val('');
+                },
+                error: function (data) {
+                    handlecheckinFail(data);
+                },
+                complete: function() {
+                    $('#checkin-loader').hide();
+                }
+
+            });
+
+            return false;
+        });
+
+        function handlecheckinFail (data) {
+            if (data.payload.asset) {
+                var asset = data.payload.asset;
+            } else {
+                var asset = '';
+            }
+            if (data.messages) {
+                var messages = data.messages;
+            } else {
+                var messages = '';
+            }
+            $('#checkedin tbody').prepend("<tr class='danger'><td>" + asset + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger'></i></td></tr>");
+        }
+
+        function incrementOnSuccess() {
+            var x = parseInt($('#checkin-counter').html());
+            y = x + 1;
+            $('#checkin-counter').html(y);
+        }
+
+        $("#checkin_tag").focus();
+
+    </script>
+@stop
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 7bd6c28fc5..c86469911f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -480,6 +480,14 @@
                     @endcan
 
                   <li class="divider">&nbsp;</li>
+                    @can('checkin', \App\Models\Asset::class)
+                        <li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
+                            <a href="{{ route('hardware/quickscancheckin') }}">
+                                {{ trans('general.quickscan_checkin') }}
+                            </a>
+                        </li>
+                    @endcan
+
                     @can('checkout', \App\Models\Asset::class)
                     <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
                         <a href="{{ route('hardware/bulkcheckout') }}">
diff --git a/routes/api.php b/routes/api.php
index 7e4bfc80d1..b3ec949c32 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -467,6 +467,13 @@ Route::group(['prefix' => 'v1', 'middleware' => 'api'], function () {
         ]
         )->name('api.asset.checkin');
 
+        Route::post('checkinbytag',
+            [
+                Api\AssetsController::class,
+                'checkinbytag'
+            ]
+        )->name('api.asset.checkinbytag');
+
         Route::post('checkout',
         [
             Api\AssetsController::class, 
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 2d83e386aa..22c4f0f20c 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -28,6 +28,10 @@ Route::group(
             [AssetsController::class, 'quickScan']
         )->name('assets.bulkaudit');
 
+        Route::get('quickscancheckin',
+            [AssetsController::class, 'quickScanCheckin']
+        )->name('hardware/quickscancheckin');
+
         // Asset Maintenances
         Route::resource('maintenances', 
             AssetMaintenancesController::class, [