diff --git a/InvenTree/label/models.py b/InvenTree/label/models.py
index 74c811a633..6da973d85f 100644
--- a/InvenTree/label/models.py
+++ b/InvenTree/label/models.py
@@ -14,7 +14,7 @@ from django.core.validators import FileExtensionValidator
 
 from django.utils.translation import gettext_lazy as _
 
-from InvenTree.helpers import validateFilterString
+from InvenTree.helpers import validateFilterString, normalize
 
 from stock.models import StockItem
 
@@ -38,6 +38,10 @@ class LabelTemplate(models.Model):
     # Each class of label files will be stored in a separate subdirectory
     SUBDIR = "label"
 
+    @property
+    def template(self):
+        return self.label.path
+
     name = models.CharField(
         unique=True,
         blank=False, max_length=100,
@@ -60,6 +64,9 @@ class LabelTemplate(models.Model):
     )
 
     def get_record_data(self, items):
+        """
+        Return a list of dict objects, one for each item.
+        """
 
         return []
 
@@ -67,9 +74,9 @@ class LabelTemplate(models.Model):
 
         records = self.get_record_data(items)
 
-        writer = LabelWriter(self.label.filename)
+        writer = LabelWriter(self.template)
 
-        writer.write_label(records, 'out.pdf')
+        writer.write_labels(records, 'out.html')
 
 
 class StockItemLabel(LabelTemplate):
@@ -91,3 +98,26 @@ class StockItemLabel(LabelTemplate):
         items = items.filter(pk=item.pk)
 
         return items.exists()
+
+    def get_record_data(self, items):
+        """
+        Generate context data for each provided StockItem
+        """
+        records = []
+        
+        for item in items:
+
+            # Add some basic information
+            records.append({
+                'item': item,
+                'part': item.part,
+                'name': item.part.name,
+                'ipn': item.part.IPN,
+                'quantity': normalize(item.quantity),
+                'serial': item.serial,
+                'uid': item.uid,
+                'pk': item.pk,
+                'qr_data': item.format_short_barcode(),
+            })
+
+        return records
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index 0a9fc6b8bd..664593e600 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -302,6 +302,13 @@ class StockItem(MPTTModel):
             }
         )
 
+    def format_short_barcode(self):
+        """
+        Return a short barcode
+        """
+
+        return "stockid={pk}".format(pk=self.pk)
+
     uid = models.CharField(blank=True, max_length=128, help_text=("Unique identifier field"))
 
     parent = TreeForeignKey(