diff --git a/ajax_comments.admin.inc b/ajax_comments.admin.inc
index ce3f343..c14903f 100644
--- a/ajax_comments.admin.inc
+++ b/ajax_comments.admin.inc
@@ -23,4 +23,4 @@ function ajax_comments_settings() {
     '#default_value' => variable_get('ajax_comments_notify', ''),
   );
   return system_settings_form($form);
-}
+}
\ No newline at end of file
diff --git a/ajax_comments.info b/ajax_comments.info
index 3bf8a0d..024e895 100644
--- a/ajax_comments.info
+++ b/ajax_comments.info
@@ -3,3 +3,6 @@ description = Module makes comments load without a page refresh via AJAX
 core = 7.x
 dependencies[] = comment
 configure = admin/config/content/ajax_comments
+
+files[] = views_handler_field_ajax_add_comment.inc
+files[] = ajax_comments_handler_field_list_comments.inc
diff --git a/ajax_comments.js b/ajax_comments.js
index 97a4f4f..35e21e0 100644
--- a/ajax_comments.js
+++ b/ajax_comments.js
@@ -47,7 +47,6 @@ Drupal.behaviors.ajaxComments = {
           e.preventDefault();
         },
       });
-
     });
 
   }
diff --git a/ajax_comments.module b/ajax_comments.module
index e384f45..8a11668 100644
--- a/ajax_comments.module
+++ b/ajax_comments.module
@@ -53,6 +53,13 @@ function ajax_comments_menu() {
     'type' => MENU_CALLBACK,
   );
 
+  $items['ajax_comments/comment_form/ajax/%node'] = array(
+    'page callback' => 'ajax_comments_comment_form',
+    'page arguments' => array(2, 3),
+    'access arguments' => array('post comments'),
+    'type' => MENU_CALLBACK,
+  );
+
   $items['admin/config/content/ajax_comments'] = array(
     'title' => 'AJAX comments',
     'description' => 'AJAXifies comments on site.',
@@ -61,10 +68,21 @@ function ajax_comments_menu() {
     'access arguments' => array('administer site configuration'),
     'file' => 'ajax_comments.admin.inc',
   );
+
   return $items;
 }
 
 /**
+ * Implements hook_views_api().
+ */
+function ajax_comments_views_api() {
+  return array(
+    'api' => 3,
+    'path' => drupal_get_path('module', 'ajax_comments'),
+  );
+}
+
+/**
  * Implements hook_preprocess_node().
  *
  * AJAXify "Add new comment" link when there is no default form.
@@ -254,6 +272,11 @@ function ajax_comments_submit_js($form, &$form_state) {
     // Delete the form.
     $commands[] = ajax_command_invoke('#' . $form['#id'], 'remove');
   }
+  // If this is being submitted via the views ajax add comment field.
+  elseif ($form_state['comment']->views_ajax_submission) {
+    $message = t('Your comment has been posted.');
+    $commands[] = ajax_command_replace('#' . $form['#id'], $message);
+  }
   // Or is this a brand new comment?
   else {
     // Append comment to root comment wrapper.
@@ -585,3 +608,33 @@ function theme_ajax_comments_notify_text($vars = array()) {
   // Using messages (minus .session which defaults to 960px in bartik) for now.
   return '<div id="messages"><div class="clearfix"><div class="messages ajax-comments ' . $status . '"><h2 class="element-invisible">Status message</h2>' . $text . '</div></div></div>';
 }
+
+/**
+ * Delivers comment form via AJAX.
+ */
+function ajax_comments_comment_form($type = 'ajax', $node) {
+  // Validate token.
+  if (empty($_GET['tok']) || !drupal_valid_token($_GET['tok'], 'ajax-comments-add-comment-' . $node->nid)) {
+    return MENU_ACCESS_DENIED;
+  }
+
+  // Return rendered form.
+  if ($type == 'ajax') {
+
+    // Build form.
+    $comment = new stdClass;
+    $comment->nid = $node->nid;
+    $comment->views_ajax_submission = TRUE;
+    $form = drupal_get_form('comment_form', $comment);
+    $markup = drupal_render($form);
+    // Construct AJAX.
+    //$commands[] = ajax_command_replace('.ajax-comments-add-comment-wrapper:has(.ajax-comments-add-comment-nid-' . $node->nid . ')', $markup);
+    $commands[] = ajax_command_replace('.ajax-comments-add-comment-nid-' . $node->nid, $markup);
+    $page = array('#type' => 'ajax', '#commands' => $commands);
+    ajax_deliver($page);
+  }
+  // Return normal page callback.
+  else {
+    drupal_goto('node/' . $node->nid);
+  }
+}
diff --git a/ajax_comments_nodejs/ajax_comments_nodejs.info b/ajax_comments_nodejs/ajax_comments_nodejs.info
index 092284a..cbda69c 100644
--- a/ajax_comments_nodejs/ajax_comments_nodejs.info
+++ b/ajax_comments_nodejs/ajax_comments_nodejs.info
@@ -2,5 +2,4 @@ name = AJAX Comments Nodejs Integration
 description = Integrates Nodejs with Ajax Comments 
 core = 7.x
 dependencies[] = comment
-dependencies[] = nodejs
-
+dependencies[] = nodejs
\ No newline at end of file