diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 5741e2bcd..cf6eaeeb6 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -322,6 +322,12 @@ class ImportScripts::Base
   def create_categories(results)
     results.each do |c|
       params = yield(c)
+
+      # Basic massaging on the category name
+      params[:name] = "Blank" if params[:name].blank?
+      params[:name].strip!
+      params[:name] = params[:name][0..49]
+
       puts "\t#{params[:name]}"
 
       # make sure categories don't go more than 2 levels deep
diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb
index 4f011b327..9db4503df 100644
--- a/script/import_scripts/drupal.rb
+++ b/script/import_scripts/drupal.rb
@@ -28,7 +28,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     #   * Table name may be term_data.
     #   * May need to select a vid other than 1.
     create_categories(@client.query("SELECT tid, name, description FROM taxonomy_term_data WHERE vid = 1;")) do |c|
-      {id: c['tid'], name: c['name'].try(:strip), description: c['description']}
+      {id: c['tid'], name: c['name'], description: c['description']}
     end
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
@@ -185,4 +185,6 @@ class ImportScripts::Drupal < ImportScripts::Base
 
 end
 
-ImportScripts::Drupal.new.perform
+if __FILE__==$0
+  ImportScripts::Drupal.new.perform
+end
diff --git a/script/import_scripts/drupal_qa.rb b/script/import_scripts/drupal_qa.rb
new file mode 100644
index 000000000..62a9ab628
--- /dev/null
+++ b/script/import_scripts/drupal_qa.rb
@@ -0,0 +1,106 @@
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require File.expand_path(File.dirname(__FILE__) + "/drupal.rb")
+
+require "mysql2"
+
+class ImportScripts::DrupalQA < ImportScripts::Drupal
+
+  def create_forum_topics
+    puts '', "creating forum topics"
+
+    total_count = @client.query("
+        SELECT COUNT(*) count
+          FROM node n
+         WHERE n.type = 'question'
+           AND n.status = 1;").first['count']
+
+    batch_size = 1000
+
+    batches(batch_size) do |offset|
+      results = @client.query("
+        SELECT n.nid,
+               n.title,
+               MIN(t.field_question_tags_tid) AS tid,
+               n.uid,
+               n.created,
+               f.body_value AS body
+        FROM node AS n
+          LEFT OUTER JOIN field_data_field_question_tags AS t on t.entity_id = n.nid
+          INNER JOIN field_data_body AS f ON f.entity_id = n.nid
+        WHERE n.type = 'question'
+          AND n.status = 1
+        GROUP BY n.nid, n.title, n.uid, n.created, f.body_value
+        LIMIT #{batch_size}
+        OFFSET #{offset}
+      ", cache_rows: false);
+
+      break if results.size < 1
+
+      create_posts(results, total: total_count, offset: offset) do |row|
+        {
+          id: "nid:#{row['nid']}",
+          user_id: user_id_from_imported_user_id(row['uid']) || -1,
+          category: category_from_imported_category_id(row['tid']).try(:name),
+          raw: row['body'],
+          created_at: Time.zone.at(row['created']),
+          pinned_at: nil,
+          title: row['title'].try(:strip)
+        }
+      end
+    end
+  end
+
+  def create_replies
+    puts '', "creating replies in topics"
+
+    total_count = @client.query("
+        SELECT COUNT(*) count
+          FROM node n
+         WHERE n.type = 'answer'
+           AND n.status = 1;").first['count']
+
+    batch_size = 1000
+
+    batches(batch_size) do |offset|
+
+      results = @client.query("
+        SELECT n.nid AS cid,
+               q.field_answer_question_nid AS nid,
+               n.uid,
+               n.created,
+               f.comment_body_value AS body
+        FROM node AS n
+          INNER JOIN field_data_field_answer_question AS q ON q.entity_id = n.nid
+          INNER JOIN field_data_comment_body AS f ON f.entity_id = n.nid
+        WHERE n.status = 1
+          AND n.type = 'answer'
+        LIMIT #{batch_size}
+        OFFSET #{offset}
+      ", cache_rows: false)
+
+      break if results.size < 1
+
+      create_posts(results, total: total_count, offset: offset) do |row|
+        topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
+        if topic_mapping && topic_id = topic_mapping[:topic_id]
+          h = {
+            id: "cid:#{row['cid']}",
+            topic_id: topic_id,
+            user_id: user_id_from_imported_user_id(row['uid']) || -1,
+            raw: row['body'],
+            created_at: Time.zone.at(row['created']),
+          }
+          h
+        else
+          puts "No topic found for comment #{row['cid']}"
+          nil
+        end
+      end
+    end
+  end
+
+end
+
+if __FILE__==$0
+  ImportScripts::DrupalQA.new.perform
+end