diff --git a/app/Events/NoteAdded.php b/app/Events/NoteAdded.php
new file mode 100644
index 000000000..de5f91ce7
--- /dev/null
+++ b/app/Events/NoteAdded.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class NoteAdded
+{
+    use Dispatchable, SerializesModels;
+    public $itemNoteAddedOn;
+    public $note;
+    public $noteAddedBy;
+
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($itemNoteAddedOn, User $noteAddedBy, $note)
+    {
+        $this->itemNoteAddedOn = $itemNoteAddedOn;
+        $this->note = $note;
+        $this->noteAddedBy = $noteAddedBy;
+    }
+}
\ No newline at end of file
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index b56871f83..0b243d69a 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -184,7 +184,9 @@ class IconHelper
                 return 'fa-regular fa-id-card';
             case 'department' :
                 return 'fa-solid fa-building-user';
-
+            case 'note':
+            case 'notes':
+                return 'fas fa-sticky-note';
         }
     }
 }
diff --git a/app/Http/Controllers/Api/NotesController.php b/app/Http/Controllers/Api/NotesController.php
new file mode 100644
index 000000000..97b7ca413
--- /dev/null
+++ b/app/Http/Controllers/Api/NotesController.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Events\NoteAdded;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\Asset;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class NotesController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'note' => 'required|string|max:500',
+            'type' => [
+                'required',
+                Rule::in(['asset']),
+            ],
+        ]);
+
+        // This can be made dynamic by using $request->input('type') to determine which model type to add the note to.
+        // For now, we are only placing this on Assets
+        $item = Asset::findOrFail($request->input("id"));
+        $this->authorize('update', $item);
+
+        event(new NoteAdded($item, Auth::user(), $validated['note']));
+
+        return response()->json(Helper::formatStandardApiResponse('success'));
+    }
+
+    public function update(Request $request)
+    {
+
+    }
+    public function destroy(Request $request)
+    {
+
+    }
+}
diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index fab491a5f..5b8d5e0ea 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -32,7 +32,8 @@ class ModalController extends Controller
             'statuslabel',
             'supplier',
             'upload-file',
-            'user',         
+            'user',
+            'add-note',
         ];
 
 
diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php
index 6dbeb7312..d0da80614 100644
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -17,6 +17,7 @@ use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Events\LicenseCheckedIn;
 use App\Events\LicenseCheckedOut;
+use App\Events\NoteAdded;
 use App\Models\Actionlog;
 use App\Models\User;
 use App\Models\LicenseSeat;
@@ -128,6 +129,23 @@ class LogListener
 
     }
 
+
+    /**
+     * Note is added to action log
+     *
+     */
+    public function onNoteAdded(NoteAdded $event)
+    {
+        $logaction = new Actionlog();
+        $logaction->item_id = $event->itemNoteAddedOn->id;
+        $logaction->item_type = get_class($event->itemNoteAddedOn);
+        $logaction->note = $event->note; //this is the received alphanumeric text from the box
+        $logaction->created_by = $event->noteAddedBy->id;
+        $logaction->action_type = 'note_added';
+        $logaction->save();
+    }
+
+
     /**
      * Register the listeners for the subscriber.
      *
@@ -141,6 +159,7 @@ class LogListener
             'CheckoutAccepted',
             'CheckoutDeclined',
             'UserMerged',
+            'NoteAdded',
         ];
 
         foreach ($list as $event) {
diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js
index 7e20e9d5d..250868bbb 100644
--- a/resources/assets/js/snipeit_modals.js
+++ b/resources/assets/js/snipeit_modals.js
@@ -28,7 +28,7 @@ $(function () {
 
   var baseUrl = $('meta[name="baseUrl"]').attr('content');
   //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
+  var model, select, refreshSelector, hasnopayload;
 
   if($('#createModal').length == 0) {
     $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
@@ -40,6 +40,7 @@ $(function () {
       select = link.data("select");
       refreshSelector = link.data("refresh");
 
+      hasnopayload = link.data("hasnopayload");
 
       $('#createModal').load(link.attr('href'),function () {
 
@@ -122,11 +123,13 @@ $(function () {
                 $('#modal_error_msg').html(error_message).show();
                 return false;
             }
-            var id = result.payload.id;
-            var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
-            if(!id || !name) {
-                console.error("Could not find resulting name or ID from modal-create. Name: "+name+", id: "+id);
-                return false;
+            if(!hasnopayload) {
+                var id = result.payload.id;
+                var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
+                if (!id || !name) {
+                    console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+                    return false;
+                }
             }
             $('#createModal').modal('hide');
             $('#createModal').html("");
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 20c1cf8ae..db2830bcd 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index b9875ddb5..e5407d30a 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -253,6 +253,15 @@
                                         {{ Form::close() }}
                                 </div>
 
+                                <!-- Add notes -->
+                                @can('update', \App\Models\Asset::class)
+                                    <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                        <a href='{{ route('modal.show', 'add-note') }}?type=asset&id={{$asset->id}}' style="width: 100%" data-toggle="modal" data-target="#createModal" data-select='add-note_select_id' data-refresh="assetHistory" data-hasnopayload="true" class="btn btn-sm btn-primary btn-block btn-social hidden-print">
+                                            <x-icon type="note" />
+                                            {{ trans('general.add_note') }}</a>
+                                    </div>
+                                @endcan
+
                                 @can('delete', $asset)
                                     <div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
 
@@ -1394,7 +1403,6 @@
         @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id])
     @endcan
 @stop
-
             @section('moar_scripts')
                 <script>
 
diff --git a/resources/views/modals/add-note.blade.php b/resources/views/modals/add-note.blade.php
new file mode 100644
index 000000000..9c14098f0
--- /dev/null
+++ b/resources/views/modals/add-note.blade.php
@@ -0,0 +1,28 @@
+{{-- See snipeit_modals.js for what powers this --}}
+<div class="modal-dialog">
+    <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>
+            <h2 class="modal-title">{{ trans('general.add_note')  }}</h2>
+        </div>
+
+        <div class="modal-body">
+            <form action="{{ route('api.notes.store') }}" onsubmit="return false">
+                <input type="hidden" name="type" value="{{request("type")}}"/>
+                <input type="hidden" name="id" value="{{request("id")}}"/>
+                <div class="alert alert-danger" id="modal_error_msg" style="display:none"></div>
+
+                <div class="row">
+                    <div class="col-md-12">
+                        <textarea class="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>
+            </form>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 47bb41e23..b51e139a4 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1303,6 +1303,22 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         }); // end reports api routes
 
         /**
+         * Notes API routes
+         */
+
+        Route::group(['prefix' => 'notes'], function () {
+
+            Route::post(
+                '/',
+            [   Api\NotesController::class,
+                'store'
+            ]
+            )->name('api.notes.store');
+        }); // end notes api routes
+
+
+
+    /**
          * Version API routes
          */
 
diff --git a/tests/Feature/Notes/AssetNotesTest.php b/tests/Feature/Notes/AssetNotesTest.php
new file mode 100644
index 000000000..c666cb9e3
--- /dev/null
+++ b/tests/Feature/Notes/AssetNotesTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Feature\Notes;
+
+use App\Events\NoteAdded;
+use App\Models\Asset;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class AssetNotesTest extends TestCase
+{
+    public function testRequiresPermission()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.notes.store'), [
+                'note' => 'New Note!',
+                'type' => 'asset',
+                'id' => $asset->id,
+            ])
+            ->assertForbidden();
+    }
+
+    public function testValidation()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->postJson(route('api.notes.store'), [
+                // 'note' => '',
+                'type' => 'a_type_not_asset',
+                'id' => $asset->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJsonValidationErrors(['note', 'type'], 'messages');
+    }
+
+    public function testRequiresExistingAsset()
+    {
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->postJson(route('api.notes.store'), [
+                'note' => 'New Note!',
+                'type' => 'asset',
+                'id' => 999_999,
+            ])
+            ->assertStatusMessageIs('error')
+            ->assertMessagesAre('Asset not found');
+    }
+
+    public function testCanAddNoteToAsset()
+    {
+        Event::fake([NoteAdded::class]);
+
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.notes.store'), [
+                'note' => 'New Note!',
+                'type' => 'asset',
+                'id' => $asset->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+        
+        Event::assertDispatchedTimes(NoteAdded::class, 1);
+        Event::assertDispatched(NoteAdded::class, function (NoteAdded $event) use ($asset, $user) {
+            return $event->itemNoteAddedOn->is($asset)
+                && $event->note === 'New Note!'
+                && $event->noteAddedBy->is($user);
+        });
+    }
+}
diff --git a/tests/Unit/Listeners/LogListenerTest.php b/tests/Unit/Listeners/LogListenerTest.php
index dae8b0861..5b0813c28 100644
--- a/tests/Unit/Listeners/LogListenerTest.php
+++ b/tests/Unit/Listeners/LogListenerTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Unit\Listeners;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Events\NoteAdded;
 use App\Listeners\LogListener;
 use App\Models\Asset;
 use App\Models\User;
@@ -36,4 +37,20 @@ class LogListenerTest extends TestCase
             'note' => 'A simple note...',
         ]);
     }
+
+    public function testLogsEntryOnAssetNoteCreation()
+    {
+        $asset = Asset::factory()->create();
+        $noteAddedBy = User::factory()->create();
+
+        event(new NoteAdded($asset, $noteAddedBy, 'My Cool Note!'));
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'note_added',
+            'created_by' => $noteAddedBy->id,
+            'item_id' => $asset->id,
+            'item_type' => Asset::class,
+            'note' => 'My Cool Note!',
+        ]);
+    }
 }