diff --git a/assets/templates/asset_activity_table.html b/assets/templates/asset_activity_table.html
new file mode 100644
index 00000000..166a4417
--- /dev/null
+++ b/assets/templates/asset_activity_table.html
@@ -0,0 +1,92 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
+{% load static %}
+{% load paginator from filters %}
+{% load to_class_name from filters %}
+
+{% block title %}Asset Activity Stream{% endblock %}
+
+{# TODO: Find a way to reduce code duplication...can't just include the content because of the IDs... #}
+
+{% block js %}
+    <script src="{% static "js/tooltip.js" %}"></script>
+    <script src="{% static "js/popover.js" %}"></script>
+    <script src="{% static "js/moment.min.js" %}"></script>
+    <script>
+    	$(function () {
+		  $('[data-toggle="popover"]').popover().click(function(){
+        if($(this).attr('href')){
+          window.location.href = $(this).attr('href');
+        }
+      });
+
+          // This keeps timeago values correct, but uses an insane amount of resources
+          // $(function () {
+          //     setInterval(function() {
+          //         $('.date').each(function (index, dateElem) {
+          //           var $dateElem = $(dateElem);
+          //           var formatted = moment($dateElem.attr('data-date')).fromNow();
+          //           $dateElem.text(formatted);
+          //          })
+          //        });
+          //     }, 10000);
+
+
+            $('.date').each(function (index, dateElem) {
+                var $dateElem = $(dateElem);
+                var formatted = moment($dateElem.attr('data-date')).fromNow();
+                $dateElem.text(formatted);
+               });
+
+
+		})
+
+    </script>
+{% endblock %}
+
+{% block content %}
+<div class="col-sm-12">
+        <div class="row">
+            <div class="col-sm-12">
+                <h3>Asset Activity Stream</h3>
+            </div>
+            <div class="text-right col-sm-12">{% paginator %}</div>
+        </div>
+        <div class="table-responsive">
+
+        	<table class="table table-striped">
+                <thead>
+                <tr>
+                    <td>Date</td>
+                    <td>Object</td>
+                    <td>Version ID</td>
+                    <td>User</td>
+                    <td>Changes</td>
+                    <td>Comment</td>
+                </tr>
+                </thead>
+                <tbody>
+                	{% for version in object_list %}
+
+                            <tr>
+                                <td>{{ version.revision.date_created }}</td>
+                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id }}</a></td>
+                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
+                                <td>{{ version.revision.user.name }}</td>
+                                <td>
+                                  {% if version.changes.old == None %}
+                                    {{version.changes.new|to_class_name}} Created
+                                  {% else %}
+                                    {% include 'RIGS/version_changes.html' %}
+                                  {% endif %}                        </td>
+                                  <td>{{ version.changes.revision.comment }}</td>
+                            </tr>
+
+        			{% endfor %}
+
+                </tbody>
+            </table>
+
+        </div>
+        <div class="align-right">{% paginator %}</div>
+    </div>
+{% endblock %}
diff --git a/assets/templates/asset_version_history.html b/assets/templates/asset_version_history.html
new file mode 100644
index 00000000..cefcd5d0
--- /dev/null
+++ b/assets/templates/asset_version_history.html
@@ -0,0 +1,68 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
+{% load to_class_name from filters %}
+{% load paginator from filters %}
+{% load static %}
+
+{% block title %}{{object|to_class_name}} {{ object.asset_id }} - Revision History{% endblock %}
+
+{% block js %}
+    <script src="{% static "js/tooltip.js" %}"></script>
+    <script src="{% static "js/popover.js" %}"></script>
+    <script>
+    	$(function () {
+            $('[data-toggle="popover"]').popover().click(function(){
+                    if($(this).attr('href')){
+                      window.location.href = $(this).attr('href');
+                    }
+                  });
+        })
+    </script>
+{% endblock %}
+
+{% block content %}
+<div class="col-sm-12">
+        <div class="row">
+            <div class="col-sm-12">
+                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id }}</a> - Revision History</h3>
+            </div>
+            <div class="text-right col-sm-12">{% paginator %}</div>
+        </div>
+        <div class="table-responsive">
+        	<table class="table table-striped">
+                <thead>
+                <tr>
+                    <td>Date</td>
+                    <td>Version ID</td>
+                    <td>User</td>
+                    <td>Changes</td>
+                    <td>Comment</td>
+                </tr>
+                </thead>
+                <tbody>
+                	{% for version in object_list %}
+
+                            <tr>
+                           		<td>{{ version.revision.date_created }}</td>
+                                <td>{{ version.pk }}|{{ version.revision.pk }}</td>
+                                <td>{{ version.revision.user.name }}</td>
+                                <td>
+                                    {% if version.changes.old is None %}
+                                        {{object|to_class_name}} Created
+                                    {% else %}
+                                        {% include 'RIGS/version_changes.html' %}
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {{ version.revision.comment }}
+                                </td>
+                            </tr>
+
+
+        			{% endfor %}
+
+                </tbody>
+            </table>
+         </div>
+    <div class="align-right">{% paginator %}</div>
+</div>
+{% endblock %}
diff --git a/assets/views.py b/assets/views.py
index 879be3ce..731f6c36 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -208,7 +208,16 @@ class SupplierUpdate(generic.UpdateView):
     template_name = 'supplier_update.html'
 
 
-class AssetVersionHistory(AssetIDUrlMixin, versioning.VersionHistory):
+class AssetVersionHistory(versioning.VersionHistory):
+    template_name = "asset_version_history.html"
+
+    def get_queryset(self, **kwargs):
+        thisModel = self.kwargs['model']
+
+        versions = versioning.RIGSVersion.objects.all()
+
+        return versions
+
     def get_context_data(self, **kwargs):
         thisModel = self.kwargs['model']
         context = super(versioning.VersionHistory, self).get_context_data(**kwargs)
@@ -225,7 +234,7 @@ class AssetVersionHistory(AssetIDUrlMixin, versioning.VersionHistory):
 
 class ActivityTable(generic.ListView):
     model = versioning.RIGSVersion
-    template_name = "RIGS/activity_table.html"
+    template_name = "asset_activity_table.html"
     paginate_by = 25
 
     def get_queryset(self):