diff --git a/app/itam/templates/itam/device.html.j2 b/app/itam/templates/itam/device.html.j2
index 30e628c3..6806c054 100644
--- a/app/itam/templates/itam/device.html.j2
+++ b/app/itam/templates/itam/device.html.j2
@@ -39,6 +39,7 @@
   <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'Details')">Details</button>
   <button id="defaultOpen" class="tablinks" onclick="openCity(event, 'OperatingSystem')">Operating System</button>
   <button class="tablinks" onclick="openCity(event, 'Software')">Software</button>
+  <button class="tablinks" onclick="openCity(event, 'Notes')">Notes</button>
   <button class="tablinks" onclick="openCity(event, 'ConfigManagement')">Config Management</button>
   <!-- <button class="tablinks" onclick="openCity(event, 'Installations')">Installations</button> -->
 </div>
@@ -127,6 +128,23 @@
     </table>
   </div>
 
+
+  <div id="Notes" class="tabcontent">
+    <h3>
+      Notes
+    </h3>
+    {{ notes_form }}
+    <input type="submit" name="{{notes_form.prefix}}" value="Submit" />
+    <div class="comments">
+      {% if notes %}
+      {% for note in notes%}
+      {% include 'note.html.j2' %}
+      {% endfor %}
+      {% endif %}
+
+  </div>
+
+
   <div id="ConfigManagement" class="tabcontent">
     <h3>Configuration Management</h3>
     <div>
diff --git a/app/itam/views/device.py b/app/itam/views/device.py
index c444944b..a45970bc 100644
--- a/app/itam/views/device.py
+++ b/app/itam/views/device.py
@@ -1,4 +1,5 @@
 import json
+import markdown
 
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Q
@@ -10,6 +11,10 @@ from access.models import Organization
 
 from ..models.device import Device, DeviceSoftware, DeviceOperatingSystem
 from ..models.software import Software
+
+from core.forms.comment import AddNoteForm
+from core.models.notes import Notes
+
 from itam.forms.device_softwareadd import SoftwareAdd
 from itam.forms.device_softwareupdate import SoftwareUpdate
 
@@ -84,6 +89,10 @@ class View(OrganizationPermission, generic.UpdateView):
 
         context['softwares'] = softwares
 
+        context['notes_form'] = AddNoteForm(prefix='note')
+
+        context['notes'] = Notes.objects.filter(device=self.kwargs['pk'])
+
         config = self.object.get_configuration(self.kwargs['pk'])
         context['config'] = json.dumps(config, indent=4, sort_keys=True)
 
@@ -113,6 +122,19 @@ class View(OrganizationPermission, generic.UpdateView):
 
             operating_system.save()
 
+
+        notes = AddNoteForm(request.POST, prefix='note')
+
+        if notes.is_bound and notes.is_valid():
+
+            notes.instance.organization = device.organization
+            notes.instance.device = device
+            notes.instance.usercreated = request.user
+
+            notes.save()
+
+
+
         return super().post(request, *args, **kwargs)