diff --git a/DIFF b/DIFF
new file mode 100644
index 0000000..e69de29
diff --git a/subscriptions_views/subscriptions_views.info b/subscriptions_views/subscriptions_views.info
new file mode 100755
index 0000000..1d4f1a9
--- /dev/null
+++ b/subscriptions_views/subscriptions_views.info
@@ -0,0 +1,8 @@
+name = Subscriptions Views
+description = Basic views integration for Subscriptions.
+package = Subscriptions
+core = 7.x
+
+files[] = subscriptions_views.module
+files[] = subscriptions_views.views.inc
+files[] = subscriptions_views_handler_node_relationship.inc
diff --git a/subscriptions_views/subscriptions_views.module b/subscriptions_views/subscriptions_views.module
new file mode 100755
index 0000000..deff571
--- /dev/null
+++ b/subscriptions_views/subscriptions_views.module
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file
+ * Core functions and hooks for Subscriptions Views.
+ */
+
+/**
+ * Implements hook_views_api().
+ */
+function subscriptions_views_views_api() {
+  return array(
+     'api' => 3, 
+  );
+}
\ No newline at end of file
diff --git a/subscriptions_views/subscriptions_views.views.inc b/subscriptions_views/subscriptions_views.views.inc
new file mode 100755
index 0000000..0053a6c
--- /dev/null
+++ b/subscriptions_views/subscriptions_views.views.inc
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @file
+ * Views integration hooks.
+ */
+
+/**
+ * Implements hook_views_data().
+ */
+function subscriptions_views_views_data() {
+  $data = array();
+  
+  $data['subscriptions']['table']['group']  = t('Subscriptions');
+
+// Advertise this table as a possible base table
+  $data['subscriptions']['table']['base'] = array(
+    'field' => 'sid',
+    'title' => t('Subscription'),
+    'weight' => -5,
+//    'access query tag' => 'node_access',
+    'defaults' => array(
+      'field' => 'title',
+    ),
+  );
+  // Provide a "default relationship" to keep older views from choking.
+  $data['subscriptions']['table']['default_relationship'] = array(
+    'users' => array(
+      'table' => 'users',
+      'field' => 'recipient_uid',
+    ),
+  );
+  // Pure subscription ID.
+  $data['subscriptions']['sid'] = array(
+    'title' => t('Subscription ID'), // The item it appears as on the UI,
+    'help' => t('The ID of the given subscription.'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+  );
+  // created field
+  $data['subscriptions']['created'] = array(
+    'title' => t('Record date'), // The item it appears as on the UI,
+    'help' => t('The date the data was recorded.'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field_date',
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort_date',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_date',
+    ),
+  );
+  // Module that the subscription type is atached to.
+  $data['subscriptions']['module'] = array(
+    'title' => t('Module'), // The item it appears as on the UI,
+    'help' => t('The module defining the subscription.'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'format' => 'plain_text', // The name of the format field
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+    ),
+  );
+  $data['subscriptions']['field'] = array(
+    'title' => t('Field'), // The item it appears as on the UI,
+    'help' => t('The field defining the subscription.'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'format' => 'plain_text', // The name of the format field
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+    ),
+  );
+  // The ID of the subscribed entity.
+  $data['subscriptions']['value'] = array(
+    'title' => t('Value'), // The item it appears as on the UI,
+    'help' => t('The entity ID of the subscribed entity.'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field',
+      'format' => 'plain_text', // The name of the format field
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_string',
+    ),
+  );
+  // Relationsip with the user that made the subscription.
+  $data['subscriptions']['recipient_uid'] = array(
+    'title' => t('Subscribing user'),
+    'help' => t('The ID of the user that made the subscription'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field_user',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_user_uid',
+      'name field' => 'name', // display this field in the summary
+    ),
+    'filter' => array(
+      'title' => t('Name'),
+      'handler' => 'views_handler_filter_user_name',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'title' => t('Subscribing user'),
+      'help' => t('Relate subscription to the user who is subscribed. This relationship will create one record for each subscription for the user.'),
+      'handler' => 'views_handler_relationship',
+      'base' => 'users',
+      'base field' => 'uid',
+      'field' => 'recipient_uid',
+      'label' => t('Subscribing user'),
+    ),
+  );
+  // Relationship with the author that is subscribed to.
+  $data['subscriptions']['author_uid'] = array(
+    'title' => t('Subscribed author ID'),
+    'help' => t('The ID of the user that is subscribed to'), // The help that appears on the UI,
+    'field' => array(
+      'handler' => 'views_handler_field_user',
+      'click sortable' => TRUE,
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_user_uid',
+      'name field' => 'name', // display this field in the summary
+    ),
+    'filter' => array(
+      'title' => t('Name'),
+      'handler' => 'views_handler_filter_user_name',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'relationship' => array(
+      'title' => t('Subscribed author'),
+      'help' => t('Relate subscription to the user who is subscribed to. This relationship is only applied when the subscription is to an author’s content.'),
+      'handler' => 'views_handler_relationship',
+      'base' => 'users',
+      'base field' => 'uid',
+      'field' => 'author_uid',
+      'label' => t('Subscribed author'),
+    ),
+  );
+  $data['subscriptions']['node'] = array(
+    'title' => t('Nid'),
+    'help' => t('The node ID to which the subscription is made.'),
+    'relationship' => array(
+      'title' => t('Content'),
+      'help' => t('The content to which the subscription is made.'),
+      'base' => 'node',
+      'base field' => 'nid',
+      'field' => 'value',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Content'),
+      'extra' => "subscriptions.field = 'nid'",
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+    ),
+  );
+  $data['subscriptions']['term'] = array(
+    'title' => t('Nid'),
+    'help' => t('The term that the user is subscribed to.'),
+    'relationship' => array(
+      'title' => t('Taxonomy term'),
+      'help' => t('The term that the user is subscribed to.'),
+      'base' => 'taxonomy_term_data',
+      'base field' => 'tid',
+      'field' => 'value',
+      'handler' => 'views_handler_relationship',
+      'label' => t('Taxonomy term'),
+      'extra' => "subscriptions.field = 'tid'",
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'field' => array(
+      'handler' => 'views_handler_field_numeric',
+    ),
+  );
+  return $data;
+}